Add '-b${joal.build.number}' to joal.version / archive.name ; Produce jar and apk files in ${build}/jar

3 files changed, 17 insertions, 16 deletions

diff --git a/make/build-test.xml b/make/build-test.xml
index c9df712..b613a28 100644
--- a/make/build-test.xml
+++ b/make/build-test.xml
@@ -76,8 +76,8 @@
         <property name="gluegen-rt-android.jar" value="${gluegen.build}/gluegen-rt-android.jar" />
 
         <property name="obj.all.paths"        value="${gluegen.build}/obj${path.separator}${obj}${path.separator}lib/${os.and.arch}"/>
-        <property name="classpath.test"       value="${junit.jar}${path.separator}${gluegen-rt.jar}${path.separator}${build}/joal.jar${path.separator}${build}/joal-test.jar"/>
-        <property name="classpath.test.remote" value="${junit.jar}${path.separator}${env.TARGET_ANT_HOME}/lib/ant.jar${path.separator}${env.TARGET_ANT_HOME}/lib/ant-junit.jar${path.separator}${gluegen-rt.jar}${path.separator}${build}/joal.jar${path.separator}${build}/joal-test.jar"/>
+        <property name="classpath.test"       value="${junit.jar}${path.separator}${gluegen-rt.jar}${path.separator}${build}/jar/joal.jar${path.separator}${build}/jar/joal-test.jar"/>
+        <property name="classpath.test.remote" value="${junit.jar}${path.separator}${env.TARGET_ANT_HOME}/lib/ant.jar${path.separator}${env.TARGET_ANT_HOME}/lib/ant-junit.jar${path.separator}${gluegen-rt.jar}${path.separator}${build}/jar/joal.jar${path.separator}${build}/jar/joal-test.jar"/>
 
         <property name="test.archive.name"    value="${archive.name}-test-results-${build.node.name}"/>
 
@@ -92,7 +92,7 @@
                fork="yes"
                includeantruntime="false"
                srcdir="${src.test}" 
-               classpath="${gluegen-rt.jar};${build}/joal.jar;${junit.jar}"
+               classpath="${gluegen-rt.jar};${build}/jar/joal.jar;${junit.jar}"
                memoryMaximumSize="${javac.memorymax}"
                encoding="UTF-8"
                source="${target.sourcelevel}" 
@@ -110,7 +110,7 @@
                 <filter token="BASEVERSION" value="${jogamp.version.base}"/>
             </filterset>
         </copy>
-        <jar manifest="${build.test}/manifest-test.mf" destfile="${build}/joal-test.jar">
+        <jar manifest="${build.test}/manifest-test.mf" destfile="${build}/jar/joal-test.jar">
             <!-- get all class files, but skip any resource files that external tools
                  might have copied into the class directory (otherwise, it's possible
                  to get the same resource file twice in the jar) -->
@@ -125,7 +125,7 @@
         <javac destdir="${classes.test}" 
                fork="yes"
                includeAntRuntime="false"
-               classpath="${android.jar};${gluegen-rt-android.jar};${build}/joal.jar;${junit.jar}"
+               classpath="${android.jar};${gluegen-rt-android.jar};${build}/jar/joal.jar;${junit.jar}"
                memoryMaximumSize="${javac.memorymax}"
                encoding="UTF-8"
                source="${target.sourcelevel}" 
@@ -145,7 +145,7 @@
                 <filter token="BASEVERSION" value="${jogamp.version.base}"/>
             </filterset>
         </copy>
-        <jar manifest="${build.test}/manifest-test-android.mf" destfile="${build}/joal-test-android.jar" filesonly="true">
+        <jar manifest="${build.test}/manifest-test-android.mf" destfile="${build}/jar/joal-test-android.jar" filesonly="true">
             <!-- get all class files, but skip any resource files that external tools
                  might have copied into the class directory (otherwise, it's possible
                  to get the same resource file twice in the jar) -->
@@ -158,7 +158,7 @@
         <aapt.signed 
             assetsdir="resources/assets-test"
             jarsrcdir="${src.test}"
-            jarbuilddir="${build}"
+            jarbuilddir="${build}/jar"
             jarbasename="joal-test-android"
             nativebuilddir="../${rootrel.build}/obj"
             nativebasename="non-existing"
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">
diff --git a/make/scripts/make.joal.all.linux-x86_64.sh b/make/scripts/make.joal.all.linux-x86_64.sh
index b2d4505..cf113e2 100755
--- a/make/scripts/make.joal.all.linux-x86_64.sh
+++ b/make/scripts/make.joal.all.linux-x86_64.sh
@@ -25,6 +25,7 @@ export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
 #export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
 export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet"
 
+#BUILD_ARCHIVE=true \
 ant  \
     -Drootrel.build=build-x86_64 \
     $* 2>&1 | tee make.joal.all.linux-x86_64.log