From c577942cb117017893bd27d9439d09c082bda145 Mon Sep 17 00:00:00 2001
From: Michael Bien <mbien@fh-landshut.de>
Date: Sat, 26 Feb 2011 22:45:21 +0100
Subject: build produces now additional 7z archives for jenkins if
 build.archiveon is set.

---
 build.xml | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/build.xml b/build.xml
index 309c66e..34fc77c 100644
--- a/build.xml
+++ b/build.xml
@@ -12,11 +12,11 @@
     <import file="nbproject/build-impl.xml"/>
     
     <property file="nbproject/project.properties" />
-    
-    <property environment="env" />
 
     <!-- Pull in GlueGen cpptasks build file -->
     <import file="${gluegen.root}/make/gluegen-cpptasks.xml" />
+    <import file="${gluegen.root}/make/jogamp-env.xml" />
+    <import file="${gluegen.root}/make/jogamp-archivetasks.xml" />
 
     <target name="-pre-jar">
         <tstamp>
@@ -31,17 +31,28 @@
         <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,gluegen.cpptasks.detect.os" unless="build.noarchives">
+    <target name="-post-jar" depends="tag.build,create-all-jnlps,gluegen.cpptasks.detect.os,build-archive"/>
+
+    <target name="build-archive" if="build.archiveon">
         <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"/>
-            <zipfileset dir="${dist.dir}" includes="*.jnlp" prefix="${dist.zip.name}/jnlp-files"/>
-            <zipfileset dir="."           includes="www/**" prefix="${dist.zip.name}"/>
-            <zipfileset dir="${dist.dir}" includes="*.properties" prefix="${dist.zip.name}"/>
-        </zip>
-    </target>
+        <mkdir dir="${dist.dir}/tmp/${dist.zip.name}"/>
+        
+        <copy todir="${dist.dir}/tmp/${dist.zip.name}/jar" file="${dist.dir}/jocl-demos.jar"/>
+        <copy todir="${dist.dir}/tmp/${dist.zip.name}/jnlp-files" >
+            <fileset dir="${dist.dir}" includes="*.jnlp"/>
+        </copy>
+        <copy todir="${dist.dir}/tmp/${dist.zip.name}" >
+            <fileset dir="." includes="www/**"/>
+            <fileset dir="${dist.dir}" includes="*.properties"/>
+        </copy>
+        
+        <zip        basedir="${dist.dir}/tmp/${dist.zip.name}" destfile="${dist.dir}/${dist.zip.name}.zip"/>
+        <archive.7z basedir="${dist.dir}/tmp/${dist.zip.name}" destfile="${dist.dir}/${dist.zip.name}.7z" includes="*"/>
 
+        <delete dir="${dist.dir}/tmp"/>
+        
+    </target>
 
     <target name="create-all-jnlps">
 
-- 
cgit v1.2.3


From dc782e43df2cd102b64d95855a1eb953d614cd9b Mon Sep 17 00:00:00 2001
From: Michael Bien <mbien@fh-landshut.de>
Date: Sun, 27 Feb 2011 16:05:18 +0100
Subject: forgot to call jogamp.env.init.

---
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index 34fc77c..08f06d3 100644
--- a/build.xml
+++ b/build.xml
@@ -18,7 +18,7 @@
     <import file="${gluegen.root}/make/jogamp-env.xml" />
     <import file="${gluegen.root}/make/jogamp-archivetasks.xml" />
 
-    <target name="-pre-jar">
+    <target name="-pre-jar" depends="jogamp.env.init">
         <tstamp>
             <format property="version.timestamp" pattern="yyyyMMdd"/>
         </tstamp>
-- 
cgit v1.2.3


From 0c3209367271dce8dd1996f159ed41f610ba88da Mon Sep 17 00:00:00 2001
From: Michael Bien <mbien@fh-landshut.de>
Date: Sun, 27 Feb 2011 18:27:51 +0100
Subject: no relative path in archive since 7zip support was added.

---
 build.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.xml b/build.xml
index 08f06d3..c17a573 100644
--- a/build.xml
+++ b/build.xml
@@ -47,8 +47,8 @@
             <fileset dir="${dist.dir}" includes="*.properties"/>
         </copy>
         
-        <zip        basedir="${dist.dir}/tmp/${dist.zip.name}" destfile="${dist.dir}/${dist.zip.name}.zip"/>
-        <archive.7z basedir="${dist.dir}/tmp/${dist.zip.name}" destfile="${dist.dir}/${dist.zip.name}.7z" includes="*"/>
+        <zip        basedir="${dist.dir}/tmp" destfile="${dist.dir}/${dist.zip.name}.zip"/>
+        <archive.7z basedir="${dist.dir}/tmp" destfile="${dist.dir}/${dist.zip.name}.7z"  includes="*"/>
 
         <delete dir="${dist.dir}/tmp"/>
         
-- 
cgit v1.2.3