build: Query git branch/sha1 and use it if not set and tools are available; Add Java source zip file.

Query git branch/sha1 and use it if not set and tools are available.
This shall improve tracking of manual generated binaries/bundles.

Add Java source zip file. Contains all Java source code (incl. generated ones) enhancing
IDE usage, where API doc and source browsing of libs is supported (NB/Eclipse/etc).

5 files changed, 39 insertions, 8 deletions

diff --git a/make/README-zip-bundles.txt b/make/README-zip-bundles.txt
index 29f2650a4..3a0b4b0f6 100644
--- a/make/README-zip-bundles.txt
+++ b/make/README-zip-bundles.txt
@@ -28,6 +28,14 @@ and the following subdirectory:
   lib                         contains JOGL implementation, native libraries
   jnlp-files                  contains JOGL jnlp-file templates
 
+additionally the following Java source zip archives are added,
+allowing convenient IDE integration (javadoc, class/method help, etc).
+Generated Java source code is included as well.
+
+  nativewindow-java-src.zip   contains NativeWindow Java sources, reflecting nativewindow.all.jar
+  jogl-java-src.zip           contains JOGL Java sources, reflecting jogl.all.jar
+  newt-java-src.zip           contains NEWT Java sources, reflecting newt.all.jar
+
 For instructions on how to use these implementation files 
 to build or run a JOGL program look at:
     http://jogamp.org/
diff --git a/make/build-common.xml b/make/build-common.xml
index c2ddae69a..aac3849e0 100644
--- a/make/build-common.xml
+++ b/make/build-common.xml
@@ -45,6 +45,7 @@
         <!-- 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="tempdir"                    value="${project.root}/build-temp" />
         <property name="src"                        value="${project.root}/src" />
         <property name="lib"                        value="${build}/lib" />
         <property name="jar"                        value="${build}/jar" />
@@ -63,18 +64,30 @@
              <format property="version.timestamp" pattern="yyyyMMdd"/>
         </tstamp>
 
-        <property file="${build}/artifact.properties"/>
         <property name="jogl.build.number" value="manual"/>
         <property name="jogl.build.id"     value="${version.timestamp}"/>
-        <property name="jogl.build.branch" value="master"/>
-        <property name="jogl.build.commit" value="manual"/>
+        <mkdir dir="${tempdir}" />
+        <exec dir="." executable="git" logError="true" failonerror="false" failifexecutionfails="false"
+                  output="${tempdir}/localbranch.raw">
+            <arg line="branch --no-color"/>
+        </exec>
+        <exec dir="." executable="sed" logError="true" failonerror="false" failifexecutionfails="false"
+                  outputproperty="jogl.build.branch">
+            <arg line="-e '/^[^*]/d' -e 's/* \(.*\)/\1/' ${tempdir}/localbranch.raw"/>
+        </exec>
+        <property name="jogl.build.branch" value="manual"/> <!-- fallback -->
+        <exec dir="${project.root}" executable="git" logError="true" failonerror="false" failifexecutionfails="false"
+                  outputproperty="jogl.build.commit">
+            <arg line="rev-parse HEAD"/>
+        </exec>
+        <property name="jogl.build.commit" value="manual"/> <!-- fallback -->
 
         <property name="nativewindow.version" value="${nativewindow_base_version}-b${jogl.build.number}-${version.timestamp}" />
         <property name="jogl.version"         value="${jogl_base_version}-b${jogl.build.number}-${version.timestamp}" />
         <property name="newt.version"         value="${newt_base_version}-b${jogl.build.number}-${version.timestamp}" />
 
-        <property name="archive.name"               value="jogl-${jogl.version}-${os.and.arch}" />
-        <property name="archive"                    value="${build}/${archive.name}" />
+        <property name="archive.name"         value="jogl-${jogl.version}-${os.and.arch}" />
+        <property name="archive"              value="${build}/${archive.name}" />
 
         <condition property="setup.nodesktop">
             <and>
diff --git a/make/build-jogl.xml b/make/build-jogl.xml
index 73b61e690..d11d70c21 100644
--- a/make/build-jogl.xml
+++ b/make/build-jogl.xml
@@ -206,7 +206,6 @@
         <!-- The source directories. -->
         <property name="src.java" value="${project.root}/${rootrel.src.java}" />
         <property name="src.c"    value="${project.root}/${rootrel.src.c}" />
-        <property name="tempdir"  value="${project.root}/build-temp" />
         
         <!-- The generated source directories. -->
         <property name="src.generated" value="${build.jogl}/gensrc" />
diff --git a/make/build.xml b/make/build.xml
index 6dc856367..ed131b475 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -133,7 +133,7 @@
             tofile="${archive}/README.txt"
             overwrite="true">
             <filterset>
-                <filter token="VERSION" value="${jogl.version}"/>
+                <filter token="VERSION"  value="${jogl.version}"/>
                 <filter token="SCM_BRANCH" value="${jogl.build.branch}"/>
                 <filter token="SCM_COMMIT" value="${jogl.build.commit}"/>
                 <filter token="BASEVERSION" value="${jogl_base_version}"/>
@@ -155,6 +155,17 @@
         <copy todir="${archive}/etc">
             <fileset dir="${project.root}/etc" includes="*" />
         </copy>
+        <zip destfile="${archive}/nativewindow-java-src.zip">
+            <fileset dir="${src}/nativewindow/classes"/>
+            <fileset dir="${build}/nativewindow/gensrc/classes"/>
+        </zip>
+        <zip destfile="${archive}/jogl-java-src.zip">
+            <fileset dir="${src}/jogl/classes"/>
+            <fileset dir="${build}/jogl/gensrc/classes"/>
+        </zip>
+        <zip destfile="${archive}/newt-java-src.zip">
+            <fileset dir="${src}/newt/classes"/>
+        </zip>
         <archive.7z destfile="${build}/${archive.name}.7z"
              basedir="${build}"
              includes="${archive.name}/**" />
diff --git a/make/scripts/make.jogl.all.linux-x86_64.sh b/make/scripts/make.jogl.all.linux-x86_64.sh
index 577caeb14..2b51f00d8 100755
--- a/make/scripts/make.jogl.all.linux-x86_64.sh
+++ b/make/scripts/make.jogl.all.linux-x86_64.sh
@@ -52,9 +52,9 @@ echo LIBGL_DEBUG: $LIBGL_DEBUG 2>&1 | tee -a $LOGF
 #    -Djavacdebug="true" \
 #    -Djavacdebuglevel="source,lines,vars" \
 
+# BUILD_ARCHIVE=true \
 ant  \
     $CUSTOMLIBDIR \
-    -Djavacdebuglevel="source,lines,vars" \
     -Djogl.cg=1 \
     -Drootrel.build=build-x86_64 \
     -DuseKD=true \