From 5c53a94b4334c2ddfe4d25939ff199c50157eb66 Mon Sep 17 00:00:00 2001 From: TimeServ Date: Wed, 3 Apr 2013 09:52:09 +0000 Subject: [PATCH] fix automated android builds git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4280 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/Makefile | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/engine/Makefile b/engine/Makefile index 0a353cda3..8af871950 100644 --- a/engine/Makefile +++ b/engine/Makefile @@ -65,18 +65,9 @@ USER_TARGET:=$(FTE_TARGET) DROID_NDK_PATH?=~/droid/android-ndk-r6b DROID_SDK_PATH?=~/droid/android-sdk-linux_x86 ANT?=ant -JAVATOOL="$(JAVA_HOME)"/bin/ +JAVATOOL=$(JAVA_HOME)/bin/ ANDROID_SCRIPT=android -ifeq ($(WHOAMI),moodles) - ANT_HOME=/home/moodles/apache-ant-1.8.2/ - ANT=/home/moodles/apache-ant-1.8.2/bin/ant - JAVA_HOME=/home/moodles/jdk1.6.0_25/ - DROID_NDK_PATH=/home/moodles/android_ndk - DROID_SDK_PATH=/home/moodles/android_sdk - JARSIGNARGS="-storepass fteqw1" -endif - ifeq ($(DROID_ARCH),) DROID_ARCH=armeabi endif @@ -1498,6 +1489,7 @@ droid/build.xml: #build FTE as a library, then build the java+package (release) droid/ftekeystore: +ifeq ($(KEYTOOLARGS),) @echo @echo In order to build a usable APK file it must be signed. That requires a private key. @echo Creation of a private key requries various bits of info... @@ -1509,6 +1501,10 @@ droid/ftekeystore: @echo Morality warning: never distribute droid/ftekeystore - always do make distclean before distributing. @echo $(JAVATOOL)keytool -genkey -v -keystore $@ -alias autogen -keyalg RSA -keysize 2048 -validity 10000 +else + @echo Generating keystore + @$(JAVATOOL)keytool -genkey -keystore $@ -alias autogen -keyalg RSA -keysize 2048 -validity 10000 -noprompt $(KEYTOOLARGS) +endif droid-rel: droid/build.xml droid/ftekeystore $(foreach a, $(DROID_ARCH), $(MAKE) FTE_TARGET=droid gl-rel DROID_ARCH=$a; )