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

306 lines
13 KiB
Makefile
Raw Normal View History

simplify ikiwiki docs build testing and output
2017-11-07 20:36:01 +00:00
all=git-annex git-annex-shell mans docs
fast build mode for vim
2011-11-10 01:36:11 +00:00
support building with BUILDER=stack to use stack instead of cabal
2015-12-28 18:10:08 +00:00
# set to "./Setup" if you lack a cabal program. Or can be set to "stack"
BUILDER?=cabal
Makefile improvement for BUILDER=stack, use stack to run ghc.
2017-11-07 20:56:48 +00:00
ifeq ($(BUILDER),stack)
GHC?=stack ghc --
else
can now build Android targeted binary Various things that don't work on Android are just ifdefed out. * the webapp (needs template haskell for arm) * --include and --exclude globbing (needs libpcre, which is not ported; probably I'll make it use the pure haskell glob library instead) * annex.diskreserve checking (missing sys/statvfs.h) * timestamp preservation support (yawn) * S3 * WebDAV * XMPP The resulting 17mb binary has been tested on Android, and it is able to, at least, print its usage message.
2013-02-10 19:48:38 +00:00
GHC?=ghc
Makefile improvement for BUILDER=stack, use stack to run ghc.
2017-11-07 20:56:48 +00:00
endif
also need to set PREFIX in osxapp
2013-12-15 20:53:31 +00:00
avoid setting PREFIX if already set
2013-09-12 20:22:03 +00:00
PREFIX?=/usr
also need to set PREFIX in osxapp
2013-12-15 20:53:31 +00:00
SHAREDIR?=share
fast build mode for vim
2011-11-10 01:36:11 +00:00
re-enable fast autobuild from vim
2013-02-28 01:41:51 +00:00
# Am I typing :make in vim? Do a fast build.
ifdef VIM
all=fast
endif
cleanup makefile
2015-07-23 16:51:27 +00:00
build: $(all)
Avoid using runghc to run test suite as it is not available on all architectures. Closes: #603006
2010-11-10 14:49:35 +00:00
add back a configure target Otherwise, make reconfigures every time and then rebuilds all files. I went too far in 3af9f5ed1a54f1df12f85f613826040e5e855817. All that's needed is to make the configure target not use Build/SysConfig.hs as the target name, so make won't delete that file after a failed build. This commit was supported by the NSF-funded DataLad project
2017-02-24 15:27:00 +00:00
tmp/configure-stamp: Build/TestConfig.hs Build/Configure.hs
support building with BUILDER=stack to use stack instead of cabal
2015-12-28 18:10:08 +00:00
if [ "$(BUILDER)" = ./Setup ]; then ghc --make Setup; fi
remove Build/SysConfig.hs target The problem with that target was, if a target like git-annex that depended on it failed for some reason, make would delete Build/SysConfig.hs, since it knows it's an intermediate file. But, since stack only builds that file once, that caused all subsequent make git-annex builds to fail. Also, this avoids a double stack build when building with stack. Since stack has no configure stage, and the Build/SysConfig.hs target was about running the configure stage, the only way to only build once is to combine the targets like this. This should work better on the autobuilders that build with stack. This commit was sponsored by NSF-funded DataLad project
2017-02-21 17:55:41 +00:00
if [ "$(BUILDER)" != stack ]; then \
support building with BUILDER=stack to use stack instead of cabal
2015-12-28 18:10:08 +00:00
$(BUILDER) configure --ghc-options="$(shell Build/collect-ghc-options.sh)"; \
run stack setup when building with stack This gets ghc installed if it's not already. Motivation: Ævar's git test that runs git-annex test using git can be called with BUILDER=stack, but without stack setup being run sometime, the stack build will fail.
2017-05-16 22:04:13 +00:00
else \
$(BUILDER) setup; \
support building with BUILDER=stack to use stack instead of cabal
2015-12-28 18:10:08 +00:00
fi
add back a configure target Otherwise, make reconfigures every time and then rebuilds all files. I went too far in 3af9f5ed1a54f1df12f85f613826040e5e855817. All that's needed is to make the configure target not use Build/SysConfig.hs as the target name, so make won't delete that file after a failed build. This commit was supported by the NSF-funded DataLad project
2017-02-24 15:27:00 +00:00
mkdir -p tmp
touch tmp/configure-stamp
git-annex: tmp/configure-stamp
move -j1 setting to BUILDEROPTIONS, set in debian/rules file I needed BUILDEROPTIONS to allow passing flags to stack build, but it also lets me move the -j1 out of the normal build path, and to debian/rules which has the goal of having a reproducible build
2016-02-05 17:56:27 +00:00
$(BUILDER) build $(BUILDEROPTIONS)
support building with BUILDER=stack to use stack instead of cabal
2015-12-28 18:10:08 +00:00
if [ "$(BUILDER)" = stack ]; then \
better way of finding stack built executable
2017-07-12 21:04:51 +00:00
ln -sf $$(stack path --dist-dir)/build/git-annex/git-annex git-annex; \
support building with BUILDER=stack to use stack instead of cabal
2015-12-28 18:10:08 +00:00
else \
ln -sf dist/build/git-annex/git-annex git-annex; \
fi
add git-annex-shell command This is not yet complete, as it does not allow starting rsync or scp.
2010-12-30 20:52:24 +00:00
test suite infra for testing mocked ssh remotes This commit was supported by the NSF-funded DataLad project.
2017-03-17 23:13:52 +00:00
git-annex-shell: git-annex
ln -sf git-annex git-annex-shell
git-recover-repository 1/2 done
2013-10-20 21:50:51 +00:00
# These are not built normally.
add git-union-merge This is a new git subcommand, that does a generic union merge operation between two refs, storing the result in a branch. It operates efficiently without touching the working tree. It does need to write out a temporary index file, and may need to write out some other temp files as well. This could be useful for anything that stores data in a branch, and needs to merge changes into that branch without actually checking the branch out. Since conflict handling can't be done without a working copy, the merge type is always a union merge, which is fine for data stored in log format (as git-annex does), or in non-conflicting files (as pristine-tar does). This probably belongs in git proper, but it will live in git-annex for now. --- Plan is to move .git-annex/ to a git-annex branch, and use git-union-merge to handle merging changes when pulling from remotes. Some preliminary benchmarking using real .git-annex/ data indicates that it's quite fast, except for the "git add" call, which is as slow as "git add" tends to be with a big index.
2011-06-20 23:44:45 +00:00
git-union-merge.1: doc/git-union-merge.mdwn
move build scripts
2012-09-01 19:22:13 +00:00
./Build/mdwn2man git-union-merge 1 doc/git-union-merge.mdwn > git-union-merge.1
git-recover-repository 1/2 done
2013-10-20 21:50:51 +00:00
git-union-merge:
$(GHC) --make -threaded $@
add
2010-10-10 04:18:16 +00:00
use new mans target for install-mans, fixing OSX build
2015-03-27 17:09:56 +00:00
install-mans: mans
Include man pages in Linux and OSX standalone builds.
2013-12-15 20:27:46 +00:00
install -d $(DESTDIR)$(PREFIX)/$(SHAREDIR)/man/man1
Remove Makefile from cabal tarball; man page building is now handled by a small haskell program. This actually runs faster than building the man pages from the makefile did. But the main purpose is to let Setup.hs import Build.Mans and so not need the makefile.
2016-05-31 17:58:13 +00:00
install -m 0644 man/*.1 $(DESTDIR)$(PREFIX)/$(SHAREDIR)/man/man1
Make standalone man-page installation possible The `cabal install git-annex` doesn't install the man pages, and the Makefile only installed the man pages as part of a full build/install. So, I factored out the documentation parts of the Makefile.
2012-06-03 22:05:59 +00:00
install-docs: docs install-mans
Include man pages in Linux and OSX standalone builds.
2013-12-15 20:27:46 +00:00
install -d $(DESTDIR)$(PREFIX)/$(SHAREDIR)/doc/git-annex
Makefile: Install man page and html (when built).
2010-12-12 17:15:16 +00:00
if [ -d html ]; then \
Include man pages in Linux and OSX standalone builds.
2013-12-15 20:27:46 +00:00
rsync -a --delete html/ $(DESTDIR)$(PREFIX)/$(SHAREDIR)/doc/git-annex/html/; \
Makefile: Install man page and html (when built).
2010-12-12 17:15:16 +00:00
fi
debianization
2010-10-16 20:41:24 +00:00
Make git-annex-standalone.deb include the git-annex html documentation, desktop file, and base completion file, same as the regular git-annex.deb. It already had a doc-base file relating to the html documentation, and there's no reason not to include the other stuff.
2015-11-10 17:18:58 +00:00
install-bins: build
Make standalone man-page installation possible The `cabal install git-annex` doesn't install the man pages, and the Makefile only installed the man pages as part of a full build/install. So, I factored out the documentation parts of the Makefile.
2012-06-03 22:05:59 +00:00
install -d $(DESTDIR)$(PREFIX)/bin
install fix
2013-02-27 21:25:00 +00:00
install git-annex $(DESTDIR)$(PREFIX)/bin
Make standalone man-page installation possible The `cabal install git-annex` doesn't install the man pages, and the Makefile only installed the man pages as part of a full build/install. So, I factored out the documentation parts of the Makefile.
2012-06-03 22:05:59 +00:00
ln -sf git-annex $(DESTDIR)$(PREFIX)/bin/git-annex-shell
Added git-remote-tor-annex, which allows git pull and push to the tor hidden service. Almost working, but there's a bug in the relaying. Also, made tor hidden service setup pick a random port, to make it harder to port scan. This commit was sponsored by Boyd Stephen Smith Jr. on Patreon.
2016-11-21 21:27:38 +00:00
ln -sf git-annex $(DESTDIR)$(PREFIX)/bin/git-remote-tor-annex
Make git-annex-standalone.deb include the git-annex html documentation, desktop file, and base completion file, same as the regular git-annex.deb. It already had a doc-base file relating to the html documentation, and there's no reason not to include the other stuff.
2015-11-10 17:18:58 +00:00
zsh and fish completions optparse-applicative-0.14.0.0 adds support for these, so have the Makefile install their scripts when built with it. CmdLine/GitAnnex/Options.hs now uses action "file" in cmdParams, which affects the bash and zsh completions, letting them complete filenames for subcommands that use that. This is not needed for bash, since bash-completion.bash enables -o bashdefault, which lets it complete filenames too. But it does not seem to break the bash completions. It is needed for zsh; the zsh completion otherwise does not complete filenames. The fish completion will always complete filenames no matter what. Messy. This commit was sponsored by Denis Dzyubenko on Patreon.
2017-06-09 15:38:20 +00:00
install-misc: build Build/InstallDesktopFile
avoid runghc
2013-04-14 20:00:31 +00:00
./Build/InstallDesktopFile $(PREFIX)/bin/git-annex || true
zsh and fish completions optparse-applicative-0.14.0.0 adds support for these, so have the Makefile install their scripts when built with it. CmdLine/GitAnnex/Options.hs now uses action "file" in cmdParams, which affects the bash and zsh completions, letting them complete filenames for subcommands that use that. This is not needed for bash, since bash-completion.bash enables -o bashdefault, which lets it complete filenames too. But it does not seem to break the bash completions. It is needed for zsh; the zsh completion otherwise does not complete filenames. The fish completion will always complete filenames no matter what. Messy. This commit was sponsored by Denis Dzyubenko on Patreon.
2017-06-09 15:38:20 +00:00
install -d $(DESTDIR)$(PREFIX)/$(SHAREDIR)/bash-completion/completions
install -m 0644 bash-completion.bash $(DESTDIR)$(PREFIX)/$(SHAREDIR)/bash-completion/completions/git-annex
install -d $(DESTDIR)$(PREFIX)/$(SHAREDIR)/zsh/vendor-completions
/dev/null stderr when generating completions avoid usage display when too old optparse-applicative
2017-09-14 17:10:45 +00:00
@./git-annex --zsh-completion-script git-annex 2>/dev/null > $(DESTDIR)$(PREFIX)/$(SHAREDIR)/zsh/vendor-completions/_git-annex || \
zsh and fish completions optparse-applicative-0.14.0.0 adds support for these, so have the Makefile install their scripts when built with it. CmdLine/GitAnnex/Options.hs now uses action "file" in cmdParams, which affects the bash and zsh completions, letting them complete filenames for subcommands that use that. This is not needed for bash, since bash-completion.bash enables -o bashdefault, which lets it complete filenames too. But it does not seem to break the bash completions. It is needed for zsh; the zsh completion otherwise does not complete filenames. The fish completion will always complete filenames no matter what. Messy. This commit was sponsored by Denis Dzyubenko on Patreon.
2017-06-09 15:38:20 +00:00
echo "** zsh completions not installed; built with too old version of optparse-applicative"
install -d $(DESTDIR)$(PREFIX)/$(SHAREDIR)/fish/completions
/dev/null stderr when generating completions avoid usage display when too old optparse-applicative
2017-09-14 17:10:45 +00:00
@./git-annex --fish-completion-script git-annex 2>/dev/null > $(DESTDIR)$(PREFIX)/$(SHAREDIR)/fish/completions/git-annex.fish || \
zsh and fish completions optparse-applicative-0.14.0.0 adds support for these, so have the Makefile install their scripts when built with it. CmdLine/GitAnnex/Options.hs now uses action "file" in cmdParams, which affects the bash and zsh completions, letting them complete filenames for subcommands that use that. This is not needed for bash, since bash-completion.bash enables -o bashdefault, which lets it complete filenames too. But it does not seem to break the bash completions. It is needed for zsh; the zsh completion otherwise does not complete filenames. The fish completion will always complete filenames no matter what. Messy. This commit was sponsored by Denis Dzyubenko on Patreon.
2017-06-09 15:38:20 +00:00
echo "** fish completions not installed; built with too old version of optparse-applicative"
Make standalone man-page installation possible The `cabal install git-annex` doesn't install the man pages, and the Makefile only installed the man pages as part of a full build/install. So, I factored out the documentation parts of the Makefile.
2012-06-03 22:05:59 +00:00
Make git-annex-standalone.deb include the git-annex html documentation, desktop file, and base completion file, same as the regular git-annex.deb. It already had a doc-base file relating to the html documentation, and there's no reason not to include the other stuff.
2015-11-10 17:18:58 +00:00
install: install-bins install-docs install-misc
test needs git-annex-shell symlink
2017-03-18 20:05:22 +00:00
test: git-annex git-annex-shell
embed test suite into git annex; available by running: git annex test I have seen some other programs do this, and think it's pretty cool. Means you can test wherever it's deployed, as well as at build time. My other reason for doing it is less happy. Cabal's handling of test suites sucks, requiring duplicated info, and even when that's done, it fails to preprocess hsc files here. Building it in avoids that and avoids having to explicitly tell cabal to enable test suites, which would then make it link the test executable every time, which is unnecessarily slow. This also has the benefit that now "make fast test" does a max speed build and tests it.
2013-02-27 19:35:07 +00:00
./git-annex test
add testcoverage target using hpc added a test for key read and show
2011-01-05 01:05:31 +00:00
Revert "temporarily revert tasty-rerun support for this release" This reverts commit 8fcf041159d06986b5a11a3eddd115b4c71a39d8.
2014-01-27 18:22:44 +00:00
retest: git-annex
./git-annex test --rerun-update --rerun-filter failures
typo
2013-06-17 15:12:18 +00:00
# hothasktags chokes on some template haskell etc, so ignore errors
add ctags generation I need to clean up the path to hasktags. Ideally by packaging it in Debian. Not using ghci's own tags generation because it falls over on pre-compiled files.
2013-01-29 11:26:18 +00:00
tags:
better way to generate tags
2014-07-01 19:11:47 +00:00
(for f in $$(find . | grep -v /.git/ | grep -v /tmp/ | grep -v /dist/ | grep -v /doc/ | egrep '\.hs$$'); do hothasktags -c --cpp -c -traditional -c --include=dist/build/autogen/cabal_macros.h $$f; done) 2>/dev/null | sort > tags
add ctags generation I need to clean up the path to hasktags. Ideally by packaging it in Debian. Not using ghci's own tags generation because it falls over on pre-compiled files.
2013-01-29 11:26:18 +00:00
fix man page building
2016-06-02 20:54:13 +00:00
mans: Build/MakeMans
./Build/MakeMans
splitting up the man page Common command man pages all split out and often expanded. A few sections split out into their own pages. Still need to do all the other commands..
2015-03-23 19:36:10 +00:00
simplify ikiwiki docs build testing and output
2017-11-07 20:36:01 +00:00
# If ikiwiki is available, build static html docs suitable for being
# shipped in the software package.
splitting up the man page Common command man pages all split out and often expanded. A few sections split out into their own pages. Still need to do all the other commands..
2015-03-23 19:36:10 +00:00
docs: mans
simplify ikiwiki docs build testing and output
2017-11-07 20:36:01 +00:00
@if [ -n "`which ikiwiki`" ]; then \
LC_ALL=C TZ=UTC ikiwiki doc html -v --wikiname git-annex \
--plugin=goodstuff \
--no-usedirs --disable-plugin=openid --plugin=sidebar \
--plugin theme --set theme=actiontabs --set deterministic=1 \
--disable-plugin=shortcut --disable-plugin=smiley \
--plugin=comments --set comments_pagespec="*" \
--exclude='ikiwiki/*' \
--exclude='news/.*' --exclude='design/assistant/blog/*' \
--exclude='bugs/*' --exclude='todo/*' --exclude='forum/*' \
--exclude='users/*' --exclude='devblog/*' --exclude='thanks'; \
else \
echo "** ikiwiki not found, skipping building docs" >&2; \
fi
add
2010-10-10 04:18:16 +00:00
update
2010-10-19 19:59:40 +00:00
clean:
avoid running BUILDER clean when it's cabal This alows debian/rules clean to work when build deps are not installed.
2016-01-22 15:51:54 +00:00
if [ "$(BUILDER)" != ./Setup ] && [ "$(BUILDER)" != cabal ]; then $(BUILDER) clean; fi
embed test suite into git annex; available by running: git annex test I have seen some other programs do this, and think it's pretty cool. Means you can test wherever it's deployed, as well as at build time. My other reason for doing it is less happy. Cabal's handling of test suites sucks, requiring duplicated info, and even when that's done, it fails to preprocess hsc files here. Building it in avoids that and avoids having to explicitly tell cabal to enable test suites, which would then make it link the test executable every time, which is unnecessarily slow. This also has the benefit that now "make fast test" does a max speed build and tests it.
2013-02-27 19:35:07 +00:00
rm -rf tmp dist git-annex $(mans) configure *.tix .hpc \
Make Build/BuildVersion update embedded version number This way, autobuilders can run it before building, in a tree where git-annex was already built, and get the current git rev embedded in the build. Before, the version number only updated when the setup program was run, which was up to cabal and not on every build.
2018-06-26 14:33:28 +00:00
doc/.ikiwiki html dist tags Build/SysConfig Build/Version \
better cleaning yet
2013-04-14 20:57:37 +00:00
Setup Build/InstallDesktopFile Build/EvilSplicer \
add Build/BuildVersion, for use by autobuilders
2014-06-18 18:29:39 +00:00
Build/Standalone Build/OSXMkLibs Build/LinuxMkLibs \
fix clean of Build/MakeMans
2016-07-19 18:42:11 +00:00
Build/DistributionUpdate Build/BuildVersion Build/MakeMans \
remove git-annex-shell symlink on clean
2017-05-10 19:39:21 +00:00
git-annex-shell git-union-merge .tasty-rerun-log
Add explicit path to find invocation in "make clean" target.
2013-11-17 16:11:05 +00:00
find . -name \*.o -exec rm {} \;
find . -name \*.hi -exec rm {} \;
avoid runghc
2013-04-14 20:00:31 +00:00
Build/InstallDesktopFile: Build/InstallDesktopFile.hs
more -fno-warn-tabs
2015-06-01 01:18:52 +00:00
$(GHC) --make $@ -Wall -fno-warn-tabs
avoid runghc
2013-04-14 20:00:31 +00:00
Build/EvilSplicer: Build/EvilSplicer.hs
more -fno-warn-tabs
2015-06-01 01:18:52 +00:00
$(GHC) --make $@ -Wall -fno-warn-tabs
add back a configure target Otherwise, make reconfigures every time and then rebuilds all files. I went too far in 3af9f5ed1a54f1df12f85f613826040e5e855817. All that's needed is to make the configure target not use Build/SysConfig.hs as the target name, so make won't delete that file after a failed build. This commit was supported by the NSF-funded DataLad project
2017-02-24 15:27:00 +00:00
Build/Standalone: Build/Standalone.hs tmp/configure-stamp
more -fno-warn-tabs
2015-06-01 01:18:52 +00:00
$(GHC) --make $@ -Wall -fno-warn-tabs
avoid runghc
2013-04-14 20:00:31 +00:00
Build/OSXMkLibs: Build/OSXMkLibs.hs
more -fno-warn-tabs
2015-06-01 01:18:52 +00:00
$(GHC) --make $@ -Wall -fno-warn-tabs
convert hacky shell linux mklibs code to haskell ; fixing symlink bug The shell code was nasty, and buggy. New haskell code is much nicer, and it's easy to do complicated calculations to properly convert possibly absolute symlinks between libraries into relative links using it.
2013-12-24 17:13:17 +00:00
Build/LinuxMkLibs: Build/LinuxMkLibs.hs
more -fno-warn-tabs
2015-06-01 01:18:52 +00:00
$(GHC) --make $@ -Wall -fno-warn-tabs
fix man page building
2016-06-02 20:54:13 +00:00
Build/MakeMans: Build/MakeMans.hs
Remove Makefile from cabal tarball; man page building is now handled by a small haskell program. This actually runs faster than building the man pages from the makefile did. But the main purpose is to let Setup.hs import Build.Mans and so not need the makefile.
2016-05-31 17:58:13 +00:00
$(GHC) --make $@ -Wall -fno-warn-tabs
update
2010-10-19 19:59:40 +00:00
Makefile now builds using cabal, taking advantage of cabal's automatic detection of appropriate build flags. The only thing lost is ./ghci Speed: make fast used to take 20 seconds here, when rebuilding from touching Command/Unused.hs. With cabal, it's 29 seconds.
2013-02-27 06:39:22 +00:00
LINUXSTANDALONE_DEST=tmp/git-annex.linux
fix osxapp target Broken by recent changes to other targets
2017-02-26 18:54:24 +00:00
linuxstandalone:
$(MAKE) git-annex Build/Standalone Build/LinuxMkLibs
build fix
2013-02-27 18:14:38 +00:00
rm -rf "$(LINUXSTANDALONE_DEST)"
mkdir -p tmp
Include git-receive-pack, git-upload-pack, and git wrappers in the Linux standalone build, and OSX app, so they will be available when it's added to PATH.
2013-12-24 20:28:10 +00:00
cp -R standalone/linux/skel "$(LINUXSTANDALONE_DEST)"
Make the git-annex-standalone.deb prevent runshell from installing wrappers into $HOME/.ssh
2015-11-10 16:53:46 +00:00
sed -i -e 's/^GIT_ANNEX_PACKAGE_INSTALL=/GIT_ANNEX_PACKAGE_INSTALL=$(GIT_ANNEX_PACKAGE_INSTALL)/' "$(LINUXSTANDALONE_DEST)/runshell"
Include man pages in Linux and OSX standalone builds.
2013-12-15 20:27:46 +00:00
building linux standalone tarballs
2012-09-28 22:21:39 +00:00
install -d "$(LINUXSTANDALONE_DEST)/bin"
allow linuxstandalone to be used with stack built binary
2016-03-05 20:57:37 +00:00
cp git-annex "$(LINUXSTANDALONE_DEST)/bin/"
building linux standalone tarballs
2012-09-28 22:21:39 +00:00
strip "$(LINUXSTANDALONE_DEST)/bin/git-annex"
ln -sf git-annex "$(LINUXSTANDALONE_DEST)/bin/git-annex-shell"
Added git-remote-tor-annex, which allows git pull and push to the tor hidden service. Almost working, but there's a bug in the relaying. Also, made tor hidden service setup pick a random port, to make it harder to port scan. This commit was sponsored by Boyd Stephen Smith Jr. on Patreon.
2016-11-21 21:27:38 +00:00
ln -sf git-annex "$(LINUXSTANDALONE_DEST)/bin/git-remote-tor-annex"
standalone linux app nearly ready also made several fixes that apply to the OSX app
2012-09-28 23:08:13 +00:00
zcat standalone/licences.gz > $(LINUXSTANDALONE_DEST)/LICENSE
rename favicon.png to logo_16x16.png This was never used as a favicon, it's just a png version of the favicon.ico. It's actually used for the freedesktop menu file.
2014-03-16 19:50:53 +00:00
cp doc/logo_16x16.png doc/logo.svg $(LINUXSTANDALONE_DEST)
Standalone builds now check gpg signatures before upgrading.
2014-04-23 17:30:30 +00:00
cp standalone/trustedkeys.gpg $(LINUXSTANDALONE_DEST)
building linux standalone tarballs
2012-09-28 22:21:39 +00:00
avoid runghc
2013-04-14 20:00:31 +00:00
./Build/Standalone "$(LINUXSTANDALONE_DEST)"
building linux standalone tarballs
2012-09-28 22:21:39 +00:00
install -d "$(LINUXSTANDALONE_DEST)/git-core"
(cd "$(shell git --exec-path)" && tar c .) | (cd "$(LINUXSTANDALONE_DEST)"/git-core && tar x)
furnish git with an (empty) template directory in standalone builds This will stop git-init complaining about missing template directory.
2012-12-13 16:27:32 +00:00
install -d "$(LINUXSTANDALONE_DEST)/templates"
Added git template directory to Linux standalone tarball and OSX app bundle. Git does not provide a switch to find out where this directory is, and while the git-init man page says it will always be in /usr/share/git-core/templates, that's not the case on OSX with git installed from homebrew. So, I used a hack taking the --man-path and constructing a path from that. Works on both Debian and OSX at least.
2017-02-10 17:55:54 +00:00
(cd "$(shell git --man-path)"/../git-core/templates && tar c .) | (cd "$(LINUXSTANDALONE_DEST)"/templates && tar x)
Include magic database in the linux and OSX standalone builds.
2016-02-26 15:54:15 +00:00
install -d "$(LINUXSTANDALONE_DEST)/magic"
cp /usr/share/file/magic.mgc "$(LINUXSTANDALONE_DEST)/magic"
Linux standalone: Fix location of locale files in the bundle. The Makefile was putting them in git-annex.linux/i18n/i18n, and so I18NPATH did not point to the files. I think that on close enough to Debian systems, localedef then fell back to using the system-wide locale files, while on other systems it would fail to generate locales.
2016-10-31 18:31:46 +00:00
cp /usr/share/i18n -a "$(LINUXSTANDALONE_DEST)"
building linux standalone tarballs
2012-09-28 22:21:39 +00:00
convert hacky shell linux mklibs code to haskell ; fixing symlink bug The shell code was nasty, and buggy. New haskell code is much nicer, and it's easy to do complicated calculations to properly convert possibly absolute symlinks between libraries into relative links using it.
2013-12-24 17:13:17 +00:00
./Build/LinuxMkLibs "$(LINUXSTANDALONE_DEST)"
Include man pages in Linux and OSX standalone builds.
2013-12-15 20:27:46 +00:00
$(MAKE) install-mans DESTDIR="$(LINUXSTANDALONE_DEST)"
building linux standalone tarballs
2012-09-28 22:21:39 +00:00
add git-annex.MANIFEST files to linux and osx standalone images
2013-11-24 04:30:21 +00:00
cd tmp/git-annex.linux && find . -type f > git-annex.MANIFEST
use manifest file instead of blindly removing the whole git-annex.linux directory FIXME: dirContentsRecursive does not find empty directories
2013-11-24 05:11:04 +00:00
cd tmp/git-annex.linux && find . -type l >> git-annex.MANIFEST
compress standalone tarball with gzip --rsyncable This should cut down on transfer overhead; in particular the arm autobuilder is on a slow pipe.
2015-05-31 20:36:50 +00:00
cd tmp && tar c git-annex.linux | gzip -9 --rsyncable > git-annex-standalone-$(shell dpkg --print-architecture).tar.gz
fixes
2012-09-28 22:29:36 +00:00
ENH: make debianstandalone{,-dsc} rules Moved rules out of debian/rules and avoided need for patching it for standalone builds
2015-05-11 08:45:33 +00:00
# Run this target to build git-annex-standalone*.deb
debianstandalone: dpkg-buildpackage-F
# Run this target to build git-annex-standalone*.dsc
debianstandalone-dsc: dpkg-buildpackage-S
prep-standalone:
$(MAKE) undo-standalone
QUILT_PATCHES=debian/patches QUILT_SERIES=series.standalone-build quilt push -a
debian/create-standalone-changelog
undo-standalone:
test -e .git
Updated cabal file explictly lists source files. The tarball on hackage will include only the files needed for cabal install; it is NOT the full git-annex source tree. While it's totally obnoxious that cabal files need every file listed out when basic wildcard support could avoid hundreds of lines, and have to be maintained when files are added, this does get the tarball size back down to 1 mb. This also stops stack from complaining that it found modules not listed in the cabal file. debian/changelog, debian/NEWS, debian/copyright: Converted to symlinks to CHANGELOG, NEWS, and COPYRIGHT, which used to symlink to these instead. This avoids needing to include debian/ in the hackage tarball. Setup.hs: Build man pages at install time using make and mdwn2man. If it fails, which it probably will on windows, just skip installing them.
2016-05-24 05:00:06 +00:00
git checkout debian/changelog CHANGELOG
ENH: make debianstandalone{,-dsc} rules Moved rules out of debian/rules and avoided need for patching it for standalone builds
2015-05-11 08:45:33 +00:00
quilt pop -a || true
add commit-standalone target to refresh quilt patch
2015-06-10 17:57:04 +00:00
commit-standalone:
QUILT_PATCHES=debian/patches QUILT_SERIES=series.standalone-build quilt refresh
ENH: make debianstandalone{,-dsc} rules Moved rules out of debian/rules and avoided need for patching it for standalone builds
2015-05-11 08:45:33 +00:00
dpkg-buildpackage%: prep-standalone
umask 022; dpkg-buildpackage -rfakeroot $*
$(MAKE) undo-standalone
Makefile now builds using cabal, taking advantage of cabal's automatic detection of appropriate build flags. The only thing lost is ./ghci Speed: make fast used to take 20 seconds here, when rebuilding from touching Command/Unused.hs. With cabal, it's 29 seconds.
2013-02-27 06:39:22 +00:00
OSXAPP_DEST=tmp/build-dmg/git-annex.app
reorganize osx app, so it can be put in PATH Move all the binaries and libraries under a bundle/ subdirectory; so when it's in PATH only git-annex, runshell, and git-annex-webapp will be available.
2013-03-20 18:01:05 +00:00
OSXAPP_BASE=$(OSXAPP_DEST)/Contents/MacOS/bundle
fix osxapp deps
2017-02-28 16:46:00 +00:00
osxapp:
fix osxapp target Broken by recent changes to other targets
2017-02-26 18:54:24 +00:00
$(MAKE) git-annex Build/Standalone Build/OSXMkLibs
disable ssh connection caching for standalone builds The standalone build does not bundle its own ssh, so should be built to support as wide an array of ssh versions as possible, so turn off connection caching. Unfortunatly, as implemented this forces a full rebuild when building the standalone binary, and of course it makes it somewhat slower. This is not ideal, but neither is probing the ssh version every time it's run (slow), or once when initializing a repo (fragile).
2012-10-15 18:49:40 +00:00
OSX: Remove RPATHs from git-annex binary, which are not needed, slow down startup, and break the OSX Sierra linker. ghc 8.0.2 may make this unncessary, but it's not in a stackage version yet, so put in a workaround. Note that the linux builds already delete the RPATHs for similar reasons. This commit was sponsored by Josh Taylor on Patreon.
2016-11-07 18:21:30 +00:00
# Remove all RPATHs, both because this overloads the linker on
# OSX Sierra, and to avoid the binary looking in someone's home
# directory.
avoid OSX build failure when there are no rpaths to remove
2017-02-14 15:44:52 +00:00
if otool -l git-annex | grep -q "path "; then \
eval install_name_tool $$(otool -l git-annex | grep "path " | sed 's/.*path /-delete_rpath /' | sed 's/ (.*//') git-annex; \
fi
OSX: Remove RPATHs from git-annex binary, which are not needed, slow down startup, and break the OSX Sierra linker. ghc 8.0.2 may make this unncessary, but it's not in a stackage version yet, so put in a workaround. Note that the linux builds already delete the RPATHs for similar reasons. This commit was sponsored by Josh Taylor on Patreon.
2016-11-07 18:21:30 +00:00
nuke tmp dir so things don't linger between builds
2014-04-10 17:08:07 +00:00
rm -rf "$(OSXAPP_DEST)" "$(OSXAPP_BASE)"
Makefile now builds using cabal, taking advantage of cabal's automatic detection of appropriate build flags. The only thing lost is ./ghci Speed: make fast used to take 20 seconds here, when rebuilding from touching Command/Unused.hs. With cabal, it's 29 seconds.
2013-02-27 06:39:22 +00:00
install -d tmp/build-dmg
move
2012-10-01 17:38:19 +00:00
cp -R standalone/osx/git-annex.app "$(OSXAPP_DEST)"
build osx app in tmp dir
2012-09-25 14:12:25 +00:00
use install_name_tool to adjust library paths in osx app Have not yet been able to test this.
2012-12-08 15:07:59 +00:00
install -d "$(OSXAPP_BASE)"
cp git-annex "$(OSXAPP_BASE)"
strip "$(OSXAPP_BASE)/git-annex"
ln -sf git-annex "$(OSXAPP_BASE)/git-annex-shell"
Added git-remote-tor-annex, which allows git pull and push to the tor hidden service. Almost working, but there's a bug in the relaying. Also, made tor hidden service setup pick a random port, to make it harder to port scan. This commit was sponsored by Boyd Stephen Smith Jr. on Patreon.
2016-11-21 21:27:38 +00:00
ln -sf git-annex "$(OSXAPP_BASE)/git-remote-tor-annex"
standalone linux app nearly ready also made several fixes that apply to the OSX app
2012-09-28 23:08:13 +00:00
gzcat standalone/licences.gz > $(OSXAPP_BASE)/LICENSE
Makefile now builds using cabal, taking advantage of cabal's automatic detection of appropriate build flags. The only thing lost is ./ghci Speed: make fast used to take 20 seconds here, when rebuilding from touching Command/Unused.hs. With cabal, it's 29 seconds.
2013-02-27 06:39:22 +00:00
cp $(OSXAPP_BASE)/LICENSE tmp/build-dmg/LICENSE.txt
correct path for trustedkeys
2015-05-22 18:01:11 +00:00
cp standalone/trustedkeys.gpg $(OSXAPP_DEST)/Contents/MacOS
avoid installing git-annex from PATH to the webapp
2012-09-27 15:44:40 +00:00
avoid runghc
2013-04-14 20:00:31 +00:00
./Build/Standalone $(OSXAPP_BASE)
add osxapp target Not fully tested.
2012-09-24 23:40:21 +00:00
use install_name_tool to adjust library paths in osx app Have not yet been able to test this.
2012-12-08 15:07:59 +00:00
(cd "$(shell git --exec-path)" && tar c .) | (cd "$(OSXAPP_BASE)" && tar x)
typo
2012-12-13 19:48:32 +00:00
install -d "$(OSXAPP_BASE)/templates"
Added git template directory to Linux standalone tarball and OSX app bundle. Git does not provide a switch to find out where this directory is, and while the git-init man page says it will always be in /usr/share/git-core/templates, that's not the case on OSX with git installed from homebrew. So, I used a hack taking the --man-path and constructing a path from that. Works on both Debian and OSX at least.
2017-02-10 17:55:54 +00:00
(cd "$(shell git --man-path)"/../git-core/templates && tar c .) | (cd "$(OSXAPP_BASE)"/templates && tar x)
Include magic database in the linux and OSX standalone builds.
2016-02-26 15:54:15 +00:00
install -d "$(OSXAPP_BASE)/magic"
if [ -e "$(OSX_MAGIC_FILE)" ]; then \
cp "$(OSX_MAGIC_FILE)" "$(OSXAPP_BASE)/magic/magic.mgc"; \
else \
echo "** OSX_MAGIC_FILE not set; not including it" >&2; \
typo
2016-02-26 16:21:20 +00:00
fi
add osxapp target Not fully tested.
2012-09-24 23:40:21 +00:00
Include man pages in Linux and OSX standalone builds.
2013-12-15 20:27:46 +00:00
# OSX looks in man dir nearby the bin
also need to set PREFIX in osxapp
2013-12-15 20:53:31 +00:00
$(MAKE) install-mans DESTDIR="$(OSXAPP_BASE)/.." SHAREDIR="" PREFIX=""
Include man pages in Linux and OSX standalone builds.
2013-12-15 20:27:46 +00:00
avoid runghc
2013-04-14 20:00:31 +00:00
./Build/OSXMkLibs $(OSXAPP_BASE)
completely untested OSX upgrade code
2013-11-24 19:53:15 +00:00
cd $(OSXAPP_DEST) && find . -type f > Contents/MacOS/git-annex.MANIFEST
cd $(OSXAPP_DEST) && find . -type l >> Contents/MacOS/git-annex.MANIFEST
let's build the dmz from the osxapp target Also, delete old version, otherwise hditool chokes on it
2012-09-28 16:20:18 +00:00
rm -f tmp/git-annex.dmg
add -size to hdiutil call, it seems its own size calculation is buggy and so it has been failing Also re-add removed file, seem to work now. hdiutil has *horrible* error reporting. You get back a number from 1 to 1000, with no indication of the problem. --verbose doesn't help. So this is all guesswork.
2013-12-30 17:59:25 +00:00
hdiutil create -format UDBZ -size 640m -srcfolder tmp/build-dmg \
teach the makefile to generate a .dmg file for the OSX app, the licenses and basic readme's still needs to be copied into the tmp/build-dmg directory.
2012-09-27 19:23:40 +00:00
-volname git-annex -o tmp/git-annex.dmg
enable XMPP on android
2013-11-26 19:22:16 +00:00
ANDROID_FLAGS?=
Makefile now builds using cabal, taking advantage of cabal's automatic detection of appropriate build flags. The only thing lost is ./ghci Speed: make fast used to take 20 seconds here, when rebuilding from touching Command/Unused.hs. With cabal, it's 29 seconds.
2013-02-27 06:39:22 +00:00
# Cross compile for Android.
can now build Android targeted binary Various things that don't work on Android are just ifdefed out. * the webapp (needs template haskell for arm) * --include and --exclude globbing (needs libpcre, which is not ported; probably I'll make it use the pure haskell glob library instead) * annex.diskreserve checking (missing sys/statvfs.h) * timestamp preservation support (yawn) * S3 * WebDAV * XMPP The resulting 17mb binary has been tested on Android, and it is able to, at least, print its usage message.
2013-02-10 19:48:38 +00:00
# Uses https://github.com/neurocyte/ghc-android
avoid runghc
2013-04-14 20:00:31 +00:00
android: Build/EvilSplicer
avoid displaying splices on the console during build There are some insanely large ones, and that was just not nice. Downside is all warnings and errors are also not shown during the native part of the build (but the cross build will still show any it has).
2013-04-14 21:03:41 +00:00
echo "Running native build, to get TH splices.."
support building with BUILDER=stack to use stack instead of cabal
2015-12-28 18:10:08 +00:00
if [ ! -e dist/setup/setup ]; then $(BUILDER) configure -O0 $(ANDROID_FLAGS) -fAndroidSplice; fi
android build fix
2013-04-15 23:14:18 +00:00
mkdir -p tmp
support building with BUILDER=stack to use stack instead of cabal
2015-12-28 18:10:08 +00:00
if ! $(BUILDER) build --ghc-options=-ddump-splices 2> tmp/dump-splices; then tail tmp/dump-splices >&2; exit 1; fi
build android with EvilSplicer, including webapp (doesn't 100% succeed yet)
2013-04-15 21:43:28 +00:00
echo "Setting up Android build tree.."
fix android build
2013-12-20 00:24:37 +00:00
./Build/EvilSplicer tmp/splices tmp/dump-splices standalone/no-th/evilsplicer-headers.hs
build android with EvilSplicer, including webapp (doesn't 100% succeed yet)
2013-04-15 21:43:28 +00:00
rsync -az --exclude tmp --exclude dist . tmp/androidtree
incremental android builds with the EvilSplicer
2013-04-14 17:25:06 +00:00
# Copy the files with expanded splices to the source tree, but
# 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,
# and not overwritten.)
don't fail android build if there are no splices
2013-05-02 15:18:01 +00:00
cp -uR tmp/splices/* tmp/androidtree || true
build android with EvilSplicer, including webapp (doesn't 100% succeed yet)
2013-04-15 21:43:28 +00:00
# Some additional dependencies needed by the expanded splices.
last changes to fix android build
2015-08-03 03:02:53 +00:00
sed -i 's/^ Build-Depends: */ Build-Depends: yesod-core, yesod-routes, shakespeare, blaze-markup, file-embed, wai-app-static, wai, unordered-containers, /' tmp/androidtree/git-annex.cabal
squelch warnings
2013-04-17 02:46:10 +00:00
# Avoid warnings due to sometimes unused imports added for the splices.
avoid warning about -XMagicHash
2014-08-15 14:58:18 +00:00
sed -i 's/GHC-Options: \(.*\)-Wall/GHC-Options: \1-Wall -fno-warn-unused-imports /i' tmp/androidtree/git-annex.cabal
fix path
2014-08-16 17:50:12 +00:00
sed -i 's/Extensions: /Extensions: MagicHash /i' tmp/androidtree/git-annex.cabal
squelch warnings
2013-04-17 02:46:10 +00:00
# Cabal cannot cross compile with custom build type, so workaround.
build android with EvilSplicer, including webapp (doesn't 100% succeed yet)
2013-04-15 21:43:28 +00:00
sed -i 's/Build-type: Custom/Build-type: Simple/' tmp/androidtree/git-annex.cabal
Android: Provide a version built with -fPIE -pie to support Android 5.0.
2015-01-05 16:29:20 +00:00
# Build just once, but link repeatedly, for different versions of Android.
mkdir -p tmp/androidtree/dist/build/git-annex/4.0 tmp/androidtree/dist/build/git-annex/4.3 tmp/androidtree/dist/build/git-annex/5.0
avoid excesive cabal configure when rebuilding android
2013-11-26 19:21:22 +00:00
if [ ! -e tmp/androidtree/dist/setup-config ]; then \
Android: Fix disabling use of cp --reflink=auto, curl, sha224, and sha384. This was originally done in a7ef05a9, but got lost in some change to the Makefile. Use CROSS_COMPILE=Android to tell configure that it's configuring for android instead of passing it a parameter.
2016-09-05 18:11:35 +00:00
cd tmp/androidtree && CROSS_COMPILE=Android $$HOME/.ghc/$(shell cat standalone/android/abiversion)/arm-linux-androideabi/bin/cabal configure -fAndroid $(ANDROID_FLAGS); \
android build fix
2013-04-15 23:14:18 +00:00
fi
android: try harder to force PIE for android 5+ This may work around ghc's -no-pie flag. Untested.
2018-04-16 21:30:21 +00:00
PATH=$(shell standalone/android/toolchainpath 4) cd tmp/androidtree && $$HOME/.ghc/$(shell cat standalone/android/abiversion)/arm-linux-androideabi/bin/cabal build \
separate android 4.0 and 4.3 builds needed Also, parameterize the abdroid abi version
2013-11-12 18:24:53 +00:00
&& mv dist/build/git-annex/git-annex dist/build/git-annex/4.0/git-annex
android: try harder to force PIE for android 5+ This may work around ghc's -no-pie flag. Untested.
2018-04-16 21:30:21 +00:00
PATH=$(shell standalone/android/toolchainpath 4) cd tmp/androidtree && $$HOME/.ghc/$(shell cat standalone/android/abiversion)/arm-linux-androideabi/bin/cabal build \
separate android 4.0 and 4.3 builds needed Also, parameterize the abdroid abi version
2013-11-12 18:24:53 +00:00
--ghc-options=-optl-z --ghc-options=-optlnocopyreloc \
&& mv dist/build/git-annex/git-annex dist/build/git-annex/4.3/git-annex
android: try harder to force PIE for android 5+ This may work around ghc's -no-pie flag. Untested.
2018-04-16 21:30:21 +00:00
PATH=$(shell standalone/android/toolchainpath 5) cd tmp/androidtree && $$HOME/.ghc/$(shell cat standalone/android/abiversion)/arm-linux-androideabi/bin/cabal build \
pass pie options to C compiler, not just to linker
2015-01-06 17:16:32 +00:00
--ghc-options=-optl-z --ghc-options=-optlnocopyreloc --ghc-options=-optl-fPIE --ghc-options=-optl-pie --ghc-options=-optc-fPIE --ghc-options=-optc-pie \
Android: Provide a version built with -fPIE -pie to support Android 5.0.
2015-01-05 16:29:20 +00:00
&& mv dist/build/git-annex/git-annex dist/build/git-annex/5.0/git-annex
android build improvements
2013-05-02 20:07:44 +00:00
add androidapp target The android-utilities/ directory currently needs to be set up by hand to contain busybox, etc.
2013-02-13 18:31:22 +00:00
androidapp:
$(MAKE) android
fix make -C
2013-02-13 20:44:46 +00:00
$(MAKE) -C standalone/android
workaround for ghci fragility in reusing objects compiled with ghc
2012-10-18 03:04:43 +00:00
fix make fast to link executable again Use second ghc pass, not first.
2016-02-15 04:57:55 +00:00
# Bypass cabal, and only run the main ghc --make command for a
# faster development build.
fast: dist/cabalbuild
@sh dist/cabalbuild
got hdevtools working on the git-annex source tree
2013-03-12 09:48:41 +00:00
@ln -sf dist/build/git-annex/git-annex git-annex
make tags in bg
2013-03-17 20:22:19 +00:00
@$(MAKE) tags >/dev/null 2>&1 &
got hdevtools working on the git-annex source tree
2013-03-12 09:48:41 +00:00
add back caballog target used by ghci wrapper script
2016-02-15 20:01:31 +00:00
dist/cabalbuild: dist/caballog
grep 'ghc --make' dist/caballog | tail -n 1 > dist/cabalbuild
dist/caballog: git-annex.cabal
support building with BUILDER=stack to use stack instead of cabal
2015-12-28 18:10:08 +00:00
$(BUILDER) configure -f"-Production" -O0 --enable-executable-dynamic
fix make fast to link executable again Use second ghc pass, not first.
2016-02-15 04:57:55 +00:00
$(BUILDER) build -v2 --ghc-options="-O0 -j" | tee dist/caballog
got hdevtools working on the git-annex source tree
2013-03-12 09:48:41 +00:00
# Hardcoded command line to make hdevtools start up and work.
# You will need some memory. It's worth it.
# Note: Don't include WebDAV or Webapp. TH use bloats memory > 500 mb!
# TODO should be possible to derive this from caballog.
hdevtools:
hdevtools --stop-server || true
Removed the testsuite build flag Test suite is always included. Building with this flag disabled has actually been broken for some time, since Command.TestRemote uses tasty. Fewer build flags are better, so good time to drop it. This commit was sponsored by Thomas Hochstein on Patreon.
2017-12-20 16:25:03 +00:00
hdevtools check git-annex.hs -g -cpp -g -i -g -idist/build/git-annex/git-annex-tmp -g -i. -g -idist/build/autogen -g -Idist/build/autogen -g -Idist/build/git-annex/git-annex-tmp -g -IUtility -g -DWITH_S3 -g -DWITH_ASSISTANT -g -DWITH_INOTIFY -g -DWITH_DBUS -g -DWITH_PAIRING -g -g -optP-include -g -optPdist/build/autogen/cabal_macros.h -g -odir -g dist/build/git-annex/git-annex-tmp -g -hidir -g dist/build/git-annex/git-annex-tmp -g -stubdir -g dist/build/git-annex/git-annex-tmp -g -threaded -g -Wall -g -XHaskell98 -g -XPackageImports -g -XLambdaCase
got hdevtools working on the git-annex source tree
2013-03-12 09:48:41 +00:00
distribution info file updater program
2013-11-22 16:21:53 +00:00
distributionupdate:
git pull in distributionupdate
2014-01-03 21:11:19 +00:00
git pull
cabal configure in distributionupdate so build files are fresh
2014-02-10 19:16:08 +00:00
cabal configure
avoid warning with current ghc Seems that the cabal macros file is no longer needed to build DistributionUpdate, and it produced a ton of warnings, so stop including manually.
2018-01-15 16:19:48 +00:00
ghc -Wall -fno-warn-tabs --make Build/DistributionUpdate -XLambdaCase -XPackageImports
distribution info file updater program
2013-11-22 16:21:53 +00:00
./Build/DistributionUpdate
cleanup makefile
2015-07-23 16:51:27 +00:00
.PHONY: git-annex git-union-merge tags
Reference in a new issue Copy permalink