From: Keith Packard <keithp@keithp.com>
Date: Sat, 13 Sep 2014 22:23:40 +0000 (-0700)
Subject: altosdroid: Automatically sign the released version if the key is available
X-Git-Tag: bdale-altosdroid~25
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=93d1cedc94358ebf5c2af537a25a242f6c19954c

altosdroid: Automatically sign the released version if the key is available

Look in ~/altusmetrumllc for release.keystore and Passphrase and
enable building and signing of the release binary.

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/altosdroid/Makefile.am b/altosdroid/Makefile.am
index d5784483..59704aad 100644
--- a/altosdroid/Makefile.am
+++ b/altosdroid/Makefile.am
@@ -1,5 +1,8 @@
 if ANDROID
-all_target=bin/AltosDroid-debug.apk bin/AltosDroid-release-unsigned.apk
+all_target=bin/AltosDroid-debug.apk
+if ANDROID_RELEASE
+all_target+=bin/AltosDroid-release.apk
+endif
 else
 all_target=
 endif
@@ -76,7 +79,8 @@ bin/AltosDroid-release-unsigned.apk: $(SRC) $(ALTOSLIB) $(SUPPORT_V4) $(GOOGLE_P
 
 bin/AltosDroid-release.apk: bin/AltosDroid-release-unsigned.apk
 	jarsigner -sigalg SHA1withDSA -digestalg SHA1 \
-	   -keystore release.keystore \
+	   -keystore ~/altusmetrumllc/release.keystore \
+	   -storepass:file ~/altusmetrumllc/Passphrase \
 	   -signedjar bin/AltosDroid-release-signed.apk \
 	   bin/AltosDroid-release-unsigned.apk AltosDroid
 	$(ZIPALIGN) -f 4 \
diff --git a/configure.ac b/configure.ac
index b945832f..a38ef092 100644
--- a/configure.ac
+++ b/configure.ac
@@ -144,13 +144,18 @@ if test "x$ANDROID_SDK" != "xno"; then
 	fi
 fi
 
+ANDROID_RELEASE=no
 if test "x$ANDROID_SDK" != "xno"; then
 	HAVE_ANDROID_SDK="yes"
+	if test -f "$HOME/altusmetrumllc/release.keystore" -a -f "$HOME/altusmetrumllc/Passphrase"; then
+		ANDROID_RELEASE=yes
+	fi
 else
 	HAVE_ANDROID_SDK="no"
 fi
 
 AM_CONDITIONAL([ANDROID], [test x$ANDROID_SDK != xno])
+AM_CONDITIONAL([ANDROID_RELEASE], [test x$ANDROID_RELEASE = xyes])
 
 AC_SUBST(ANDROID_SDK)
 
@@ -563,6 +568,7 @@ echo "    CC1111 support..............: ${HAVE_SDCC}"
 echo "    AVR compiler................: ${AVR_CC} ${AVR_OBJCOPY}"
 echo "    AVR support.................: ${HAVE_AVR_CC}"
 echo "    Android support.............: ${HAVE_ANDROID_SDK}"
+echo "    Android release support.....: ${ANDROID_RELEASE}"
 echo "    STlink support..............: ${HAVE_STLINK}"
 echo "    Local pdclib................: ${HAVE_PDCLIB}"
 echo "    i386 and amd64 libaltos.....: ${MULTI_ARCH}"