2012-06-18 16:25:20 +00:00
|
|
|
mans=git-annex.1 git-annex-shell.1
|
2013-02-27 06:39:22 +00:00
|
|
|
all=git-annex $(mans) docs
|
2011-11-10 01:36:11 +00:00
|
|
|
|
2013-02-10 19:48:38 +00:00
|
|
|
GHC?=ghc
|
|
|
|
GHCMAKE=$(GHC) $(GHCFLAGS) --make
|
2013-02-27 06:39:22 +00:00
|
|
|
PREFIX=/usr
|
2013-03-10 21:21:13 +00:00
|
|
|
CABAL?=cabal # set to "runghc Setup.hs" if you lack a cabal program
|
2011-11-10 01:36:11 +00:00
|
|
|
|
2013-02-28 01:41:51 +00:00
|
|
|
# Am I typing :make in vim? Do a fast build.
|
|
|
|
ifdef VIM
|
|
|
|
all=fast
|
|
|
|
endif
|
|
|
|
|
2013-03-14 20:45:54 +00:00
|
|
|
build: build-stamp
|
|
|
|
build-stamp: $(all)
|
|
|
|
touch $@
|
2010-11-10 14:49:35 +00:00
|
|
|
|
2012-03-22 21:09:54 +00:00
|
|
|
Build/SysConfig.hs: configure.hs Build/TestConfig.hs Build/Configure.hs
|
2013-02-28 20:08:11 +00:00
|
|
|
$(CABAL) configure
|
2010-11-18 17:30:42 +00:00
|
|
|
|
2013-02-27 06:39:22 +00:00
|
|
|
git-annex: Build/SysConfig.hs
|
2013-02-28 20:08:11 +00:00
|
|
|
$(CABAL) build
|
2013-02-27 06:39:22 +00:00
|
|
|
ln -sf dist/build/git-annex/git-annex git-annex
|
2010-12-30 20:52:24 +00:00
|
|
|
|
2011-01-25 22:54:27 +00:00
|
|
|
git-annex.1: doc/git-annex.mdwn
|
2012-09-01 19:22:13 +00:00
|
|
|
./Build/mdwn2man git-annex 1 doc/git-annex.mdwn > git-annex.1
|
2011-01-25 22:54:27 +00:00
|
|
|
git-annex-shell.1: doc/git-annex-shell.mdwn
|
2012-09-01 19:22:13 +00:00
|
|
|
./Build/mdwn2man git-annex-shell 1 doc/git-annex-shell.mdwn > git-annex-shell.1
|
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
|
2012-09-01 19:22:13 +00:00
|
|
|
./Build/mdwn2man git-union-merge 1 doc/git-union-merge.mdwn > git-union-merge.1
|
2010-10-10 04:18:16 +00:00
|
|
|
|
2012-06-03 22:05:59 +00:00
|
|
|
install-mans: $(mans)
|
2010-12-12 17:15:16 +00:00
|
|
|
install -d $(DESTDIR)$(PREFIX)/share/man/man1
|
2010-12-30 20:52:24 +00:00
|
|
|
install -m 0644 $(mans) $(DESTDIR)$(PREFIX)/share/man/man1
|
2012-06-03 22:05:59 +00:00
|
|
|
|
|
|
|
install-docs: docs install-mans
|
2010-12-12 17:15:16 +00:00
|
|
|
install -d $(DESTDIR)$(PREFIX)/share/doc/git-annex
|
|
|
|
if [ -d html ]; then \
|
|
|
|
rsync -a --delete html/ $(DESTDIR)$(PREFIX)/share/doc/git-annex/html/; \
|
|
|
|
fi
|
2010-10-16 20:41:24 +00:00
|
|
|
|
2013-02-27 21:11:02 +00:00
|
|
|
install: build install-docs
|
2012-06-03 22:05:59 +00:00
|
|
|
install -d $(DESTDIR)$(PREFIX)/bin
|
2013-02-27 21:25:00 +00:00
|
|
|
install git-annex $(DESTDIR)$(PREFIX)/bin
|
2012-06-03 22:05:59 +00:00
|
|
|
ln -sf git-annex $(DESTDIR)$(PREFIX)/bin/git-annex-shell
|
2012-08-02 01:04:25 +00:00
|
|
|
runghc Build/InstallDesktopFile.hs $(PREFIX)/bin/git-annex || true
|
2012-06-03 22:05:59 +00:00
|
|
|
|
2013-03-14 20:55:12 +00:00
|
|
|
test: git-annex
|
2013-02-27 19:35:07 +00:00
|
|
|
./git-annex test
|
2011-01-05 01:05:31 +00:00
|
|
|
|
2013-01-30 03:09:46 +00:00
|
|
|
# hothasktags chokes on some tempolate haskell etc, so ignore errors
|
2013-01-29 11:26:18 +00:00
|
|
|
tags:
|
2013-03-11 22:13:18 +00:00
|
|
|
find . | grep -v /.git/ | grep -v /doc/ | egrep '\.hs$$' | xargs hothasktags > tags 2>/dev/null
|
2013-01-29 11:26:18 +00:00
|
|
|
|
2010-10-19 18:39:40 +00:00
|
|
|
# If ikiwiki is available, build static html docs suitable for being
|
|
|
|
# shipped in the software package.
|
2010-10-19 18:37:19 +00:00
|
|
|
ifeq ($(shell which ikiwiki),)
|
2010-11-02 00:27:30 +00:00
|
|
|
IKIWIKI=@echo "** ikiwiki not found, skipping building docs" >&2; true
|
2010-10-19 18:37:19 +00:00
|
|
|
else
|
|
|
|
IKIWIKI=ikiwiki
|
|
|
|
endif
|
|
|
|
|
2010-12-30 20:52:24 +00:00
|
|
|
docs: $(mans)
|
2010-10-19 18:39:40 +00:00
|
|
|
$(IKIWIKI) doc html -v --wikiname git-annex --plugin=goodstuff \
|
2010-10-19 23:28:29 +00:00
|
|
|
--no-usedirs --disable-plugin=openid --plugin=sidebar \
|
2010-10-22 19:12:48 +00:00
|
|
|
--underlaydir=/dev/null --disable-plugin=shortcut \
|
2010-12-03 01:37:55 +00:00
|
|
|
--disable-plugin=smiley \
|
2011-03-28 16:09:47 +00:00
|
|
|
--plugin=comments --set comments_pagespec="*" \
|
2013-01-07 16:56:20 +00:00
|
|
|
--exclude='news/.*' --exclude='design/assistant/blog/*' \
|
|
|
|
--exclude='bugs/*' --exclude='todo/*' --exclude='forum/*'
|
2010-10-10 04:18:16 +00:00
|
|
|
|
2010-10-19 19:59:40 +00:00
|
|
|
clean:
|
2013-02-27 19:35:07 +00:00
|
|
|
rm -rf tmp dist git-annex $(mans) configure *.tix .hpc \
|
2013-03-14 20:45:54 +00:00
|
|
|
doc/.ikiwiki html dist tags Build/SysConfig.hs build-stamp
|
2010-10-19 19:59:40 +00:00
|
|
|
|
2012-06-11 02:24:15 +00:00
|
|
|
sdist: clean $(mans)
|
2012-09-01 19:22:13 +00:00
|
|
|
./Build/make-sdist.sh
|
2011-07-02 18:53:55 +00:00
|
|
|
|
2012-01-13 19:08:28 +00:00
|
|
|
# Upload to hackage.
|
|
|
|
hackage: sdist
|
|
|
|
@cabal upload dist/*.tar.gz
|
|
|
|
|
2013-02-27 06:39:22 +00:00
|
|
|
LINUXSTANDALONE_DEST=tmp/git-annex.linux
|
2012-10-15 18:49:40 +00:00
|
|
|
linuxstandalone:
|
2013-02-27 17:58:28 +00:00
|
|
|
$(MAKE) git-annex
|
2012-09-28 22:21:39 +00:00
|
|
|
|
2013-02-27 18:14:38 +00:00
|
|
|
rm -rf "$(LINUXSTANDALONE_DEST)"
|
|
|
|
mkdir -p tmp
|
2012-09-28 22:21:39 +00:00
|
|
|
cp -R standalone/linux "$(LINUXSTANDALONE_DEST)"
|
|
|
|
|
|
|
|
install -d "$(LINUXSTANDALONE_DEST)/bin"
|
|
|
|
cp git-annex "$(LINUXSTANDALONE_DEST)/bin/"
|
|
|
|
strip "$(LINUXSTANDALONE_DEST)/bin/git-annex"
|
|
|
|
ln -sf git-annex "$(LINUXSTANDALONE_DEST)/bin/git-annex-shell"
|
2012-09-28 23:08:13 +00:00
|
|
|
zcat standalone/licences.gz > $(LINUXSTANDALONE_DEST)/LICENSE
|
2012-09-28 22:21:39 +00:00
|
|
|
|
2012-12-14 19:52:44 +00:00
|
|
|
runghc Build/Standalone.hs "$(LINUXSTANDALONE_DEST)"
|
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)
|
2012-12-13 16:27:32 +00:00
|
|
|
install -d "$(LINUXSTANDALONE_DEST)/templates"
|
2012-09-28 22:21:39 +00:00
|
|
|
|
|
|
|
touch "$(LINUXSTANDALONE_DEST)/libdirs.tmp"
|
|
|
|
for lib in $$(ldd "$(LINUXSTANDALONE_DEST)"/bin/* $$(find "$(LINUXSTANDALONE_DEST)"/git-core/ -type f) | grep -v -f standalone/linux/glibc-libs | grep -v "not a dynamic executable" | egrep '^ ' | sed 's/^\t//' | sed 's/.*=> //' | cut -d ' ' -f 1 | sort | uniq); do \
|
|
|
|
dir=$$(dirname "$$lib"); \
|
|
|
|
install -d "$(LINUXSTANDALONE_DEST)/$$dir"; \
|
|
|
|
echo "$$dir" >> "$(LINUXSTANDALONE_DEST)/libdirs.tmp"; \
|
|
|
|
cp "$$lib" "$(LINUXSTANDALONE_DEST)/$$dir"; \
|
|
|
|
if [ -L "$lib" ]; then \
|
|
|
|
link=$$(readlink -f "$$lib"); \
|
|
|
|
cp "$$link" "$(LINUXSTANDALONE_DEST)/$$(dirname "$$link")"; \
|
|
|
|
fi; \
|
|
|
|
done
|
|
|
|
sort "$(LINUXSTANDALONE_DEST)/libdirs.tmp" | uniq > "$(LINUXSTANDALONE_DEST)/libdirs"
|
|
|
|
rm -f "$(LINUXSTANDALONE_DEST)/libdirs.tmp"
|
|
|
|
|
2013-02-27 06:39:22 +00:00
|
|
|
cd tmp && tar czf git-annex-standalone-$(shell dpkg --print-architecture).tar.gz git-annex.linux
|
2012-09-28 22:29:36 +00:00
|
|
|
|
2013-02-27 06:39:22 +00:00
|
|
|
OSXAPP_DEST=tmp/build-dmg/git-annex.app
|
2012-09-28 22:21:39 +00:00
|
|
|
OSXAPP_BASE=$(OSXAPP_DEST)/Contents/MacOS
|
2012-10-15 18:49:40 +00:00
|
|
|
osxapp:
|
2012-11-29 19:51:05 +00:00
|
|
|
$(MAKE) git-annex
|
2012-10-15 18:49:40 +00:00
|
|
|
|
2012-09-25 14:12:25 +00:00
|
|
|
rm -rf "$(OSXAPP_DEST)"
|
2013-02-27 06:39:22 +00:00
|
|
|
install -d tmp/build-dmg
|
2012-10-01 17:38:19 +00:00
|
|
|
cp -R standalone/osx/git-annex.app "$(OSXAPP_DEST)"
|
2012-09-25 14:12:25 +00:00
|
|
|
|
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"
|
2012-09-28 23:08:13 +00:00
|
|
|
gzcat standalone/licences.gz > $(OSXAPP_BASE)/LICENSE
|
2013-02-27 06:39:22 +00:00
|
|
|
cp $(OSXAPP_BASE)/LICENSE tmp/build-dmg/LICENSE.txt
|
2012-09-27 15:44:40 +00:00
|
|
|
|
2012-12-14 19:52:44 +00:00
|
|
|
runghc Build/Standalone.hs $(OSXAPP_BASE)
|
2012-09-24 23:40:21 +00:00
|
|
|
|
2012-12-08 15:07:59 +00:00
|
|
|
(cd "$(shell git --exec-path)" && tar c .) | (cd "$(OSXAPP_BASE)" && tar x)
|
2012-12-13 19:48:32 +00:00
|
|
|
install -d "$(OSXAPP_BASE)/templates"
|
2012-09-24 23:40:21 +00:00
|
|
|
|
2012-11-26 18:09:40 +00:00
|
|
|
runghc Build/OSXMkLibs.hs $(OSXAPP_BASE)
|
2012-09-28 16:20:18 +00:00
|
|
|
rm -f tmp/git-annex.dmg
|
2013-02-27 06:39:22 +00:00
|
|
|
hdiutil create -size 640m -format UDRW -srcfolder tmp/build-dmg \
|
2012-09-27 19:23:40 +00:00
|
|
|
-volname git-annex -o tmp/git-annex.dmg
|
2012-09-28 16:20:18 +00:00
|
|
|
rm -f tmp/git-annex.dmg.bz2
|
2012-12-09 17:43:18 +00:00
|
|
|
bzip2 --fast tmp/git-annex.dmg
|
2012-09-27 19:23:40 +00:00
|
|
|
|
2013-02-27 06:39:22 +00:00
|
|
|
# Cross compile for Android.
|
2013-02-10 19:48:38 +00:00
|
|
|
# Uses https://github.com/neurocyte/ghc-android
|
|
|
|
android:
|
2013-02-28 20:08:11 +00:00
|
|
|
$(CABAL) configure
|
2013-02-27 19:16:52 +00:00
|
|
|
# cabal cannot cross compile with custom build type, so workaround
|
|
|
|
sed -i 's/Build-type: Custom/Build-type: Simple/' git-annex.cabal
|
2013-02-28 03:26:14 +00:00
|
|
|
$$HOME/.ghc/android-14/arm-linux-androideabi-4.7/arm-linux-androideabi/bin/cabal configure -f'Android Assistant -Pairing -Webapp'
|
2013-02-27 06:39:22 +00:00
|
|
|
$(MAKE) git-annex
|
2013-02-27 19:16:52 +00:00
|
|
|
sed -i 's/Build-type: Simple/Build-type: Custom/' git-annex.cabal
|
2013-02-10 19:48:38 +00:00
|
|
|
|
2013-02-13 18:31:22 +00:00
|
|
|
androidapp:
|
|
|
|
$(MAKE) android
|
2013-02-13 20:44:46 +00:00
|
|
|
$(MAKE) -C standalone/android
|
2012-10-18 03:04:43 +00:00
|
|
|
|
2013-03-12 09:48:41 +00:00
|
|
|
# We bypass cabal, and only run the main ghc --make command for a
|
|
|
|
# fast development built. Note: Does not rebuild C libraries.
|
|
|
|
fast: dist/caballog
|
2013-03-12 20:40:24 +00:00
|
|
|
@$$(grep 'ghc --make' dist/caballog | head -n 1 | sed -e 's/-package-id [^ ]*//g' -e 's/-hide-all-packages//') -O0
|
2013-03-12 09:48:41 +00:00
|
|
|
@ln -sf dist/build/git-annex/git-annex git-annex
|
2013-03-17 20:22:19 +00:00
|
|
|
@$(MAKE) tags >/dev/null 2>&1 &
|
2013-03-12 09:48:41 +00:00
|
|
|
|
|
|
|
dist/caballog: git-annex.cabal
|
|
|
|
$(CABAL) configure -f"-Production" -O0
|
|
|
|
$(CABAL) build -v2 | tee $@
|
|
|
|
|
|
|
|
# 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
|
|
|
|
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_TESTSUITE -g -DWITH_S3 -g -DWITH_ASSISTANT -g -DWITH_INOTIFY -g -DWITH_DBUS -g -DWITH_PAIRING -g -DWITH_XMPP -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
|
|
|
|
|
2013-03-14 20:45:54 +00:00
|
|
|
.PHONY: git-annex tags build-stamp
|