diff options
| author | Sven Gothel <[email protected]> | 2012-08-23 22:26:50 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2012-08-23 22:26:50 +0200 |
| commit | 03ddbda61938295be0cfc62501e5a6ab0daaaef6 (patch) | |
| tree | ee88efc9323b7cf661e2eb4f87d4e6893730e396 | |
| parent | 7ec3d0b6a90f2204eb3272324cf5908caa4597b4 (diff) | |
Allow the custom user gluegen property file being specified by env var GLUEGEN_PROPERTIES_FILE -> property gluegen.user.properties.file ; Use props for android keystore values
| -rwxr-xr-x | make/gluegen-properties.xml | 15 | ||||
| -rw-r--r-- | make/jogamp-androidtasks.xml | 9 |
2 files changed, 19 insertions, 5 deletions
diff --git a/make/gluegen-properties.xml b/make/gluegen-properties.xml index 1276e08..60721eb 100755 --- a/make/gluegen-properties.xml +++ b/make/gluegen-properties.xml @@ -32,10 +32,17 @@ <project name="GlueGen-properties" basedir="."> <target name="gluegen.properties.load.user" unless="gluegen.user.properties.file.set"> + <property environment="env" /> + <!-- Load the user specified properties file that defines various host - specific paths. The user will be notified if this is does not - exist. --> - <property name="gluegen.user.properties.file" value="${user.home}/gluegen.properties"/> + + <condition property="gluegen.user.properties.file" value="${env.GLUEGEN_PROPERTIES_FILE}" else="${user.home}/gluegen.properties"> + <not> + <equals arg1="${env.GLUEGEN_PROPERTIES_FILE}" arg2="$${env.GLUEGEN_PROPERTIES_FILE}" casesensitive="true" /> + </not> + </condition> <property name="gluegen.user.properties.file.set" value="${gluegen.user.properties.file}"/> <property file="${gluegen.user.properties.file.set}" /> <echo message="Loaded ${gluegen.user.properties.file.set}." /> @@ -48,6 +55,12 @@ <property name="android-min.jar" value="${gluegen.root}/make/lib/android-sdk/${android.version}/android.jar" /> <property name="android-015.jar" value="${gluegen.root}/make/lib/android-sdk/15/android.jar" /> <property name="android.jar" value="${android-015.jar}" /> + + <property name="android.keystore.file" value="/non.existing.user.keystore.file"/> <!-- default - maybe overriden by the gluegen.user.properties.file --> + <property name="android.keystore.alias" value="debug"/> + <property name="android.keystore.storepass" value="jogamp"/> + <property name="android.keystore.keypass" value="jogamp"/> + <property name="ant-junit-all.apk" value="${gluegen.root}/make/lib/ant-junit-all.apk" /> <condition property="win32.c.compiler" value="mingw64"> diff --git a/make/jogamp-androidtasks.xml b/make/jogamp-androidtasks.xml index 3e40fe1..b86b7cc 100644 --- a/make/jogamp-androidtasks.xml +++ b/make/jogamp-androidtasks.xml @@ -45,10 +45,11 @@ <attribute name="version.code" /> <attribute name="version.name" /> <attribute name="android.abi" default="generic" /> - <attribute name="keystore.file" default="/non.existing.user.keystore.file" /> - <attribute name="keystore.alias" default="debug" /> - <attribute name="keystore.storepass" default="jogamp" /> - <attribute name="keystore.keypass" default="jogamp" /> + <attribute name="keystore.file" default="${android.keystore.file}" /> + <attribute name="keystore.alias" default="${android.keystore.alias}" /> + <attribute name="keystore.storepass" default="${android.keystore.storepass}" /> + <attribute name="keystore.keypass" default="${android.keystore.keypass}" /> + <sequential> <var name="m.aapt.android.abi.extstr" unset="true"/> <var name="m.aapt.build.apk" unset="true"/> |