From 32059c88643fbf34ae05e5615d6b27b3313cafe5 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Wed, 23 Feb 2011 02:39:09 +0100
Subject: Use NODE_NAME env var to determine test archive

---
 make/build-test.xml         | 2 +-
 make/gluegen-properties.xml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'make')

diff --git a/make/build-test.xml b/make/build-test.xml
index 222ab93..9e30b5b 100644
--- a/make/build-test.xml
+++ b/make/build-test.xml
@@ -88,7 +88,7 @@
         <taskdef name="gluegen" classname="com.jogamp.gluegen.ant.GlueGenTask"
                  classpathref="gluegen.classpath" />
 
-        <property name="test.archive.name" value="${archive.name}-test-results"/>
+        <property name="test.archive.name" value="${archive.name}-test-results-${env.NODE_NAME}"/>
     </target>
 
     <target name="java.build" depends="java.generate">
diff --git a/make/gluegen-properties.xml b/make/gluegen-properties.xml
index 949eadf..5bb4b61 100755
--- a/make/gluegen-properties.xml
+++ b/make/gluegen-properties.xml
@@ -32,6 +32,7 @@
 <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. -->
-- 
cgit v1.2.3


From 06d6c31e74357d550311795a92733822805a9215 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Wed, 23 Feb 2011 04:45:47 +0100
Subject: Provide task 'archive.7z' and use it instead of zip

---
 make/build-test.xml           |  9 +++++----
 make/build.xml                | 10 +++++-----
 make/gluegen-archivetasks.xml | 19 +++++++++++++++++++
 3 files changed, 29 insertions(+), 9 deletions(-)
 create mode 100644 make/gluegen-archivetasks.xml

(limited to 'make')

diff --git a/make/build-test.xml b/make/build-test.xml
index 9e30b5b..8f54b68 100644
--- a/make/build-test.xml
+++ b/make/build-test.xml
@@ -7,6 +7,7 @@
     <property name="gluegen.root" value=".." />
 
     <import file="gluegen-cpptasks.xml" />
+    <import file="gluegen-archivetasks.xml" />
 
     <condition property="rootrel.build" value="build">
         <not>
@@ -173,7 +174,7 @@
     <target name="junit.compile.check" depends="init">
       <delete quiet="true">
         <fileset dir="${build}/test/results" includes="**"/>
-        <fileset file="${build}/${test.archive.name}.zip"/>
+        <fileset file="${build}/${test.archive.name}.7z"/>
       </delete>
       <mkdir dir="${build}/test/results"/>
 
@@ -366,9 +367,9 @@
 
     <!-- updates / create the test results zip file -->
     <target name="test-zip-archive" depends="init">
-        <zip destfile="${build}/${test.archive.name}.zip" update="true">
-            <zipfileset dir="${build}/test/results" prefix="${archive.name}/test-results"/>
-        </zip>
+        <archive.7z destfile="${build}/${test.archive.name}.7z"
+                    basedir="${build}/test/results" 
+                    includes="**" />
     </target>
 
 </project>
diff --git a/make/build.xml b/make/build.xml
index aecfbe0..ed36a8d 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -20,6 +20,7 @@
   </fail>
 
   <import file="gluegen-cpptasks.xml" />
+  <import file="gluegen-archivetasks.xml" />
 
   <condition property="rootrel.build" value="build">
     <not>
@@ -681,9 +682,9 @@
         <classpath path="${classes}"/>
         <link offline="true" href="${javadoc.link}" packagelistLoc="142-packages" />
     </javadoc>
-    <zip destfile="${build}/javadoc.zip"
-         basedir="${javadoc.root.path}"
-         includes="gluegen/**" />
+    <archive.7z destfile="${build}/javadoc.7z"
+                basedir="${javadoc.root.path}"
+                includes="gluegen/**" />
   </target>
 
     <!-- ================================================================== -->
@@ -709,8 +710,7 @@
         <copy todir="${archive}/jnlp-files">
             <fileset dir="${project.root}/jnlp-files" includes="*" />
         </copy>
-        <delete quiet="true" file="${build}/${archive.name}.zip"/>
-        <zip destfile="${build}/${archive.name}.zip"
+        <archive.7z destfile="${build}/${archive.name}.7z"
              basedir="${build}"
              includes="${archive.name}/**" />
         <!-- Clean up after ourselves -->
diff --git a/make/gluegen-archivetasks.xml b/make/gluegen-archivetasks.xml
new file mode 100644
index 0000000..536441c
--- /dev/null
+++ b/make/gluegen-archivetasks.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="GlueGen-archivetasks" basedir=".">
+    <macrodef name="archive.7z">
+      <attribute name="basedir" />
+      <attribute name="destfile" />
+      <attribute name="includes" />
+      <sequential>
+       <delete file="@{destfile}" quiet="true" failonerror="false" />
+       <exec executable="7z"
+             dir="@{basedir}"
+             spawn="false"
+             failifexecutionfails="true"
+             failonerror="true">
+         <arg line="a -r @{destfile} @{includes}"/>
+       </exec>
+      </sequential>
+    </macrodef>  
+</project>
+
-- 
cgit v1.2.3


From 2ecb62d83db2f1309eae8a639c236c517dcbf846 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Wed, 23 Feb 2011 05:16:51 +0100
Subject: 7z: use OS searchpath

---
 make/gluegen-archivetasks.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'make')

diff --git a/make/gluegen-archivetasks.xml b/make/gluegen-archivetasks.xml
index 536441c..d7989bb 100644
--- a/make/gluegen-archivetasks.xml
+++ b/make/gluegen-archivetasks.xml
@@ -7,6 +7,7 @@
       <sequential>
        <delete file="@{destfile}" quiet="true" failonerror="false" />
        <exec executable="7z"
+             searchpath="true"
              dir="@{basedir}"
              spawn="false"
              failifexecutionfails="true"
-- 
cgit v1.2.3


From e3e59d2f83b6685f97d8b380f7a23d617bde65e4 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Wed, 23 Feb 2011 15:13:37 +0100
Subject: Inverse build attribute build.noarchive -> build.archiveon

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

(limited to 'make')

diff --git a/make/build.xml b/make/build.xml
index ed36a8d..f2d35b1 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -693,7 +693,7 @@
        - This must be called after all of the build targets complete.
       -->
 
-    <target name="developer-zip-archive" depends="init" unless="build.noarchives">
+    <target name="developer-zip-archive" depends="init" if="build.archiveon">
         <delete includeEmptyDirs="true" quiet="true" dir="${archive}" failonerror="false" />
         <mkdir dir="${archive}" />
         <copy file="${build}/artifact.properties" todir="${archive}"/>
-- 
cgit v1.2.3


From 1c88fd2534220a5e8eda1b4f0861ca23a9e3ef31 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Wed, 23 Feb 2011 18:14:53 +0100
Subject: Intro jogamp-env.xml to parse common env properties ; Fix archive.7z:
 use abs path

---
 make/build-test.xml           |  2 +-
 make/gluegen-archivetasks.xml |  5 +++--
 make/gluegen-properties.xml   |  5 +++--
 make/jogamp-env.xml           | 19 +++++++++++++++++++
 4 files changed, 26 insertions(+), 5 deletions(-)
 create mode 100755 make/jogamp-env.xml

(limited to 'make')

diff --git a/make/build-test.xml b/make/build-test.xml
index 8f54b68..e314260 100644
--- a/make/build-test.xml
+++ b/make/build-test.xml
@@ -89,7 +89,7 @@
         <taskdef name="gluegen" classname="com.jogamp.gluegen.ant.GlueGenTask"
                  classpathref="gluegen.classpath" />
 
-        <property name="test.archive.name" value="${archive.name}-test-results-${env.NODE_NAME}"/>
+        <property name="test.archive.name" value="${archive.name}-test-results-${build.node.name}"/>
     </target>
 
     <target name="java.build" depends="java.generate">
diff --git a/make/gluegen-archivetasks.xml b/make/gluegen-archivetasks.xml
index d7989bb..ee7501d 100644
--- a/make/gluegen-archivetasks.xml
+++ b/make/gluegen-archivetasks.xml
@@ -5,14 +5,15 @@
       <attribute name="destfile" />
       <attribute name="includes" />
       <sequential>
-       <delete file="@{destfile}" quiet="true" failonerror="false" />
+       <property name="destfile.path" location="@{destfile}"/> <!-- absolute path -->
+       <delete file="${destfile.path}" quiet="true" failonerror="false" />
        <exec executable="7z"
              searchpath="true"
              dir="@{basedir}"
              spawn="false"
              failifexecutionfails="true"
              failonerror="true">
-         <arg line="a -r @{destfile} @{includes}"/>
+         <arg line="a -r ${destfile.path} @{includes}"/>
        </exec>
       </sequential>
     </macrodef>  
diff --git a/make/gluegen-properties.xml b/make/gluegen-properties.xml
index 5bb4b61..76b42a1 100755
--- a/make/gluegen-properties.xml
+++ b/make/gluegen-properties.xml
@@ -31,8 +31,9 @@
   -->
 <project name="GlueGen-properties" basedir=".">
 
-  <target name="gluegen.properties.load.user" unless="gluegen.user.properties.file.set">
-    <property environment="env" />
+  <import file="jogamp-env.xml" />
+
+  <target name="gluegen.properties.load.user" depends="jogamp.env.init" unless="gluegen.user.properties.file.set">
     <!-- Load the user specified properties file that defines various host
       - specific paths.  The user will be notified if this is does not
       - exist. -->
diff --git a/make/jogamp-env.xml b/make/jogamp-env.xml
new file mode 100755
index 0000000..767adab
--- /dev/null
+++ b/make/jogamp-env.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="jogamp-env" basedir=".">
+
+  <target name="jogamp.env.init">
+    <property environment="env" />
+
+    <!-- only set 'build.archiveon' if set in environment to trigger archive creation -->
+    <condition property="build.archiveon" value="${env.build.archiveon}">
+        <isset property="${env.build.archiveon}"/>
+    </condition>
+
+    <condition property="build.node.name" value="${env.NODE_NAME}">
+        <isset property="${env.NODE_NAME}"/>
+    </condition>
+    <property name="build.node.name" value="local"/>
+
+  </target>
+
+</project>
-- 
cgit v1.2.3


From b88976ac189c8154be2a8e2b748711c85a1af421 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Wed, 23 Feb 2011 19:40:44 +0100
Subject: fix jogamp-env.xml ; uses env vars BUILD_ARCHIVE=true|yes and
 NODE_NAME if set

---
 make/build-test.xml                           |  3 ++-
 make/build.xml                                |  3 ++-
 make/gluegen-properties.xml                   |  4 +---
 make/jogamp-env.xml                           | 10 +++++-----
 make/scripts/make.gluegen.all.linux-x86.sh    |  0
 make/scripts/make.gluegen.all.linux-x86_64.sh |  0
 make/scripts/make.gluegen.all.macosx.sh       |  0
 make/scripts/make.gluegen.all.win32.bat       |  0
 make/scripts/make.gluegen.all.win64.bat       |  0
 make/scripts/runtest-cvm.bat                  |  0
 make/scripts/runtest-cvm.sh                   |  0
 make/scripts/runtest.sh                       |  0
 12 files changed, 10 insertions(+), 10 deletions(-)
 mode change 100644 => 100755 make/scripts/make.gluegen.all.linux-x86.sh
 mode change 100644 => 100755 make/scripts/make.gluegen.all.linux-x86_64.sh
 mode change 100644 => 100755 make/scripts/make.gluegen.all.macosx.sh
 mode change 100644 => 100755 make/scripts/make.gluegen.all.win32.bat
 mode change 100644 => 100755 make/scripts/make.gluegen.all.win64.bat
 mode change 100644 => 100755 make/scripts/runtest-cvm.bat
 mode change 100644 => 100755 make/scripts/runtest-cvm.sh
 mode change 100644 => 100755 make/scripts/runtest.sh

(limited to 'make')

diff --git a/make/build-test.xml b/make/build-test.xml
index e314260..51692bb 100644
--- a/make/build-test.xml
+++ b/make/build-test.xml
@@ -8,6 +8,7 @@
 
     <import file="gluegen-cpptasks.xml" />
     <import file="gluegen-archivetasks.xml" />
+    <import file="jogamp-env.xml" />
 
     <condition property="rootrel.build" value="build">
         <not>
@@ -15,7 +16,7 @@
         </not>
     </condition>
 
-    <target name="init" depends="gluegen.properties.load.user">
+    <target name="init" depends="jogamp.env.init,gluegen.properties.load.user">
 
         <!-- Call the external config validator script to make sure the config is ok and consistent -->
         <ant antfile="validate-properties.xml" inheritall="true"/>
diff --git a/make/build.xml b/make/build.xml
index f2d35b1..bdd9297 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -21,6 +21,7 @@
 
   <import file="gluegen-cpptasks.xml" />
   <import file="gluegen-archivetasks.xml" />
+  <import file="jogamp-env.xml" />
 
   <condition property="rootrel.build" value="build">
     <not>
@@ -36,7 +37,7 @@
     <property name="gluegen.excludes" value="com/jogamp/gluegen/runtime/BufferFactoryInternal.java,com/jogamp/gluegen/nativesig/**" />
   </target>
 
-  <target name="init" depends="gluegen.properties.load.user,gluegen.cpptasks.detect.os,setup-excludes-1,setup-excludes-2">
+  <target name="init" depends="jogamp.env.init,gluegen.properties.load.user,gluegen.cpptasks.detect.os,setup-excludes-1,setup-excludes-2">
     <!-- Declare all paths and user defined variables. -->
 
     <!-- property name="javadoc.link" value="http://java.sun.com/j2se/1.4.2/docs/api/" /-->
diff --git a/make/gluegen-properties.xml b/make/gluegen-properties.xml
index 76b42a1..949eadf 100755
--- a/make/gluegen-properties.xml
+++ b/make/gluegen-properties.xml
@@ -31,9 +31,7 @@
   -->
 <project name="GlueGen-properties" basedir=".">
 
-  <import file="jogamp-env.xml" />
-
-  <target name="gluegen.properties.load.user" depends="jogamp.env.init" unless="gluegen.user.properties.file.set">
+  <target name="gluegen.properties.load.user" unless="gluegen.user.properties.file.set">
     <!-- Load the user specified properties file that defines various host
       - specific paths.  The user will be notified if this is does not
       - exist. -->
diff --git a/make/jogamp-env.xml b/make/jogamp-env.xml
index 767adab..579714f 100755
--- a/make/jogamp-env.xml
+++ b/make/jogamp-env.xml
@@ -5,14 +5,14 @@
     <property environment="env" />
 
     <!-- only set 'build.archiveon' if set in environment to trigger archive creation -->
-    <condition property="build.archiveon" value="${env.build.archiveon}">
-        <isset property="${env.build.archiveon}"/>
+    <condition property="build.archiveon" value="${env.BUILD_ARCHIVE}">
+        <istrue value="${env.BUILD_ARCHIVE}"/>
+        <!--isset property="${env.BUILD_ARCHIVE}"/-->
     </condition>
 
-    <condition property="build.node.name" value="${env.NODE_NAME}">
-        <isset property="${env.NODE_NAME}"/>
+    <condition property="build.node.name" value="${env.NODE_NAME}" else="local">
+        <length string="${env.NODE_NAME}" when="greater" length="0" />
     </condition>
-    <property name="build.node.name" value="local"/>
 
   </target>
 
diff --git a/make/scripts/make.gluegen.all.linux-x86.sh b/make/scripts/make.gluegen.all.linux-x86.sh
old mode 100644
new mode 100755
diff --git a/make/scripts/make.gluegen.all.linux-x86_64.sh b/make/scripts/make.gluegen.all.linux-x86_64.sh
old mode 100644
new mode 100755
diff --git a/make/scripts/make.gluegen.all.macosx.sh b/make/scripts/make.gluegen.all.macosx.sh
old mode 100644
new mode 100755
diff --git a/make/scripts/make.gluegen.all.win32.bat b/make/scripts/make.gluegen.all.win32.bat
old mode 100644
new mode 100755
diff --git a/make/scripts/make.gluegen.all.win64.bat b/make/scripts/make.gluegen.all.win64.bat
old mode 100644
new mode 100755
diff --git a/make/scripts/runtest-cvm.bat b/make/scripts/runtest-cvm.bat
old mode 100644
new mode 100755
diff --git a/make/scripts/runtest-cvm.sh b/make/scripts/runtest-cvm.sh
old mode 100644
new mode 100755
diff --git a/make/scripts/runtest.sh b/make/scripts/runtest.sh
old mode 100644
new mode 100755
-- 
cgit v1.2.3


From 5cf4eeb334ac5390b0c681da0fb17db56a143395 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Thu, 24 Feb 2011 00:10:48 +0100
Subject: Fix archive.7z: unset property destfile.path.
 gluegen-archivetasks.xml -> jogamp-archivetasks.xml

---
 make/build-test.xml           |  2 +-
 make/build.xml                |  2 +-
 make/gluegen-archivetasks.xml | 21 ---------------------
 make/jogamp-archivetasks.xml  | 29 +++++++++++++++++++++++++++++
 4 files changed, 31 insertions(+), 23 deletions(-)
 delete mode 100644 make/gluegen-archivetasks.xml
 create mode 100644 make/jogamp-archivetasks.xml

(limited to 'make')

diff --git a/make/build-test.xml b/make/build-test.xml
index 51692bb..6383952 100644
--- a/make/build-test.xml
+++ b/make/build-test.xml
@@ -7,7 +7,7 @@
     <property name="gluegen.root" value=".." />
 
     <import file="gluegen-cpptasks.xml" />
-    <import file="gluegen-archivetasks.xml" />
+    <import file="jogamp-archivetasks.xml" />
     <import file="jogamp-env.xml" />
 
     <condition property="rootrel.build" value="build">
diff --git a/make/build.xml b/make/build.xml
index bdd9297..6e5a6ac 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -20,7 +20,7 @@
   </fail>
 
   <import file="gluegen-cpptasks.xml" />
-  <import file="gluegen-archivetasks.xml" />
+  <import file="jogamp-archivetasks.xml" />
   <import file="jogamp-env.xml" />
 
   <condition property="rootrel.build" value="build">
diff --git a/make/gluegen-archivetasks.xml b/make/gluegen-archivetasks.xml
deleted file mode 100644
index ee7501d..0000000
--- a/make/gluegen-archivetasks.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="GlueGen-archivetasks" basedir=".">
-    <macrodef name="archive.7z">
-      <attribute name="basedir" />
-      <attribute name="destfile" />
-      <attribute name="includes" />
-      <sequential>
-       <property name="destfile.path" location="@{destfile}"/> <!-- absolute path -->
-       <delete file="${destfile.path}" quiet="true" failonerror="false" />
-       <exec executable="7z"
-             searchpath="true"
-             dir="@{basedir}"
-             spawn="false"
-             failifexecutionfails="true"
-             failonerror="true">
-         <arg line="a -r ${destfile.path} @{includes}"/>
-       </exec>
-      </sequential>
-    </macrodef>  
-</project>
-
diff --git a/make/jogamp-archivetasks.xml b/make/jogamp-archivetasks.xml
new file mode 100644
index 0000000..24309d8
--- /dev/null
+++ b/make/jogamp-archivetasks.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="jogamp-archivetasks" basedir=".">
+    <dirname property="jogamp-archivetasks.basedir" file="${ant.file.jogamp-archivetasks}"/>
+    <taskdef resource="net/sf/antcontrib/antlib.xml">
+      <classpath> 
+        <pathelement location="${jogamp-archivetasks.basedir}/lib/ant-contrib-1.0b3.jar"/> 
+      </classpath>
+    </taskdef>
+
+    <macrodef name="archive.7z">
+      <attribute name="basedir" />
+      <attribute name="destfile" />
+      <attribute name="includes" />
+      <sequential>
+       <var name="destfile.path" unset="true"/>
+       <property name="destfile.path" location="@{destfile}"/> <!-- absolute path -->
+       <delete file="${destfile.path}" quiet="true" failonerror="false" />
+       <exec executable="7z"
+             searchpath="true"
+             dir="@{basedir}"
+             spawn="false"
+             failifexecutionfails="true"
+             failonerror="true">
+         <arg line="a -r ${destfile.path} @{includes}"/>
+       </exec>
+      </sequential>
+    </macrodef>  
+</project>
+
-- 
cgit v1.2.3