Unique ZIP archive name

2 files changed, 15 insertions, 2 deletions

diff --git a/build.xml b/build.xml
index 37259f0..939f22b 100644
--- a/build.xml
+++ b/build.xml
@@ -9,6 +9,10 @@
       </not>
     </condition>
 
+    <!-- Pull in GlueGen cpptasks build file -->
+    <property name="gluegen.root"  value="../gluegen" />
+    <import file="${gluegen.root}/make/gluegen-cpptasks.xml" />
+
     <import file="nbproject/build-impl.xml"/>
 
     <target name="-pre-jar">
@@ -24,8 +28,8 @@
         <property name="jocl-demos.version" value="${jocl_demos_base_version}-b${jocl-demos.build.number}-${version.timestamp}" />
     </target>
 
-    <target name="-post-jar" depends="tag.build,create-all-jnlps">
-        <property name="dist.zip.name" value="jocl-demos-${jocl-demos.version}"/>
+    <target name="-post-jar" depends="tag.build,create-all-jnlps,gluegen.cpptasks.detect.os">
+        <property name="dist.zip.name" value="jocl-demos-${jocl-demos.version}-${os.and.arch}"/>
         
         <zip destfile="${dist.dir}/${dist.zip.name}.zip">
             <zipfileset dir="${dist.dir}" includes="jocl-demos.jar" prefix="${dist.zip.name}/jar"/>
diff --git a/scripts/make.jogl.all.linux-x86_64.sh b/scripts/make.jogl.all.linux-x86_64.sh
new file mode 100644
index 0000000..b082a65
--- /dev/null
+++ b/scripts/make.jogl.all.linux-x86_64.sh
@@ -0,0 +1,9 @@
+#! /bin/sh
+
+if [ -e ../setenv-build-jogl-x86_64.sh ] ; then
+    . ../setenv-build-jogl-x86_64.sh
+fi
+
+ant  \
+    -Drootrel.build=build-x86_64 \
+    $* 2>&1 | tee make.jogl.all.linux-x86_64.log