allow reloacting the source tree used for building android

Putting it outside the git-annex directory is useful to me, so I don't
accidentially tar it up into my release tarball.. which almost happened today.

1 files changed, 76 insertions, 70 deletions

diff --git a/standalone/android/Makefile b/standalone/android/Makefile
index 9aa6d4034..e7e25622c 100644
--- a/standalone/android/Makefile
+++ b/standalone/android/Makefile
@@ -11,35 +11,39 @@ PATH:=$(ANDROID_CROSS_COMPILER):$(PATH)
 export ANDROID_SDK_ROOT?=$(HOME)/tmp/adt-bundle-linux-x86/sdk
 export ANDROID_NDK_ROOT?=$(HOME)/tmp/android-ndk-r8d
 
-GITTREE=source/git/installed-tree
+# Where to store the $(GIT_ANNEX_ANDROID_SOURCETREE)s to utilities. This
+# directory will be created by `make source`.
+GIT_ANNEX_ANDROID_SOURCETREE?=$(GIT_ANNEX_ANDROID_SOURCETREE)
+
+GITTREE=$(GIT_ANNEX_ANDROID_SOURCETREE)/git/installed-tree
 
 build: start
-	$(MAKE) source/openssl
-	$(MAKE) source/openssh
-	$(MAKE) source/busybox
-	$(MAKE) source/rsync
-	$(MAKE) source/gnupg
-	$(MAKE) source/git
-	$(MAKE) source/term
+	$(MAKE) $(GIT_ANNEX_ANDROID_SOURCETREE)/openssl
+	$(MAKE) $(GIT_ANNEX_ANDROID_SOURCETREE)/openssh
+	$(MAKE) $(GIT_ANNEX_ANDROID_SOURCETREE)/busybox
+	$(MAKE) $(GIT_ANNEX_ANDROID_SOURCETREE)/rsync
+	$(MAKE) $(GIT_ANNEX_ANDROID_SOURCETREE)/gnupg
+	$(MAKE) $(GIT_ANNEX_ANDROID_SOURCETREE)/git
+	$(MAKE) $(GIT_ANNEX_ANDROID_SOURCETREE)/term
 
 	# Debug build because it does not need signing keys.
-	cd source/term && tools/build-debug
+	cd $(GIT_ANNEX_ANDROID_SOURCETREE)/term && tools/build-debug
 
 	# Install executables as pseudo-libraries so they will be
 	# unpacked from the .apk.
-	mkdir -p source/term/libs/armeabi
-	cp ../../git-annex source/term/libs/armeabi/lib.git-annex.so
-	cp source/busybox/busybox source/term/libs/armeabi/lib.busybox.so
-	cp source/openssh/ssh source/term/libs/armeabi/lib.ssh.so
-	cp source/openssh/ssh-keygen source/term/libs/armeabi/lib.ssh-keygen.so
-	cp source/rsync/rsync source/term/libs/armeabi/lib.rsync.so
-	cp source/gnupg/g10/gpg source/term/libs/armeabi/lib.gpg.so
-	cp source/git/git source/term/libs/armeabi/lib.git.so
-	cp source/git/git-shell source/term/libs/armeabi/lib.git-shell.so
-	cp source/git/git-upload-pack source/term/libs/armeabi/lib.git-upload-pack.so
-	arm-linux-androideabi-strip --strip-unneeded --remove-section=.comment --remove-section=.note source/term/libs/armeabi/*
-	cp runshell source/term/libs/armeabi/lib.runshell.so
-	cp start source/term/libs/armeabi/lib.start.so
+	mkdir -p $(GIT_ANNEX_ANDROID_SOURCETREE)/term/libs/armeabi
+	cp ../../git-annex $(GIT_ANNEX_ANDROID_SOURCETREE)/term/libs/armeabi/lib.git-annex.so
+	cp $(GIT_ANNEX_ANDROID_SOURCETREE)/busybox/busybox $(GIT_ANNEX_ANDROID_SOURCETREE)/term/libs/armeabi/lib.busybox.so
+	cp $(GIT_ANNEX_ANDROID_SOURCETREE)/openssh/ssh $(GIT_ANNEX_ANDROID_SOURCETREE)/term/libs/armeabi/lib.ssh.so
+	cp $(GIT_ANNEX_ANDROID_SOURCETREE)/openssh/ssh-keygen $(GIT_ANNEX_ANDROID_SOURCETREE)/term/libs/armeabi/lib.ssh-keygen.so
+	cp $(GIT_ANNEX_ANDROID_SOURCETREE)/rsync/rsync $(GIT_ANNEX_ANDROID_SOURCETREE)/term/libs/armeabi/lib.rsync.so
+	cp $(GIT_ANNEX_ANDROID_SOURCETREE)/gnupg/g10/gpg $(GIT_ANNEX_ANDROID_SOURCETREE)/term/libs/armeabi/lib.gpg.so
+	cp $(GIT_ANNEX_ANDROID_SOURCETREE)/git/git $(GIT_ANNEX_ANDROID_SOURCETREE)/term/libs/armeabi/lib.git.so
+	cp $(GIT_ANNEX_ANDROID_SOURCETREE)/git/git-shell $(GIT_ANNEX_ANDROID_SOURCETREE)/term/libs/armeabi/lib.git-shell.so
+	cp $(GIT_ANNEX_ANDROID_SOURCETREE)/git/git-upload-pack $(GIT_ANNEX_ANDROID_SOURCETREE)/term/libs/armeabi/lib.git-upload-pack.so
+	arm-linux-androideabi-strip --strip-unneeded --remove-section=.comment --remove-section=.note $(GIT_ANNEX_ANDROID_SOURCETREE)/term/libs/armeabi/*
+	cp runshell $(GIT_ANNEX_ANDROID_SOURCETREE)/term/libs/armeabi/lib.runshell.so
+	cp start $(GIT_ANNEX_ANDROID_SOURCETREE)/term/libs/armeabi/lib.start.so
 	
 	# remove git stuff we don't need to save space
 	rm -rf $(GITTREE)/bin/git-cvsserver \
@@ -67,79 +71,81 @@ build: start
 	cd $(GITTREE) && find -samefile bin/git-shell -not -wholename ./bin/git-shell > links/git-shell
 	cd $(GITTREE) && find -samefile bin/git-upload-pack -not -wholename ./bin/git-upload-pack > links/git-upload-pack
 	cd $(GITTREE) && find -type f -not -samefile bin/git -not -samefile bin/git-shell -not -samefile bin/git-upload-pack|tar czf ../git.tar.gz -T -
-	cp source/git/git.tar.gz source/term/libs/armeabi/lib.git.tar.gz.so
+	cp $(GIT_ANNEX_ANDROID_SOURCETREE)/git/git.tar.gz $(GIT_ANNEX_ANDROID_SOURCETREE)/term/libs/armeabi/lib.git.tar.gz.so
 
-	git rev-parse HEAD > source/term/libs/armeabi/lib.version.so
+	git rev-parse HEAD > $(GIT_ANNEX_ANDROID_SOURCETREE)/term/libs/armeabi/lib.version.so
 
-	cd source/term && ant debug
+	cd $(GIT_ANNEX_ANDROID_SOURCETREE)/term && ant debug
 
-source/openssl:
-	cd source/openssl && CC=$$(which cc) ./Configure android
-	cd source/openssl && $(MAKE)
+$(GIT_ANNEX_ANDROID_SOURCETREE)/openssl:
+	cd $(GIT_ANNEX_ANDROID_SOURCETREE)/openssl && CC=$$(which cc) ./Configure android
+	cd $(GIT_ANNEX_ANDROID_SOURCETREE)/openssl && $(MAKE)
 	touch $@
 
-source/openssh: openssh.patch openssh.config.h
-	cd source/openssh && git reset --hard
-	cd source/openssh && ./configure --host=arm-linux-androideabi --with-ssl-dir=../openssl --without-openssl-header-check
-	cd source/openssh && patch -p1 < ../../openssh.patch
-	cp openssh.config.h source/openssh/config.h
-	cd source/openssh && sed -i -e 's/getrrsetbyname.o //' openbsd-compat/Makefile
-	cd source/openssh && sed -i -e 's/auth-passwd.o //' Makefile
-	cd source/openssh && $(MAKE) ssh ssh-keygen
+$(GIT_ANNEX_ANDROID_SOURCETREE)/openssh: openssh.patch openssh.config.h
+	cd $(GIT_ANNEX_ANDROID_SOURCETREE)/openssh && git reset --hard
+	cd $(GIT_ANNEX_ANDROID_SOURCETREE)/openssh && ./configure --host=arm-linux-androideabi --with-ssl-dir=../openssl --without-openssl-header-check
+	cat openssh.patch | (cd $(GIT_ANNEX_ANDROID_SOURCETREE)/openssh && patch -p1)
+	cp openssh.config.h $(GIT_ANNEX_ANDROID_SOURCETREE)/openssh/config.h
+	cd $(GIT_ANNEX_ANDROID_SOURCETREE)/openssh && sed -i -e 's/getrrsetbyname.o //' openbsd-compat/Makefile
+	cd $(GIT_ANNEX_ANDROID_SOURCETREE)/openssh && sed -i -e 's/auth-passwd.o //' Makefile
+	cd $(GIT_ANNEX_ANDROID_SOURCETREE)/openssh && $(MAKE) ssh ssh-keygen
 	touch $@
 
-source/busybox: busybox_config
-	cp busybox_config source/busybox/.config
-	cd source/busybox && yes '' | $(MAKE) oldconfig
-	cd source/busybox && $(MAKE)
+$(GIT_ANNEX_ANDROID_SOURCETREE)/busybox: busybox_config
+	cp busybox_config $(GIT_ANNEX_ANDROID_SOURCETREE)/busybox/.config
+	cd $(GIT_ANNEX_ANDROID_SOURCETREE)/busybox && yes '' | $(MAKE) oldconfig
+	cd $(GIT_ANNEX_ANDROID_SOURCETREE)/busybox && $(MAKE)
 	touch $@
 	
-source/git:
-	cd source/git && $(MAKE) install NO_OPENSSL=1 NO_GETTEXT=1 NO_GECOS_IN_PWENT=1 NO_GETPASS=1 NO_NSEC=1 NO_MKDTEMP=1 NO_PTHREADS=1 NO_PERL=1 NO_CURL=1 NO_EXPAT=1 NO_TCLTK=1 NO_ICONV=1 prefix= DESTDIR=installed-tree
+$(GIT_ANNEX_ANDROID_SOURCETREE)/git:
+	cd $(GIT_ANNEX_ANDROID_SOURCETREE)/git && $(MAKE) install NO_OPENSSL=1 NO_GETTEXT=1 NO_GECOS_IN_PWENT=1 NO_GETPASS=1 NO_NSEC=1 NO_MKDTEMP=1 NO_PTHREADS=1 NO_PERL=1 NO_CURL=1 NO_EXPAT=1 NO_TCLTK=1 NO_ICONV=1 prefix= DESTDIR=installed-tree
 	touch $@
 
-source/rsync: rsync.patch
-	cd source/rsync && git reset --hard origin/master && git am < ../../rsync.patch
-	cp source/automake/lib/config.sub source/automake/lib/config.guess source/rsync/
-	cd source/rsync && ./configure --host=arm-linux-androideabi --disable-locale --disable-iconv-open --disable-iconv --disable-acl-support --disable-xattr-support
-	cd source/rsync && $(MAKE)
+$(GIT_ANNEX_ANDROID_SOURCETREE)/rsync: rsync.patch
+	cat rsync.patch | (cd $(GIT_ANNEX_ANDROID_SOURCETREE)/rsync && git reset --hard origin/master && git am)
+	cp $(GIT_ANNEX_ANDROID_SOURCETREE)/automake/lib/config.sub $(GIT_ANNEX_ANDROID_SOURCETREE)/automake/lib/config.guess $(GIT_ANNEX_ANDROID_SOURCETREE)/rsync/
+	cd $(GIT_ANNEX_ANDROID_SOURCETREE)/rsync && ./configure --host=arm-linux-androideabi --disable-locale --disable-iconv-open --disable-iconv --disable-acl-support --disable-xattr-support
+	cd $(GIT_ANNEX_ANDROID_SOURCETREE)/rsync && $(MAKE)
 	touch $@
 
-source/gnupg:
-	cd source/gnupg && git checkout gnupg-1.4.13
-	cd source/gnupg && ./autogen.sh
-	cd source/gnupg && ./configure --host=arm-linux-androideabi --disable-gnupg-iconv --enable-minimal --disable-card-support --disable-agent-support --disable-photo-viewers --disable-keyserver-helpers --disable-nls
-	cd source/gnupg; $(MAKE) || true # expected failure in doc build
+$(GIT_ANNEX_ANDROID_SOURCETREE)/gnupg:
+	cd $(GIT_ANNEX_ANDROID_SOURCETREE)/gnupg && git checkout gnupg-1.4.13
+	cd $(GIT_ANNEX_ANDROID_SOURCETREE)/gnupg && ./autogen.sh
+	cd $(GIT_ANNEX_ANDROID_SOURCETREE)/gnupg && ./configure --host=arm-linux-androideabi --disable-gnupg-iconv --enable-minimal --disable-card-support --disable-agent-support --disable-photo-viewers --disable-keyserver-helpers --disable-nls
+	cd $(GIT_ANNEX_ANDROID_SOURCETREE)/gnupg; $(MAKE) || true # expected failure in doc build
 	touch $@
 
-source/term: term.patch icons
-	cd source/term && git reset --hard
-	cd source/term && patch -p1 <../../term.patch
-	(cd icons && tar c .) | (cd source/term/res && tar x)
+$(GIT_ANNEX_ANDROID_SOURCETREE)/term: term.patch icons
+	cd $(GIT_ANNEX_ANDROID_SOURCETREE)/term && git reset --hard
+	cat term.patch | (cd $(GIT_ANNEX_ANDROID_SOURCETREE)/term && patch -p1)
+	(cd icons && tar c .) | (cd $(GIT_ANNEX_ANDROID_SOURCETREE)/term/res && tar x)
 	# This renaming has a purpose. It makes the path to the app's
 	# /data directory shorter, which makes ssh connection caching
 	# sockets placed there have more space for their filenames.
 	# Also, it avoids overlap with the Android Terminal Emulator
 	# app, if it's also installed.
-	cd source/term && find -name .git -prune -o -type f -print0 | xargs -0 perl -pi -e 's/jackpal/ga/g'
-	cd source/term && perl -pi -e 's/Terminal Emulator/Git Annex/g' res/*/strings.xml
-	cd source/term && tools/update.sh >/dev/null 2>&1
+	cd $(GIT_ANNEX_ANDROID_SOURCETREE)/term && find -name .git -prune -o -type f -print0 | xargs -0 perl -pi -e 's/jackpal/ga/g'
+	cd $(GIT_ANNEX_ANDROID_SOURCETREE)/term && perl -pi -e 's/Terminal Emulator/Git Annex/g' res/*/strings.xml
+	cd $(GIT_ANNEX_ANDROID_SOURCETREE)/term && tools/update.sh >/dev/null 2>&1
 	touch $@
 
-source:
-	mkdir -p source
-	git clone --bare git://git.savannah.gnu.org/automake.git source/automake
-	git clone --bare git://git.debian.org/git/d-i/busybox source/busybox
-	git clone --bare git://git.kernel.org/pub/scm/git/git.git source/git
-	git clone --bare git://git.samba.org/rsync.git source/rsync
-	git clone --bare git://git.gnupg.org/gnupg.git source/gnupg
-	git clone --bare git://git.openssl.org/openssl source/openssl
-	git clone --bare git://github.com/CyanogenMod/android_external_openssh.git source/openssh
-	git clone --bare git://github.com/jackpal/Android-Terminal-Emulator.git source/term
+source: $(GIT_ANNEX_ANDROID_SOURCETREE)
+
+$(GIT_ANNEX_ANDROID_SOURCETREE):
+	mkdir -p $(GIT_ANNEX_ANDROID_SOURCETREE)
+	git clone --bare git://git.savannah.gnu.org/automake.git $(GIT_ANNEX_ANDROID_SOURCETREE)/automake
+	git clone --bare git://git.debian.org/git/d-i/busybox $(GIT_ANNEX_ANDROID_SOURCETREE)/busybox
+	git clone --bare git://git.kernel.org/pub/scm/git/git.git $(GIT_ANNEX_ANDROID_SOURCETREE)/git
+	git clone --bare git://git.samba.org/rsync.git $(GIT_ANNEX_ANDROID_SOURCETREE)/rsync
+	git clone --bare git://git.gnupg.org/gnupg.git $(GIT_ANNEX_ANDROID_SOURCETREE)/gnupg
+	git clone --bare git://git.openssl.org/openssl $(GIT_ANNEX_ANDROID_SOURCETREE)/openssl
+	git clone --bare git://github.com/CyanogenMod/android_external_openssh.git $(GIT_ANNEX_ANDROID_SOURCETREE)/openssh
+	git clone --bare git://github.com/jackpal/Android-Terminal-Emulator.git $(GIT_ANNEX_ANDROID_SOURCETREE)/term
 
 clean:
 	rm -rf $(GITTREE)
 	rm -f start
 
 reallyclean: clean
-	rm -rf source
+	rm -rf $(GIT_ANNEX_ANDROID_SOURCETREE)