Merge branch 'master' of github.com:sgothel/jogl

4 files changed, 158 insertions, 4 deletions

diff --git a/make/build-common.xml b/make/build-common.xml
index fc53e951b..bbb42ee67 100644
--- a/make/build-common.xml
+++ b/make/build-common.xml
@@ -82,6 +82,9 @@
         <property name="stub.includes"              value="stub_includes" /> <!-- NOTE:  this MUST be relative for FileSet -->
         <property name="stub.includes.common"       value="${stub.includes}/common" />
 
+        <property file="${build}/artifact.properties"/>
+        <property name="jogl.build.number" value="manual-build"/>
+
         <condition property="setup.nodesktop">
             <and>
                 <isfalse value="${isWindows}" />
diff --git a/make/build.xml b/make/build.xml
index 23d12d5de..379f80c16 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -150,9 +150,9 @@
              includes="jogl/${rootrel.build}/jogl/gensrc/classes/javax/media/opengl/**" />
     </target>
 
-    <target name="tag.build">
-        <copy file="${gluegen.root}/build/artifact.properties" todir="${build}" overwrite="true"/>
-        <echo file="${build}/artifact.properties" message='jogl.build.number="${build.number}"${line.separator}' append="true"/>
+    <target name="tag.build" depends="init">
+        <copy file="${build.gluegen}/artifact.properties" todir="${build}" overwrite="true"/>
+        <echo file="${build}/artifact.properties" message='jogl.build.number=${jogl.build.number}${line.separator}' append="true"/>
     </target>
 
     <!-- ================================================================== -->
diff --git a/make/scripts/hudson-archive-jars-latest.sh b/make/scripts/hudson-archive-jars-latest.sh
new file mode 100755
index 000000000..a6f1abc58
--- /dev/null
+++ b/make/scripts/hudson-archive-jars-latest.sh
@@ -0,0 +1,149 @@
+#! /bin/bash
+
+archivedir=/srv/www/jogamp.org/deployment/archive
+rootdir=/srv/www/jogamp.org/deployment/autobuilds
+cd $rootdir
+
+dest=tmp-archive
+
+rm -rf $dest
+mkdir $dest
+mkdir $dest/javadoc
+
+function lslatest() {
+    pattern=$1
+    shift
+    ls -rt  | grep $pattern | tail -1
+}
+
+function buildnumber_2() {
+    folder=$1
+    shift
+    echo $folder | awk -F '-' ' { print substr($2, 2); } '
+}
+
+function buildnumber_3() {
+    folder=$1
+    shift
+    echo $folder | awk -F '-' ' { print substr($3, 2); } '
+}
+
+function buildnumber_4() {
+    folder=$1
+    shift
+    echo $folder | awk -F '-' ' { print substr($4, 2); } '
+}
+
+gluegenslave=`lslatest gluegen-b`
+bgluegenslave=`buildnumber_2 $gluegenslave`
+gluegenmaster=`lslatest gluegen-master-b`
+bgluegenmaster=`buildnumber_3 $gluegenmaster`
+echo
+echo GLUEGEN
+echo
+echo slave  build $bgluegenslave - $gluegenslave
+echo master build $bgluegenmaster - $gluegenmaster
+echo
+echo "gluegen.build.number=$bgluegenslave" >> $dest/aggregated.artifact.properties
+
+cp -a $gluegenslave/build/gluegen*jar $dest/
+cp -a $gluegenslave/build/artifact.properties $dest/gluegen.artifact.properties
+
+cp -a $gluegenmaster/build/artifact.properties $dest/javadoc/gluegen-master.artifact.properties
+mkdir $dest/javadoc/gluegen
+cp -a $gluegenmaster/build/javadoc.zip $dest/javadoc/gluegen
+cd $dest/javadoc/gluegen
+unzip javadoc.zip
+cd $rootdir
+
+joglslave=`lslatest jogl-b`
+bjoglslave=`buildnumber_2 $joglslave`
+joglmaster=`lslatest jogl-master-b`
+bjoglmaster=`buildnumber_3 $joglmaster`
+echo
+echo JOGL
+echo
+echo slave  build $bjoglslave - $joglslave
+echo master build $bjoglmaster - $joglmaster
+echo
+echo "jogl.build.number=$bjoglslave" >> $dest/aggregated.artifact.properties
+
+cp -a $joglslave/build/jar/nativewindow*jar $dest/
+cp -a $joglslave/build/jar/jogl*jar $dest/
+cp -a $joglslave/build/jar/newt*jar $dest/
+cp -a $joglslave/build/jogl*zip $dest/
+cp -a $joglslave/build/artifact.properties $dest/jogl.artifact.properties
+
+cp -a $joglmaster/build/artifact.properties $dest/javadoc/jogl-master.artifact.properties
+mkdir $dest/javadoc/jogl
+cp -a $joglmaster/build/javadoc*.zip $dest/javadoc/jogl
+cd $dest/javadoc/jogl
+for i in *.zip ; do 
+    unzip $i
+done
+cd $rootdir
+
+jogldemosslave=`lslatest jogl-demos-b`
+bjogldemosslave=`buildnumber_3 $jogldemosslave`
+echo
+echo JOGL DEMOS
+echo
+echo slave  build $bjogldemosslave - $jogldemosslave
+echo
+echo "jogl-demos.build.number=$bjogldemosslave" >> $dest/aggregated.artifact.properties
+
+cp -a $jogldemosslave/build/jogl-demos*jar $dest/
+cp -a $jogldemosslave/build/artifact.properties $dest/jogl-demos.artifact.properties
+
+
+
+joclslave=`lslatest jocl-b`
+bjoclslave=`buildnumber_2 $joclslave`
+joclmaster=`lslatest jocl-master-b`
+bjoclmaster=`buildnumber_3 $joclmaster`
+echo
+echo JOCL
+echo
+echo slave  build $bjoclslave - $joclslave
+echo master build $bjoclmaster - $joclmaster
+echo
+echo "jocl.build.number=$bjoclslave" >> $dest/aggregated.artifact.properties
+
+cp -a $joclslave/jocl*jar $dest/
+cp -a $joclslave/artifact.properties $dest/jocl.artifact.properties
+
+cp -a $joclmaster/artifact.properties $dest/javadoc/jocl-master.artifact.properties
+mkdir $dest/javadoc/jocl
+cp -a $joclmaster/jocl-javadoc.zip $dest/javadoc/jocl/
+cd $dest/javadoc/jocl
+unzip jocl-javadoc.zip
+cd $rootdir
+
+jocldemosslave=`lslatest jocl-demos-b`
+bjocldemosslave=`buildnumber_3 $jocldemosslave`
+echo
+echo JOCL DEMOS
+echo
+echo slave  build $bjocldemosslave - $jocldemosslave
+echo
+echo "jocl-demos.build.number=$bjocldemosslave" >> $dest/aggregated.artifact.properties
+
+cp -a $jocldemosslave/jocl-demos*jar $dest/
+cp -a $jocldemosslave/artifact.properties $dest/jocl-demos.artifact.properties
+
+rm -rf $archivedir/gluegen_$bgluegenslave-jogl_$bjoglslave-jocl_$bjoclslave
+mv $dest $archivedir/gluegen_$bgluegenslave-jogl_$bjoglslave-jocl_$bjoclslave
+
+echo
+echo Aggregation folder $archivedir/gluegen_$bgluegenslave-jogl_$bjoglslave-jocl_$bjoclslave
+echo
+
+cd $archivedir/gluegen_$bgluegenslave-jogl_$bjoglslave-jocl_$bjoclslave
+
+echo
+echo aggregation.properties
+echo
+cat jocl-demos.artifact.properties jogl-demos.artifact.properties | sort -u > jocl-demos-jogl-demos.artifact.properties.sorted
+sort -u aggregated.artifact.properties > aggregated.artifact.properties.sorted
+diff -Nurb aggregated.artifact.properties.sorted jocl-demos-jogl-demos.artifact.properties.sorted
+
diff --git a/make/scripts/java-run-all.sh b/make/scripts/java-run-all.sh
index f99a49617..16353dff2 100755
--- a/make/scripts/java-run-all.sh
+++ b/make/scripts/java-run-all.sh
@@ -44,8 +44,10 @@ uname -a | grep -i Darwin && MOSX=1
 # D_ARGS="-Dnewt.debug=all -Dnativewindow.debug=all"
 # D_ARGS="-Djogl.debug=all -Dnewt.debug=all -Dnativewindow.debug=all"
 # D_ARGS="-Dnewt.debug=all"
-D_ARGS="-Dnewt.debug.Window"
+# D_ARGS="-Dnewt.debug.Window"
 # D_ARGS="-Dnewt.debug.Display"
+# D_ARGS="-Dnewt.debug.Window -Dnewt.debug.TestEDTMainThread"
+# D_ARGS="-Dnewt.debug.TestEDTMainThread"
 # D_ARGS="-Djogl.debug=all -Djogl.debug.DynamicLookup=true -Djogamp.debug.NativeLibrary=true"
 # D_ARGS="-Djogl.debug=all"
 # D_ARGS="-Djogamp.debug.JNILibLoader=true -Djogamp.debug.NativeLibrary=true -Djogamp.debug.NativeLibrary.Lookup=true -Djogl.debug.GLProfile=true"