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