summaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2011-02-23 19:43:12 +0100
committerSven Gothel <[email protected]>2011-02-23 19:43:12 +0100
commit4ee45807bf9e643dc75b24e48b68981547257947 (patch)
tree75ddc123845d600a9b44c5d3b339558d5a480d9e /make
parentec507c11ef64de269248b7b9dafceece7f08f56b (diff)
Adapt changes of jogamp-env.xml
Diffstat (limited to 'make')
-rw-r--r--make/build-test.xml6
-rwxr-xr-xmake/build.xml4
-rwxr-xr-x[-rw-r--r--]make/scripts/make.joal.all.linux-x86_64.sh0
3 files changed, 6 insertions, 4 deletions
diff --git a/make/build-test.xml b/make/build-test.xml
index 76973c5..db7da30 100644
--- a/make/build-test.xml
+++ b/make/build-test.xml
@@ -42,7 +42,9 @@
<classpath> <pathelement location="${ant-contrib.jar}"/> </classpath>
</taskdef>
- <target name="declare.common">
+ <import file="${gluegen.root}/make/jogamp-env.xml" />
+
+ <target name="declare.common" depends="jogamp.env.init">
<property name="rootrel.src.test" value="src/test" />
<property name="src.test" value="${project.root}/${rootrel.src.test}" />
@@ -61,7 +63,7 @@
<property name="obj.all.paths" value="${gluegen.build}/obj${path.separator}${obj}${path.separator}lib/${os.and.arch}"/>
<property name="classpath.test" value="${gluegen-rt.jar}${path.separator}${build}/joal.jar${path.separator}${build}/joal-test.jar${path.separator}${junit.path}"/>
- <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}"/>
<property name="batchtest.timeout" value="1800000"/> <!-- 30 min -->
diff --git a/make/build.xml b/make/build.xml
index 4caf436..5a3bc6a 100755
--- a/make/build.xml
+++ b/make/build.xml
@@ -38,7 +38,6 @@
</tstamp>
<property name="joal.version" value="${joal_base_version}-${version.timestamp}" />
- <property environment="env" />
<property name="project.root" value=".." />
<condition property="rootrel.build" value="build">
@@ -60,6 +59,7 @@
<!-- Pull in GlueGen cpptasks build file -->
<import file="${gluegen.root}/make/gluegen-cpptasks.xml" />
<import file="${gluegen.root}/make/gluegen-archivetasks.xml" />
+ <import file="${gluegen.root}/make/jogamp-env.xml" />
<!-- ================================================================== -->
<!--
@@ -78,7 +78,7 @@
<!--
- Declare all paths and user defined variables.
-->
- <target name="init" depends="gluegen.cpptasks.detect.os">
+ <target name="init" depends="jogamp.env.init, gluegen.cpptasks.detect.os">
<!-- The location and name of the configuration ANT file that will
- validate to ensure that all user-define variables are set. -->
diff --git a/make/scripts/make.joal.all.linux-x86_64.sh b/make/scripts/make.joal.all.linux-x86_64.sh
index 36d8645..36d8645 100644..100755
--- a/make/scripts/make.joal.all.linux-x86_64.sh
+++ b/make/scripts/make.joal.all.linux-x86_64.sh