diff options
| author | Sven Gothel <[email protected]> | 2014-01-25 15:46:55 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2014-01-25 15:46:55 +0100 |
| commit | 23183ccf782c0252957c8d9cf2b51f70b9815acf (patch) | |
| tree | 6fad656e8e2c86b4ba4ec61155ac91886230ba49 /make/build.xml | |
| parent | b301cf2b1d6543b12dcd6da528c4f94385655f55 (diff) | |
Add '-b${joal.build.number}' to joal.version / archive.name ; Produce jar and apk files in ${build}/jar
Diffstat (limited to 'make/build.xml')
| -rwxr-xr-x | make/build.xml | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/make/build.xml b/make/build.xml index 043f2dc..941e6d3 100755 --- a/make/build.xml +++ b/make/build.xml @@ -44,7 +44,6 @@ <property name="gluegen.build" value="${gluegen.root}/${rootrel.build}" /> <!-- This is the version of JOAL you are building --> - <property name="joal.build.number" value="manual-build"/> <mkdir dir="${build}" /> <exec dir="." executable="git" logError="true" failonerror="false" failifexecutionfails="false" output="${build}/localbranch.raw"> @@ -86,8 +85,9 @@ --> <target name="init" depends="jogamp.env.init, gluegen.cpptasks.detect.os"> + <property name="joal.build.number" value="manual"/> <property name="joal.build.id" value="${version.timestamp}"/> - <property name="joal.version" value="${jogamp.version.base}-${version.timestamp}" /> + <property name="joal.version" value="${jogamp.version.base}-b${joal.build.number}-${version.timestamp}" /> <!-- The location and name of the configuration ANT file that will - validate to ensure that all user-define variables are set. --> @@ -161,9 +161,9 @@ <property name="stub.includes.gluegen.cc" value="${gluegen.root}/make/stub_includes/platform" /> <!-- The resulting joal.jar. --> - <property name="joal.jar" value="${build}/joal.jar" /> - <property name="joal-android.jar" value="${build}/joal-android.jar" /> - <property name="joal-android.apk" value="${build}/joal-android-${android.abi}.apk" /> + <property name="joal.jar" value="${build}/jar/joal.jar" /> + <property name="joal-android.jar" value="${build}/jar/joal-android.jar" /> + <property name="joal-android.apk" value="${build}/jar/joal-android-${android.abi}.apk" /> <path id="joal_all.classpath"> <pathelement location="${gluegen-rt.jar}" /> @@ -459,7 +459,7 @@ </antcall> <!-- Create Java Web Start jar file from built file --> - <jar destfile="${build}/joal-natives-${os.and.arch}.jar"> + <jar destfile="${build}/jar/joal-natives-${os.and.arch}.jar"> <fileset dir="../${rootrel.build}/obj"> <include name="*joal.${native.library.suffix}" /> <include name="*soft_oal.${native.library.suffix}" /> @@ -632,7 +632,7 @@ <target name="android.package" depends="init" if="isAndroid"> <aapt.signed jarsrcdir="${src.java}" - jarbuilddir="${build}" + jarbuilddir="${build}/jar" jarbasename="joal-android" nativebuilddir="../${rootrel.build}/obj" nativebasename="" @@ -769,8 +769,8 @@ <copy file="${build}/artifact.properties" todir="${archive}"/> <mkdir dir="${archive}/jar" /> <copy todir="${archive}/jar"> - <fileset dir="${build}" includes="joal*.jar"/> - <fileset dir="${build}" includes="joal*.apk"/> + <fileset dir="${build}/jar" includes="joal*.jar"/> + <fileset dir="${build}/jar" includes="joal*.apk"/> </copy> <mkdir dir="${archive}/lib" /> <copy todir="${archive}/lib"> |