fte/fteqw
2
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix automated android builds

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4280 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
TimeServ 2013-04-03 09:52:09 +00:00
parent deb546d7b7
commit 5c53a94b43
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
engine/Makefile
View file

@ -65,18 +65,9 @@ USER_TARGET:=$(FTE_TARGET)
DROID_NDK_PATH?=~/droid/android-ndk-r6b DROID_NDK_PATH?=~/droid/android-ndk-r6b
DROID_SDK_PATH?=~/droid/android-sdk-linux_x86 DROID_SDK_PATH?=~/droid/android-sdk-linux_x86
ANT?=ant ANT?=ant
JAVATOOL="$(JAVA_HOME)"/bin/ JAVATOOL=$(JAVA_HOME)/bin/
ANDROID_SCRIPT=android 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),) ifeq ($(DROID_ARCH),)
DROID_ARCH=armeabi DROID_ARCH=armeabi
endif endif
@ -1498,6 +1489,7 @@ droid/build.xml:
#build FTE as a library, then build the java+package (release) #build FTE as a library, then build the java+package (release)
droid/ftekeystore: droid/ftekeystore:
ifeq ($(KEYTOOLARGS),)
@echo @echo
@echo In order to build a usable APK file it must be signed. That requires a private key. @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... @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 Morality warning: never distribute droid/ftekeystore - always do make distclean before distributing.
@echo @echo
$(JAVATOOL)keytool -genkey -v -keystore $@ -alias autogen -keyalg RSA -keysize 2048 -validity 10000 $(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 droid-rel: droid/build.xml droid/ftekeystore
$(foreach a, $(DROID_ARCH), $(MAKE) FTE_TARGET=droid gl-rel DROID_ARCH=$a; ) $(foreach a, $(DROID_ARCH), $(MAKE) FTE_TARGET=droid gl-rel DROID_ARCH=$a; )