2010-12-11 21:29:50 +00:00
|
|
|
PREFIX=/usr
|
2011-04-05 18:00:51 +00:00
|
|
|
IGNORE=-ignore-package monads-fd
|
2011-04-29 17:12:26 +00:00
|
|
|
GHCFLAGS=-O2 -Wall $(IGNORE) -fspec-constr-count=5
|
2011-11-10 01:36:11 +00:00
|
|
|
|
2011-04-05 18:00:51 +00:00
|
|
|
ifdef PROFILE
|
2011-04-21 15:23:44 +00:00
|
|
|
GHCFLAGS=-prof -auto-all -rtsopts -caf-all -fforce-recomp $(IGNORE)
|
2011-04-05 18:00:51 +00:00
|
|
|
endif
|
2011-11-10 01:36:11 +00:00
|
|
|
|
2011-01-07 06:15:23 +00:00
|
|
|
GHCMAKE=ghc $(GHCFLAGS) --make
|
2010-10-19 18:39:40 +00:00
|
|
|
|
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
|
|
|
bins=git-annex git-annex-shell git-union-merge
|
|
|
|
mans=git-annex.1 git-annex-shell.1 git-union-merge.1
|
2011-08-20 20:11:42 +00:00
|
|
|
sources=Build/SysConfig.hs Utility/StatFS.hs Utility/Touch.hs Remote/S3.hs
|
2010-12-30 20:52:24 +00:00
|
|
|
|
2011-11-10 01:36:11 +00:00
|
|
|
all=$(bins) $(mans) docs
|
|
|
|
|
2011-11-10 07:10:17 +00:00
|
|
|
# Am I typing :make in vim? Do a fast build.
|
2011-11-10 01:36:11 +00:00
|
|
|
ifdef VIM
|
2011-11-10 07:10:17 +00:00
|
|
|
all=fast
|
2011-11-10 01:36:11 +00:00
|
|
|
endif
|
|
|
|
|
|
|
|
all: $(all)
|
2010-11-10 14:49:35 +00:00
|
|
|
|
2011-11-10 07:10:17 +00:00
|
|
|
# Disables optimisation. Not for production use.
|
|
|
|
fast: GHCFLAGS=-Wall $(IGNORE)
|
|
|
|
fast: $(bins)
|
|
|
|
|
2011-08-20 20:11:42 +00:00
|
|
|
Build/SysConfig.hs: configure.hs Build/TestConfig.hs
|
2010-12-11 21:29:50 +00:00
|
|
|
$(GHCMAKE) configure
|
2010-11-18 17:30:42 +00:00
|
|
|
./configure
|
|
|
|
|
2011-03-22 19:39:36 +00:00
|
|
|
%.hs: %.hsc
|
2011-03-15 03:00:23 +00:00
|
|
|
hsc2hs $<
|
2011-03-16 01:34:13 +00:00
|
|
|
perl -i -pe 's/^{-# INCLUDE.*//' $@
|
2011-03-15 03:00:23 +00:00
|
|
|
|
2011-06-30 18:55:03 +00:00
|
|
|
Remote/S3.hs:
|
2011-03-30 05:32:05 +00:00
|
|
|
@ln -sf S3real.hs Remote/S3.hs
|
2011-06-30 18:55:03 +00:00
|
|
|
|
|
|
|
Remote/S3.o: Remote/S3.hs
|
2011-03-30 05:32:05 +00:00
|
|
|
@if ! $(GHCMAKE) Remote/S3.hs; then \
|
|
|
|
ln -sf S3stub.hs Remote/S3.hs; \
|
|
|
|
echo "** building without S3 support"; \
|
|
|
|
fi
|
|
|
|
|
2011-09-06 19:35:13 +00:00
|
|
|
sources: $(sources)
|
|
|
|
|
2011-09-07 14:21:19 +00:00
|
|
|
$(bins): sources Remote/S3.o
|
2010-12-30 20:52:24 +00:00
|
|
|
$(GHCMAKE) $@
|
|
|
|
|
2011-01-25 22:54:27 +00:00
|
|
|
git-annex.1: doc/git-annex.mdwn
|
2010-12-12 17:15:16 +00:00
|
|
|
./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
|
|
|
|
./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
|
|
|
|
./mdwn2man git-union-merge 1 doc/git-union-merge.mdwn > git-union-merge.1
|
2010-10-10 04:18:16 +00:00
|
|
|
|
2010-12-12 17:15:16 +00:00
|
|
|
install: all
|
2010-12-11 21:29:50 +00:00
|
|
|
install -d $(DESTDIR)$(PREFIX)/bin
|
2010-12-30 20:52:24 +00:00
|
|
|
install $(bins) $(DESTDIR)$(PREFIX)/bin
|
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
|
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
|
|
|
|
2011-12-20 20:02:59 +00:00
|
|
|
test:
|
2011-06-23 00:42:00 +00:00
|
|
|
@if ! $(GHCMAKE) -O0 test; then \
|
2011-04-25 16:43:22 +00:00
|
|
|
echo "** not running test suite" >&2; \
|
|
|
|
else \
|
2011-08-27 16:34:02 +00:00
|
|
|
if ! ./test; then \
|
|
|
|
echo "** test suite failed!" >&2; \
|
2011-10-06 15:12:03 +00:00
|
|
|
exit 1; \
|
2011-08-27 16:34:02 +00:00
|
|
|
fi; \
|
2011-04-25 16:43:22 +00:00
|
|
|
fi
|
2010-12-11 21:37:24 +00:00
|
|
|
|
2011-12-20 20:02:59 +00:00
|
|
|
testcoverage:
|
2011-01-05 01:05:31 +00:00
|
|
|
rm -f test.tix test
|
|
|
|
ghc -odir build/test -hidir build/test $(GHCFLAGS) --make -fhpc test
|
|
|
|
./test
|
2011-01-07 01:39:26 +00:00
|
|
|
@echo ""
|
2011-01-05 01:07:58 +00:00
|
|
|
@hpc report test --exclude=Main --exclude=QC
|
|
|
|
@hpc markup test --exclude=Main --exclude=QC --destdir=.hpc >/dev/null
|
2011-01-05 01:05:31 +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="*" \
|
2010-12-03 01:37:55 +00:00
|
|
|
--exclude='news/.*'
|
2010-10-10 04:18:16 +00:00
|
|
|
|
2010-10-19 19:59:40 +00:00
|
|
|
clean:
|
2011-08-20 20:11:42 +00:00
|
|
|
rm -rf build $(bins) $(mans) test configure *.tix .hpc $(sources)
|
2011-06-30 19:37:35 +00:00
|
|
|
rm -rf doc/.ikiwiki html dist
|
2011-01-07 06:15:23 +00:00
|
|
|
find . \( -name \*.o -or -name \*.hi \) -exec rm {} \;
|
2010-10-19 19:59:40 +00:00
|
|
|
|
2011-07-02 18:53:55 +00:00
|
|
|
# Workaround for cabal sdist not running Setup hooks, so I cannot
|
|
|
|
# generate a file list there.
|
|
|
|
sdist: clean
|
|
|
|
@if [ ! -e git-annex.cabal.orig ]; then cp git-annex.cabal git-annex.cabal.orig; fi
|
2011-07-07 23:49:24 +00:00
|
|
|
@sed -e "s!\(Extra-Source-Files: \).*!\1$(shell find . -name .git -prune -or -not -name \\*.orig -not -type d -print | perl -ne 'print unless length >= 100')!i" < git-annex.cabal.orig > git-annex.cabal
|
2011-07-02 18:53:55 +00:00
|
|
|
@cabal sdist
|
|
|
|
@mv git-annex.cabal.orig git-annex.cabal
|
|
|
|
|
2010-12-30 20:52:24 +00:00
|
|
|
.PHONY: $(bins) test install
|