mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

avoid runghc

Browse source
This commit is contained in:
Joey Hess 2013-04-14 16:00:31 -04:00
parent 0c9bb2371e
commit 83004de111
3 changed files with 31 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

5
.gitignore vendored
View file

@ -2,6 +2,11 @@ tmp
test test
build-stamp build-stamp
Build/SysConfig.hs Build/SysConfig.hs
Build/InstallDesktopFile
Build/EvilSplicer
Build/InstallDesktopFile
Build/Standalone
Build/OSXMkLibs
git-annex git-annex
git-annex.1 git-annex.1
git-annex-shell.1 git-annex-shell.1

36
Makefile
View file

@ -27,6 +27,7 @@ git-annex.1: doc/git-annex.mdwn
./Build/mdwn2man git-annex 1 doc/git-annex.mdwn > git-annex.1 ./Build/mdwn2man git-annex 1 doc/git-annex.mdwn > git-annex.1
git-annex-shell.1: doc/git-annex-shell.mdwn git-annex-shell.1: doc/git-annex-shell.mdwn
./Build/mdwn2man git-annex-shell 1 doc/git-annex-shell.mdwn > git-annex-shell.1 ./Build/mdwn2man git-annex-shell 1 doc/git-annex-shell.mdwn > git-annex-shell.1
git-union-merge.1: doc/git-union-merge.mdwn git-union-merge.1: doc/git-union-merge.mdwn
./Build/mdwn2man git-union-merge 1 doc/git-union-merge.mdwn > git-union-merge.1 ./Build/mdwn2man git-union-merge 1 doc/git-union-merge.mdwn > git-union-merge.1
@ -40,11 +41,11 @@ install-docs: docs install-mans
rsync -a --delete html/ $(DESTDIR)$(PREFIX)/share/doc/git-annex/html/; \ rsync -a --delete html/ $(DESTDIR)$(PREFIX)/share/doc/git-annex/html/; \
fi fi
install: build install-docs install: build install-docs Build/InstallDesktopFile
install -d $(DESTDIR)$(PREFIX)/bin install -d $(DESTDIR)$(PREFIX)/bin
install git-annex $(DESTDIR)$(PREFIX)/bin install git-annex $(DESTDIR)$(PREFIX)/bin
ln -sf git-annex $(DESTDIR)$(PREFIX)/bin/git-annex-shell ln -sf git-annex $(DESTDIR)$(PREFIX)/bin/git-annex-shell
runghc Build/InstallDesktopFile.hs $(PREFIX)/bin/git-annex || true ./Build/InstallDesktopFile $(PREFIX)/bin/git-annex || true
test: git-annex test: git-annex
./git-annex test ./git-annex test
@ -73,7 +74,20 @@ docs: $(mans)
clean: clean:
rm -rf tmp dist git-annex $(mans) configure *.tix .hpc \ rm -rf tmp dist git-annex $(mans) configure *.tix .hpc \
doc/.ikiwiki html dist tags Build/SysConfig.hs build-stamp \ doc/.ikiwiki html dist tags Build/SysConfig.hs build-stamp \
Setup.hi Setup.o Setup Setup.hi Setup.o Setup Build/InstallDesktopFile \
Build/EvilSplicer Build/InstallDesktopFile \
Build/Standalone Build/OSXMkLibs
Build/InstallDesktopFile: Build/InstallDesktopFile.hs
$(GHC) --make $@
Build/EvilSplicer: Build/EvilSplicer.hs
$(GHC) --make $@
Build/InstallDesktopFile: Build/InstallDesktopFile.hs
$(GHC) --make $@
Build/Standalone: Build/Standalone.hs
$(GHC) --make $@
Build/OSXMkLibs: Build/OSXMkLibs.hs
$(GHC) --make $@
sdist: clean $(mans) sdist: clean $(mans)
./Build/make-sdist.sh ./Build/make-sdist.sh
@ -83,7 +97,7 @@ hackage: sdist
@cabal upload dist/*.tar.gz @cabal upload dist/*.tar.gz
LINUXSTANDALONE_DEST=tmp/git-annex.linux LINUXSTANDALONE_DEST=tmp/git-annex.linux
linuxstandalone: linuxstandalone: Build/Standalone
$(MAKE) git-annex $(MAKE) git-annex
rm -rf "$(LINUXSTANDALONE_DEST)" rm -rf "$(LINUXSTANDALONE_DEST)"
@ -96,7 +110,7 @@ linuxstandalone:
ln -sf git-annex "$(LINUXSTANDALONE_DEST)/bin/git-annex-shell" ln -sf git-annex "$(LINUXSTANDALONE_DEST)/bin/git-annex-shell"
zcat standalone/licences.gz > $(LINUXSTANDALONE_DEST)/LICENSE zcat standalone/licences.gz > $(LINUXSTANDALONE_DEST)/LICENSE
runghc Build/Standalone.hs "$(LINUXSTANDALONE_DEST)" ./Build/Standalone "$(LINUXSTANDALONE_DEST)"
install -d "$(LINUXSTANDALONE_DEST)/git-core" install -d "$(LINUXSTANDALONE_DEST)/git-core"
(cd "$(shell git --exec-path)" && tar c .) | (cd "$(LINUXSTANDALONE_DEST)"/git-core && tar x) (cd "$(shell git --exec-path)" && tar c .) | (cd "$(LINUXSTANDALONE_DEST)"/git-core && tar x)
@ -120,7 +134,7 @@ linuxstandalone:
OSXAPP_DEST=tmp/build-dmg/git-annex.app OSXAPP_DEST=tmp/build-dmg/git-annex.app
OSXAPP_BASE=$(OSXAPP_DEST)/Contents/MacOS/bundle OSXAPP_BASE=$(OSXAPP_DEST)/Contents/MacOS/bundle
osxapp: osxapp: Build/Standalone Build/OSXMkLibs
$(MAKE) git-annex $(MAKE) git-annex
rm -rf "$(OSXAPP_DEST)" rm -rf "$(OSXAPP_DEST)"
@ -134,12 +148,12 @@ osxapp:
gzcat standalone/licences.gz > $(OSXAPP_BASE)/LICENSE gzcat standalone/licences.gz > $(OSXAPP_BASE)/LICENSE
cp $(OSXAPP_BASE)/LICENSE tmp/build-dmg/LICENSE.txt cp $(OSXAPP_BASE)/LICENSE tmp/build-dmg/LICENSE.txt
runghc Build/Standalone.hs $(OSXAPP_BASE) ./Build/Standalone $(OSXAPP_BASE)
(cd "$(shell git --exec-path)" && tar c .) | (cd "$(OSXAPP_BASE)" && tar x) (cd "$(shell git --exec-path)" && tar c .) | (cd "$(OSXAPP_BASE)" && tar x)
install -d "$(OSXAPP_BASE)/templates" install -d "$(OSXAPP_BASE)/templates"
runghc Build/OSXMkLibs.hs $(OSXAPP_BASE) ./Build/OSXMkLibs $(OSXAPP_BASE)
rm -f tmp/git-annex.dmg rm -f tmp/git-annex.dmg
hdiutil create -size 640m -format UDRW -srcfolder tmp/build-dmg \ hdiutil create -size 640m -format UDRW -srcfolder tmp/build-dmg \
-volname git-annex -o tmp/git-annex.dmg -volname git-annex -o tmp/git-annex.dmg
@ -148,7 +162,7 @@ osxapp:
# Cross compile for Android. # Cross compile for Android.
# Uses https://github.com/neurocyte/ghc-android # Uses https://github.com/neurocyte/ghc-android
android: android: Build/EvilSplicer
echo "Native build, to get TH splices.." echo "Native build, to get TH splices.."
$(CABAL) configure -f"-Production" -O0 $(CABAL) configure -f"-Production" -O0
$(CABAL) build -v2 --ghc-options=-ddump-splices 2>&1 | tee dist/caballog $(CABAL) build -v2 --ghc-options=-ddump-splices 2>&1 | tee dist/caballog
@ -156,8 +170,8 @@ android:
rsync -az --delete --exclude tmp . tmp/androidtree rsync -az --delete --exclude tmp . tmp/androidtree
cd tmp/androidtree && $(MAKE) android-stage2 cd tmp/androidtree && $(MAKE) android-stage2
android-stage2: android-stage2: Build/EvilSplicer
runghc Build/EvilSplicer.hs tmp/splices dist/caballog standalone/android/evilsplicer-headers.hs ./Build/EvilSplicer tmp/splices dist/caballog standalone/android/evilsplicer-headers.hs
# Copy the files with expanded splices to the source tree, but # Copy the files with expanded splices to the source tree, but
# only if the existing source file is not newer. (So, if a file # only if the existing source file is not newer. (So, if a file
# used to have TH splices but they were removed, it will be newer, # used to have TH splices but they were removed, it will be newer,

2
debian/changelog vendored
View file

@ -10,7 +10,7 @@ git-annex (4.20130406) UNRELEASED; urgency=low
* Adjust preferred content expressions so that content in archive * Adjust preferred content expressions so that content in archive
directories is preferred until it has reached an archive or smallarchive directories is preferred until it has reached an archive or smallarchive
repository. repository.
* Avoid using runghc when building the Debian package, as that needs ghci. * Avoid using runghc, as that needs ghci.
* webapp: New --listen= option allows running the webapp on one computer * webapp: New --listen= option allows running the webapp on one computer
and connecting to it from another. (Note: Does not yet use HTTPS.) and connecting to it from another. (Note: Does not yet use HTTPS.)
* webapp: When a repository's group is changed, rescan for transfers. * webapp: When a repository's group is changed, rescan for transfers.