Archive: New common zip archive folder structure. Drop source archive, use git

4 files changed, 14 insertions, 38 deletions

diff --git a/make/build-common.xml b/make/build-common.xml
index 381bee1aa..5a8da17f3 100644
--- a/make/build-common.xml
+++ b/make/build-common.xml
@@ -27,7 +27,7 @@
     <import file="versions.xml" />
 
     <tstamp>
-         <format property="version.timestamp" pattern="yyyyMMdd"/>
+         <format property="version.timestamp" pattern="yyyyMMddHHmm"/>
     </tstamp>
 
     <target name="nativewindow.setup-version-RI" if="nativewindow.ri">
diff --git a/make/build.xml b/make/build.xml
index 83dad980a..fc2961cb0 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -91,7 +91,7 @@
     <target name="developer-zip-archive" depends="init" unless="build.noarchives">
         <delete includeEmptyDirs="true" quiet="true" dir="${archive}" failonerror="false" />
         <mkdir dir="${archive}" />
-        <!-- Copy the appropriate pieces into the archive directory -->
+        <copy file="${build}/artifact.properties" todir="${archive}" />
         <copy file="../CHANGELOG.txt"  todir="${archive}" />
         <copy file="../LICENSE.txt"    todir="${archive}" />
         <copy file="../doc/userguide/index.html" tofile="${archive}/Userguide.html" />
@@ -102,16 +102,17 @@
                 <filter token="VERSION" value="${jogl.version}"/>
             </filterset>
         </copy>
+        <mkdir dir="${archive}/jar" />
+        <copy todir="${archive}/jar">
+            <fileset dir="${build}/jar" includes="*"/>
+        </copy>
         <mkdir dir="${archive}/lib" />
         <copy todir="${archive}/lib">
-            <fileset dir="${gluegen.root}/${rootrel.build}" includes="gluegen-rt.jar gluegen-rt.cdc.jar" />
-            <fileset dir="${gluegen.root}/${rootrel.build}/obj" includes="*.${native.library.suffix} *.${native.library.suffix-cdc}" />
-            <fileset dir="${build}/jogl" includes="*.jar" excludes="*natives*.jar" />
-            <fileset dir="${build}/jogl/obj" includes="*.${native.library.suffix} *.${native.library.suffix-cdc}" />
-            <fileset dir="${build}/nativewindow" includes="*.jar" excludes="*natives*.jar" />
-            <fileset dir="${build}/nativewindow/obj" includes="*.${native.library.suffix} *.${native.library.suffix-cdc}" />
-            <fileset dir="${build}/newt" includes="*.jar" excludes="*natives*.jar" />
-            <fileset dir="${build}/newt/obj" includes="*.${native.library.suffix} *.${native.library.suffix-cdc}" />
+            <fileset dir="${build}/lib" includes="*"/>
+        </copy>
+        <mkdir dir="${archive}/jnlp-files" />
+        <copy todir="${archive}/jnlp-files">
+            <fileset dir="${project.root}/jnlp-files" includes="*" />
         </copy>
         <mkdir dir="${archive}/etc" />
         <copy todir="${archive}/etc">
@@ -125,30 +126,6 @@
         <delete includeEmptyDirs="true" quiet="true" dir="${archive}" failonerror="false" />
     </target>
 
-    <!-- ================================================================== -->
-    <!--
-       - Build the source archive for developers.
-       - This must be called after all of the build targets complete.
-      -->
-
-    <target name="source-archive" depends="init" unless="build.noarchives">
-        <!-- NOTE that if you are using multiple rootrel.build directories within the same
-             repository, the exclude lists here won't work well enough and you will wind up
-             archiving binary bits from other rootrel.build settings in the source archive.
-             This is inevitable given that we don't want to specialize this target to
-             explicitly include top level files and directories, to make it future-proof. -->
-        <delete quiet="true" file="${build}/jogl-${jogl.version}-src.zip"/>
-        <zip destfile="${build}/jogl-${jogl.version}-src.zip"
-             basedir="${project.root}/.."
-             excludes="${gluegen.root}/${rootrel.build}/**,${gluegen.root}/build/**${gluegen.root}/build-temp/**,jogl/${rootrel.build}/**,jogl/build/**,jogl/build-temp/**,jogl/www/**"
-             includes="${gluegen.root}/**, jogl/**" />
-        <!-- Now add in certain portions of the generated source code for developers -->
-        <zip update="true"
-             destfile="${build}/jogl-${jogl.version}-src.zip"
-             basedir="${project.root}/.."
-             includes="jogl/${rootrel.build}/jogl/gensrc/classes/javax/media/opengl/**" />
-    </target>
-
     <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"/>
@@ -159,7 +136,7 @@
        - Main build target.
       -->
 
-    <target name="all" description="Build nativewindow, jogl and newt projects, incl. all junit tests " depends="init,build.nativewindow,build.jogl,build.newt,junit.compile,one-dir,tag.build,developer-zip-archive,source-archive" />
+    <target name="all" description="Build nativewindow, jogl and newt projects, incl. all junit tests " depends="init,build.nativewindow,build.jogl,build.newt,junit.compile,one-dir,tag.build,developer-zip-archive" />
 
     <target name="all.but-archives" description="Build nativewindow, jogl and newt projects, incl. all junit tests " depends="init,build.nativewindow,build.jogl,build.newt,junit.compile,one-dir" />
 
diff --git a/make/scripts/make.jogl.all.linux-x86_64.sh b/make/scripts/make.jogl.all.linux-x86_64.sh
index f8224b1fe..a1411c7ec 100755
--- a/make/scripts/make.jogl.all.linux-x86_64.sh
+++ b/make/scripts/make.jogl.all.linux-x86_64.sh
@@ -55,7 +55,6 @@ echo LIBGL_DEBUG: $LIBGL_DEBUG 2>&1 | tee -a $LOGF
 
 ant  \
     $CUSTOMLIBDIR \
-    -Dbuild.noarchives=true \
     -Djogl.cg=1 \
     -Drootrel.build=build-x86_64 \
     -DuseKD=true \
diff --git a/make/versions.xml b/make/versions.xml
index 75c035f5a..f43a21fdc 100644
--- a/make/versions.xml
+++ b/make/versions.xml
@@ -22,7 +22,7 @@
 
   <!-- Base version of the NativeWindow interface, following the same
        rules as above -->
-  <property name="nativewindow_base_version" value="1.0" />
+  <property name="nativewindow_base_version" value="2.0" />
 
   <!-- Uncomment this property in order to produce a NativeWindow
        build without running the "RI" (Reference Implementation)
@@ -33,7 +33,7 @@
 
   <!-- Base version of the Newt library, following the same
        rules as above -->
-  <property name="newt_base_version" value="1.0" />
+  <property name="newt_base_version" value="2.0" />
 
   <!-- Newt isn't covered by a JSR at the moment, so there is little
        value in having a different reference implementation