aboutsummaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
Diffstat (limited to 'make')
-rw-r--r--make/build-test.xml14
-rw-r--r--make/build.xml15
-rw-r--r--make/jogamp-archivetasks.xml29
-rwxr-xr-xmake/jogamp-env.xml19
-rwxr-xr-x[-rw-r--r--]make/scripts/make.gluegen.all.linux-x86.sh0
-rwxr-xr-x[-rw-r--r--]make/scripts/make.gluegen.all.linux-x86_64.sh0
-rwxr-xr-x[-rw-r--r--]make/scripts/make.gluegen.all.macosx.sh0
-rwxr-xr-x[-rw-r--r--]make/scripts/make.gluegen.all.win32.bat0
-rwxr-xr-x[-rw-r--r--]make/scripts/make.gluegen.all.win64.bat0
-rwxr-xr-x[-rw-r--r--]make/scripts/runtest-cvm.bat0
-rwxr-xr-x[-rw-r--r--]make/scripts/runtest-cvm.sh0
-rwxr-xr-x[-rw-r--r--]make/scripts/runtest.sh0
12 files changed, 64 insertions, 13 deletions
diff --git a/make/build-test.xml b/make/build-test.xml
index 222ab93..6383952 100644
--- a/make/build-test.xml
+++ b/make/build-test.xml
@@ -7,6 +7,8 @@
<property name="gluegen.root" value=".." />
<import file="gluegen-cpptasks.xml" />
+ <import file="jogamp-archivetasks.xml" />
+ <import file="jogamp-env.xml" />
<condition property="rootrel.build" value="build">
<not>
@@ -14,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"/>
@@ -88,7 +90,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-${build.node.name}"/>
</target>
<target name="java.build" depends="java.generate">
@@ -173,7 +175,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 +368,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..6e5a6ac 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -20,6 +20,8 @@
</fail>
<import file="gluegen-cpptasks.xml" />
+ <import file="jogamp-archivetasks.xml" />
+ <import file="jogamp-env.xml" />
<condition property="rootrel.build" value="build">
<not>
@@ -35,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/" /-->
@@ -681,9 +683,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>
<!-- ================================================================== -->
@@ -692,7 +694,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}"/>
@@ -709,8 +711,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/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>
+
diff --git a/make/jogamp-env.xml b/make/jogamp-env.xml
new file mode 100755
index 0000000..579714f
--- /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_ARCHIVE}">
+ <istrue value="${env.BUILD_ARCHIVE}"/>
+ <!--isset property="${env.BUILD_ARCHIVE}"/-->
+ </condition>
+
+ <condition property="build.node.name" value="${env.NODE_NAME}" else="local">
+ <length string="${env.NODE_NAME}" when="greater" length="0" />
+ </condition>
+
+ </target>
+
+</project>
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