Adapt changes of jogamp-env.xml

8 files changed, 5 insertions, 7 deletions

diff --git a/make/build-common.xml b/make/build-common.xml
index 7b168773e..f350405c5 100644
--- a/make/build-common.xml
+++ b/make/build-common.xml
@@ -12,12 +12,11 @@
         </condition>
     </fail>
 
-    <property environment="env" />
-
     <!-- Pull in GlueGen cpptasks build file -->
     <property name="gluegen.root" value="../../gluegen" />
     <import file="${gluegen.root}/make/gluegen-cpptasks.xml" />
     <import file="${gluegen.root}/make/gluegen-archivetasks.xml" />
+    <import file="${gluegen.root}/make/jogamp-env.xml" />
 
     <property name="ant-contrib.jar"  value="${gluegen.root}/make/lib/ant-contrib-1.0b3.jar" />
 
@@ -33,13 +32,12 @@
     <!-- 
        - Base initialization of properties and detection of operating system.
       -->
-    <target name="common.init" depends="gluegen.cpptasks.detect.os" unless="common.init.done">
+    <target name="common.init" depends="jogamp.env.init, gluegen.cpptasks.detect.os" unless="common.init.done">
         <property name="common.init.done" value="true" />
 
         <!-- Set the project root directory to be up one directory. -->
         <property name="project.root"               value=".." />
         <property name="build"                      value="${project.root}/${rootrel.build}" />
-        <property name="build.path"                 location="${build}"/> <!-- absolute path -->
         <property name="src"                        value="${project.root}/src" />
         <property name="lib"                        value="${build}/lib" />
         <property name="jar"                        value="${build}/jar" />
diff --git a/make/build-test.xml b/make/build-test.xml
index 1f7483aa4..ae030b0e6 100644
--- a/make/build-test.xml
+++ b/make/build-test.xml
@@ -26,7 +26,7 @@
         <property name="java.dir.junit"       value="${java.dir.test}/junit"/>
         <property name="java.dir.bugs"        value="${java.dir.test}/bugs"/>
 
-        <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}"/>
         <condition property="jvmarg.newt.headless" value="-XstartOnFirstThread -Djava.awt.headless=true"><isset property="isOSX"/></condition>
         <condition property="jvmarg.newt.headless" value="-Djava.awt.headless=true"><not><isset property="isOSX"/></not></condition>
 
@@ -55,7 +55,7 @@
       <!-- Clean the results -->
       <delete quiet="true">
         <fileset dir="${results.test}" includes="**"/>
-        <fileset file="${build.path}/${test.archive.name}.7z"/>
+        <fileset file="${build}/${test.archive.name}.7z"/>
       </delete>
       <mkdir dir="${results.test}" />
 
@@ -385,7 +385,7 @@
 
     <!-- updates / create the test results zip file -->
     <target name="test-zip-archive" depends="declare.common">
-        <archive.7z destfile="${build.path}/${test.archive.name}.7z"
+        <archive.7z destfile="${build}/${test.archive.name}.7z"
                     basedir="${results.test}" 
                     includes="**" />
     </target>
diff --git a/make/scripts/cmpOld2New.sh b/make/scripts/cmpOld2New.sh
index 4394fe7b5..4394fe7b5 100644..100755
--- a/make/scripts/cmpOld2New.sh
+++ b/make/scripts/cmpOld2New.sh
diff --git a/make/scripts/count-lock.sh b/make/scripts/count-lock.sh
index 806235f5c..806235f5c 100644..100755
--- a/make/scripts/count-lock.sh
+++ b/make/scripts/count-lock.sh
diff --git a/make/scripts/cpp-gluegen-test.sh b/make/scripts/cpp-gluegen-test.sh
index 2baa57729..2baa57729 100644..100755
--- a/make/scripts/cpp-gluegen-test.sh
+++ b/make/scripts/cpp-gluegen-test.sh
diff --git a/make/scripts/make-runtime-properties.sh b/make/scripts/make-runtime-properties.sh
index a6075dd85..a6075dd85 100644..100755
--- a/make/scripts/make-runtime-properties.sh
+++ b/make/scripts/make-runtime-properties.sh
diff --git a/make/scripts/tests-javaws.sh b/make/scripts/tests-javaws.sh
index a1b1b1e2e..a1b1b1e2e 100644..100755
--- a/make/scripts/tests-javaws.sh
+++ b/make/scripts/tests-javaws.sh
diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh
index 682158eea..682158eea 100644..100755
--- a/make/scripts/tests.sh
+++ b/make/scripts/tests.sh