diff options
| -rw-r--r-- | make/build-test.xml | 3 | ||||
| -rw-r--r-- | make/build.xml | 3 | ||||
| -rwxr-xr-x | make/gluegen-properties.xml | 4 | ||||
| -rwxr-xr-x | make/jogamp-env.xml | 10 | ||||
| -rwxr-xr-x[-rw-r--r--] | make/scripts/make.gluegen.all.linux-x86.sh | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | make/scripts/make.gluegen.all.linux-x86_64.sh | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | make/scripts/make.gluegen.all.macosx.sh | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | make/scripts/make.gluegen.all.win32.bat | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | make/scripts/make.gluegen.all.win64.bat | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | make/scripts/runtest-cvm.bat | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | make/scripts/runtest-cvm.sh | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | make/scripts/runtest.sh | 0 |
12 files changed, 10 insertions, 10 deletions
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 index 3d052e9..3d052e9 100644..100755 --- a/make/scripts/make.gluegen.all.linux-x86.sh +++ b/make/scripts/make.gluegen.all.linux-x86.sh diff --git a/make/scripts/make.gluegen.all.linux-x86_64.sh b/make/scripts/make.gluegen.all.linux-x86_64.sh index 0713b8e..0713b8e 100644..100755 --- a/make/scripts/make.gluegen.all.linux-x86_64.sh +++ b/make/scripts/make.gluegen.all.linux-x86_64.sh diff --git a/make/scripts/make.gluegen.all.macosx.sh b/make/scripts/make.gluegen.all.macosx.sh index 51b9894..51b9894 100644..100755 --- a/make/scripts/make.gluegen.all.macosx.sh +++ b/make/scripts/make.gluegen.all.macosx.sh diff --git a/make/scripts/make.gluegen.all.win32.bat b/make/scripts/make.gluegen.all.win32.bat index c523de8..c523de8 100644..100755 --- a/make/scripts/make.gluegen.all.win32.bat +++ b/make/scripts/make.gluegen.all.win32.bat diff --git a/make/scripts/make.gluegen.all.win64.bat b/make/scripts/make.gluegen.all.win64.bat index 76cb6fc..76cb6fc 100644..100755 --- a/make/scripts/make.gluegen.all.win64.bat +++ b/make/scripts/make.gluegen.all.win64.bat diff --git a/make/scripts/runtest-cvm.bat b/make/scripts/runtest-cvm.bat index c0747d2..c0747d2 100644..100755 --- a/make/scripts/runtest-cvm.bat +++ b/make/scripts/runtest-cvm.bat diff --git a/make/scripts/runtest-cvm.sh b/make/scripts/runtest-cvm.sh index 0b29c07..0b29c07 100644..100755 --- a/make/scripts/runtest-cvm.sh +++ b/make/scripts/runtest-cvm.sh diff --git a/make/scripts/runtest.sh b/make/scripts/runtest.sh index cfc3928..cfc3928 100644..100755 --- a/make/scripts/runtest.sh +++ b/make/scripts/runtest.sh |