Thanks to Sven's changes to make each platform build a platform-

independent jogl.jar, the "dist" target can now be completely
eliminated from the various build.xmls. Removed this to achieve a
significant simplification. The nightly build scripts now take care of
the needed copying.


git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@1984 232f8b59-042b-4e1e-8c03-345bb8c30851

3 files changed, 0 insertions, 1178 deletions

diff --git a/make/build-jogl.xml b/make/build-jogl.xml
index a1f324d62..8f7a4ac5d 100644
--- a/make/build-jogl.xml
+++ b/make/build-jogl.xml
@@ -1891,436 +1891,6 @@
 
     <!-- ================================================================== -->
     <!--
-       - Build the platform-independent distribution out of jars built for
-       - Windows, Linux and Mac OS X; the Java sources for Jogl can't be
-       - fully cross-compiled at this time. To run this target, you need to
-       - specify the property jogl.dist.dir as a System property (i.e.,
-       - "ant -Djogl.dist.dir=../dist dist"); directories named jogl-linux,
-       - jogl-win, and jogl-macosx need to be inside that directory and each
-       - of those directories needs to contain both the jogl.jar for that
-       - platform as well as the native code (libjogl.so, jogl.dll, or
-       - libjogl.jnilib). Also builds jars containing the native code for
-       - Windows, Linux, Mac OS X, Solaris/SPARC and Solaris/x86.
-      -->
-    <target name="dist.dir.check" unless="jogl.dist.dir">
-        <fail>
-  
-    ******************************************************************
-    ** To build the Jogl distribution out of the platform-specific  **
-    ** component jars and native code, the property jogl.dist.dir   **
-    ** needs to be specified on the command line. Please read the   **
-    ** comments associated with the "dist" target in the build.xml. **
-    ******************************************************************
-        </fail>
-    </target>
-
-    <target name="dist.check.windows" if="jogl.dist.dir">
-        <condition property="windows.complete">
-      <and>
-        <available file="${jogl.dist.dir}/jogl-win/jogl.jar" />
-        <available file="${jogl.dist.dir}/jogl-win/32/jogl.dll" />
-        <available file="${jogl.dist.dir}/jogl-win/32/jogl_awt.dll" />
-        <available file="${jogl.dist.dir}/jogl-win/32/jogl_cg.dll" />
-        <available file="${jogl.dist.dir}/jogl-win/32/gluegen-rt.dll" />
-        <available file="${jogl.dist.dir}/jogl-win/32/gluegen-rt-natives-windows-i586.jar" />
-      </and>
-    </condition>
-    <fail unless="windows.complete">
-    ******************************************************************
-    ** Files are missing from the Windows build. This will cause    **    
-    ** the distribution to be incomplete. Please check the status   **
-    ** of the Windows build and try again.                          **
-    ******************************************************************
-        </fail>
-    </target>
-
-    <target name="dist.check.windows-amd64" if="jogl.dist.dir">
-        <condition property="windows-amd64.complete">
-      <and>
-        <available file="${jogl.dist.dir}/jogl-win/64/jogl.dll" />
-        <available file="${jogl.dist.dir}/jogl-win/64/jogl_awt.dll" />
-        <available file="${jogl.dist.dir}/jogl-win/64/jogl_cg.dll" />
-        <available file="${jogl.dist.dir}/jogl-win/64/gluegen-rt.dll" />
-        <available file="${jogl.dist.dir}/jogl-win/64/gluegen-rt-natives-windows-amd64.jar" />
-      </and>
-    </condition>
-    <fail unless="windows-amd64.complete">
-    *********************************************************************
-    ** Files are missing from the Windows/AMD64 build. This will cause **    
-    ** the distribution to be incomplete. Please check the status      **
-    ** of the Windows/AMD64 build and try again.                       **
-    *********************************************************************
-        </fail>
-    </target>
-
-    <target name="dist.check.linux" if="jogl.dist.dir">
-        <condition property="linux.complete">
-      <and>
-        <available file="${jogl.dist.dir}/jogl-linux/jogl.jar" />
-        <available file="${jogl.dist.dir}/jogl-linux/32/libjogl.so" />
-        <available file="${jogl.dist.dir}/jogl-linux/32/libjogl_awt.so" />
-        <available file="${jogl.dist.dir}/jogl-linux/32/libjogl_cg.so" />
-        <available file="${jogl.dist.dir}/jogl-linux/32/libgluegen-rt.so" />
-        <available file="${jogl.dist.dir}/jogl-linux/32/gluegen-rt-natives-linux-i586.jar" />
-        <!-- Assume we also copy over these generated files in the Linux build -->
-        <!-- in order to satisfy requests from end users that we provide these -->
-        <!-- files for easier source browsing in IDEs                          -->
-        <available file="${jogl.dist.dir}/jogl-linux/DebugGL2.java" />
-        <available file="${jogl.dist.dir}/jogl-linux/TraceGL2.java" />
-        <available file="${jogl.dist.dir}/jogl-linux/GL.java" />
-        <available file="${jogl.dist.dir}/jogl-linux/GLU.java" />
-      </and>
-    </condition>
-    <fail unless="linux.complete">
-    ******************************************************************
-    ** Files are missing from the Linux build. This will cause      **    
-    ** the distribution to be incomplete. Please check the status   **
-    ** of the Linux build and try again.                            **
-    ******************************************************************
-        </fail>
-    </target>
-
-    <target name="dist.check.linux-amd64" if="jogl.dist.dir">
-        <condition property="linux-amd64.complete">
-      <and>
-        <available file="${jogl.dist.dir}/jogl-linux/64/libjogl.so" />
-        <available file="${jogl.dist.dir}/jogl-linux/64/libjogl_awt.so" />
-        <available file="${jogl.dist.dir}/jogl-linux/64/libjogl_cg.so" />
-        <available file="${jogl.dist.dir}/jogl-linux/64/libgluegen-rt.so" />
-        <available file="${jogl.dist.dir}/jogl-linux/64/gluegen-rt-natives-linux-amd64.jar" />
-      </and>
-    </condition>
-    <fail unless="linux-amd64.complete">
-    *******************************************************************
-    ** Files are missing from the Linux/AMD64 build. This will cause **    
-    ** the distribution to be incomplete. Please check the status    **
-    ** of the Linux/AMD64 build and try again.                       **
-    *******************************************************************
-        </fail>
-    </target>
-
-    <target name="dist.check.macosx" if="jogl.dist.dir">
-        <condition property="macosx.complete">
-      <and>
-        <available file="${jogl.dist.dir}/jogl-macosx/jogl.jar" />
-        <available file="${jogl.dist.dir}/jogl-macosx/ppc/libjogl.jnilib" />
-        <available file="${jogl.dist.dir}/jogl-macosx/ppc/libjogl_awt.jnilib" />
-        <available file="${jogl.dist.dir}/jogl-macosx/ppc/libjogl_cg.jnilib" />
-        <available file="${jogl.dist.dir}/jogl-macosx/ppc/libgluegen-rt.jnilib" />
-        <available file="${jogl.dist.dir}/jogl-macosx/ppc/gluegen-rt-natives-macosx-ppc.jar" />
-      </and>
-    </condition>
-    <fail unless="macosx.complete">
-    ******************************************************************
-    ** Files are missing from the Mac OS X build. This will cause   **    
-    ** the distribution to be incomplete. Please check the status   **
-    ** of the Mac OS X build and try again.                         **
-    ******************************************************************
-        </fail>
-    </target>
-
-
-    <target name="dist.check.macosxfat" if="jogl.dist.dir">
-        <condition property="macosxfat.complete">
-      <and>
-        <available file="${jogl.dist.dir}/jogl-macosx/jogl.jar" />
-        <available file="${jogl.dist.dir}/jogl-macosx/fat/libjogl.jnilib" />
-        <available file="${jogl.dist.dir}/jogl-macosx/fat/libjogl_awt.jnilib" />
-        <available file="${jogl.dist.dir}/jogl-macosx/fat/libjogl_cg.jnilib" />
-        <available file="${jogl.dist.dir}/jogl-macosx/fat/libgluegen-rt.jnilib" />
-        <available file="${jogl.dist.dir}/jogl-macosx/fat/gluegen-rt-natives-macosx-universal.jar" />
-      </and>
-    </condition>
-    <fail unless="macosxfat.complete">
-    ******************************************************************
-    ** Files are missing from the Mac OS X build. This will cause   **    
-    ** the distribution to be incomplete. Please check the status   **
-    ** of the Mac OS X build and try again.                         **
-    ******************************************************************
-        </fail>
-    </target>
-
-
-
-    <target name="dist.check.solsparc" if="jogl.dist.dir">
-        <condition property="solsparc.complete">
-      <and>
-        <available file="${jogl.dist.dir}/jogl-solsparc/jogl.jar" />
-        <available file="${jogl.dist.dir}/jogl-solsparc/32/libjogl.so" />
-        <available file="${jogl.dist.dir}/jogl-solsparc/32/libjogl_awt.so" />
-        <available file="${jogl.dist.dir}/jogl-solsparc/32/libgluegen-rt.so" />
-        <available file="${jogl.dist.dir}/jogl-solsparc/32/gluegen-rt-natives-solaris-sparc.jar" />
-      </and>
-    </condition>
-    <fail unless="solsparc.complete">
-    ******************************************************************
-    ** Files are missing from the Solaris/SPARC build. This will    **    
-    ** cause the distribution to be incomplete. Please check the    **
-    ** status of the Solaris/SPARC build and try again.             **
-    ******************************************************************
-        </fail>
-    </target>
-
-    <target name="dist.check.solsparcv9" if="jogl.dist.dir">
-        <condition property="solsparcv9.complete">
-      <and>
-        <available file="${jogl.dist.dir}/jogl-solsparc/jogl.jar" />
-        <available file="${jogl.dist.dir}/jogl-solsparc/64/libjogl.so" />
-        <available file="${jogl.dist.dir}/jogl-solsparc/64/libjogl_awt.so" />
-        <available file="${jogl.dist.dir}/jogl-solsparc/64/libgluegen-rt.so" />
-        <available file="${jogl.dist.dir}/jogl-solsparc/64/gluegen-rt-natives-solaris-sparcv9.jar" />
-      </and>
-    </condition>
-    <fail unless="solsparcv9.complete">
-    ******************************************************************
-    ** Files are missing from the Solaris/SPARCv9 build. This will  **    
-    ** cause the distribution to be incomplete. Please check the    **
-    ** status of the Solaris/SPARCv9 build and try again.           **
-    ******************************************************************
-        </fail>
-    </target>
-
-    <target name="dist.check.solx86" if="jogl.dist.dir">
-        <condition property="solx86.complete">
-      <and>
-        <available file="${jogl.dist.dir}/jogl-solx86/jogl.jar" />
-        <available file="${jogl.dist.dir}/jogl-solx86/32/libjogl.so" />
-        <available file="${jogl.dist.dir}/jogl-solx86/32/libjogl_awt.so" />
-        <available file="${jogl.dist.dir}/jogl-solx86/32/libjogl_cg.so" />
-        <available file="${jogl.dist.dir}/jogl-solx86/32/libgluegen-rt.so" />
-        <available file="${jogl.dist.dir}/jogl-solx86/32/gluegen-rt-natives-solaris-i586.jar" />
-      </and>
-    </condition>
-    <fail unless="solx86.complete">
-    ******************************************************************
-    ** Files are missing from the Solaris/x86 build. This will      **    
-    ** cause the distribution to be incomplete. Please check the    **
-    ** status of the Solaris/x86 build and try again.               **
-    ******************************************************************
-        </fail>
-    </target>
-
-    <target name="dist.check.solamd64" if="jogl.dist.dir">
-        <condition property="solamd64.complete">
-      <and>
-        <available file="${jogl.dist.dir}/jogl-solx86/64/libjogl.so" />
-        <available file="${jogl.dist.dir}/jogl-solx86/64/libjogl_awt.so" />
-        <available file="${jogl.dist.dir}/jogl-solx86/64/libgluegen-rt.so" />
-        <available file="${jogl.dist.dir}/jogl-solx86/64/gluegen-rt-natives-solaris-amd64.jar" />
-      </and>
-    </condition>
-    <fail unless="solamd64.complete">
-    ******************************************************************
-    ** Files are missing from the Solaris/x86/64 (amd64) build. This * 
-    ** will cause the distribution                                  **
-    ** to be incomplete. Please check the                           **
-    ** status of the Solaris/x86 (amd64) build and try again.       **
-    ******************************************************************
-        </fail>
-    </target>
-
-    <!-- Helper task for dist target below -->
-    <!-- Required parameters: -->
-    <!--   zip.os.arch    = the os/arch combination for this zip file (i.e., "windows-i586") -->
-    <!--   zip.src.so.dir = the directory containing the .so's / .dll's / .jnilib's for this platform-->
-    <target name="dist.build.zip">
-        <property name="jogl.tmp.version" value="jogl-${tmp.version}-${zip.os.arch}" />
-        <!-- Create all needed directories -->
-        <delete dir="${jogl.dist.dir}/tmp" failonerror="false" />
-        <mkdir dir="${jogl.dist.dir}/tmp/${jogl.tmp.version}/lib" />
-        <!-- Copy in files -->
-        <copy todir="${jogl.dist.dir}/tmp/${jogl.tmp.version}/lib">
-            <fileset dir="${zip.src.so.dir}" includes="*${zip.so.suffix}" />
-        </copy>
-        <copy file="${jogl.dist.dir}/jogl.jar" todir="${jogl.dist.dir}/tmp/${jogl.tmp.version}/lib" />
-        <copy file="${jogl.dist.dir}/gluegen-rt.jar" todir="${jogl.dist.dir}/tmp/${jogl.tmp.version}/lib" />
-        <copy file="../CHANGELOG.txt"          todir="${jogl.dist.dir}/tmp/${jogl.tmp.version}" />
-        <copy file="../COPYRIGHT.txt"          todir="${jogl.dist.dir}/tmp/${jogl.tmp.version}" />
-        <copy file="../LICENSE.txt"            tofile="${jogl.dist.dir}/tmp/${jogl.tmp.version}/LICENSE-JOGL-${tmp.version}.txt" />
-        <copy file="README-zip-bundles.txt"
-          tofile="${jogl.dist.dir}/tmp/${jogl.tmp.version}/README.txt"
-          overwrite="true">
-          <filterset>
-              <filter token="VERSION" value="${tmp.version}"/>
-          </filterset>
-        </copy>
-        <copy file="../doc/userguide/index.html" tofile="${jogl.dist.dir}/tmp/${jogl.tmp.version}/Userguide.html" />
-        <!-- zip it up -->
-        <zip destfile="${jogl.dist.dir}/${jogl.tmp.version}.zip"
-         basedir="${jogl.dist.dir}/tmp"
-         includes="${jogl.tmp.version}/**" />
-    </target>
-
-    <target name="dist" depends="dist.dir.check,dist.check.windows,dist.check.windows-amd64,dist.check.linux,dist.check.linux-amd64,dist.check.macosx,dist.check.macosxfat,dist.check.solsparc,dist.check.solsparcv9,dist.check.solx86,dist.check.solamd64,setup-version-RI,setup-version-non-RI">
-        <delete>
-            <fileset dir="${jogl.dist.dir}" includes="*.jar" />
-        </delete>
-        <delete>
-            <fileset dir="${jogl.dist.dir}" includes="*.zip" />
-        </delete>
-        <delete dir="${jogl.dist.dir}/tmp" failonerror="false" />
-        <delete dir="${jogl.dist.dir}/META-INF" failonerror="false" />
-        <!-- Extract manifest from one of the jars to re-use it in the dist jar -->
-        <unjar src="${jogl.dist.dir}/jogl-win/jogl.jar" dest="${jogl.dist.dir}" >
-            <patternset>
-                <include name="META-INF/MANIFEST.MF" />
-            </patternset>
-        </unjar>
-        <!-- Build jar files suitable for Java Web Start -->
-        <jar manifest="${jogl.dist.dir}/META-INF/MANIFEST.MF" destfile="${jogl.dist.dir}/jogl.jar" duplicate="preserve">
-        <zipgroupfileset dir="${jogl.dist.dir}"
-                         includes="jogl-win/jogl.jar, jogl-linux/jogl.jar, jogl-macosx/jogl.jar" />
-        </jar>
-        <!-- Apply Pack200 repacking to allow later compression by that mechanism -->
-        <apply executable="pack200" verbose="true" >
-            <arg value="--repack" />
-            <fileset file="${jogl.dist.dir}/jogl.jar" />
-        </apply>
-        <jar destfile="${jogl.dist.dir}/jogl-natives-windows-i586.jar"
-             basedir="${jogl.dist.dir}/jogl-win/32"
-             includes="jogl.dll,jogl_awt.dll,jogl_cg.dll" />
-        <jar destfile="${jogl.dist.dir}/jogl-natives-windows-amd64.jar"
-             basedir="${jogl.dist.dir}/jogl-win/64"
-             includes="jogl.dll,jogl_awt.dll,jogl_cg.dll" />
-        <jar destfile="${jogl.dist.dir}/jogl-natives-linux-i586.jar"
-             basedir="${jogl.dist.dir}/jogl-linux/32"
-             includes="libjogl.so,libjogl_awt.so,libjogl_cg.so" />
-        <jar destfile="${jogl.dist.dir}/jogl-natives-linux-amd64.jar"
-             basedir="${jogl.dist.dir}/jogl-linux/64"
-             includes="libjogl.so,libjogl_awt.so,libjogl_cg.so" />
-        <jar destfile="${jogl.dist.dir}/jogl-natives-macosx-ppc.jar"
-             basedir="${jogl.dist.dir}/jogl-macosx/ppc"
-             includes="libjogl.jnilib,libjogl_awt.jnilib,libjogl_cg.jnilib" />
-        <jar destfile="${jogl.dist.dir}/jogl-natives-macosx-universal.jar"
-             basedir="${jogl.dist.dir}/jogl-macosx/fat"
-             includes="libjogl.jnilib,libjogl_awt.jnilib,libjogl_cg.jnilib" />
-        <jar destfile="${jogl.dist.dir}/jogl-natives-solaris-sparc.jar"
-             basedir="${jogl.dist.dir}/jogl-solsparc/32"
-             includes="libjogl.so,libjogl_awt.so" />
-        <jar destfile="${jogl.dist.dir}/jogl-natives-solaris-sparcv9.jar"
-             basedir="${jogl.dist.dir}/jogl-solsparc/64"
-             includes="libjogl.so,libjogl_awt.so" />
-        <jar destfile="${jogl.dist.dir}/jogl-natives-solaris-i586.jar"
-             basedir="${jogl.dist.dir}/jogl-solx86/32"
-             includes="libjogl.so,libjogl_awt.so,libjogl_cg.so" />
-        <jar destfile="${jogl.dist.dir}/jogl-natives-solaris-amd64.jar"
-             basedir="${jogl.dist.dir}/jogl-solx86/64"
-             includes="libjogl.so,libjogl_awt.so" />
-        <!-- Copy gluegen-rt.jar from Linux build (arbitrary; this jar is platform-independent) -->
-        <copy file="${jogl.dist.dir}/jogl-linux/gluegen-rt.jar" todir="${jogl.dist.dir}" />
-        <!-- Copy gluegen-rt native jars out of platform-specific subdirectories -->
-        <copy todir="${jogl.dist.dir}">
-            <fileset dir="${jogl.dist.dir}/jogl-win/32" includes="gluegen-natives-*.jar" />
-        </copy>
-        <copy todir="${jogl.dist.dir}">
-            <fileset dir="${jogl.dist.dir}/jogl-win/64" includes="gluegen-natives-*.jar" />
-        </copy>
-        <copy todir="${jogl.dist.dir}">
-            <fileset dir="${jogl.dist.dir}/jogl-linux/32" includes="gluegen-natives-*.jar" />
-        </copy>
-        <copy todir="${jogl.dist.dir}">
-            <fileset dir="${jogl.dist.dir}/jogl-linux/64" includes="gluegen-natives-*.jar" />
-        </copy>
-        <copy todir="${jogl.dist.dir}">
-            <fileset dir="${jogl.dist.dir}/jogl-macosx/ppc" includes="gluegen-natives-*.jar" />
-        </copy>
-        <copy todir="${jogl.dist.dir}">
-            <fileset dir="${jogl.dist.dir}/jogl-macosx/fat" includes="gluegen-natives-*.jar" />
-        </copy>
-        <copy todir="${jogl.dist.dir}">
-            <fileset dir="${jogl.dist.dir}/jogl-solsparc/32" includes="gluegen-natives-*.jar" />
-        </copy>
-        <copy todir="${jogl.dist.dir}">
-            <fileset dir="${jogl.dist.dir}/jogl-solsparc/64" includes="gluegen-natives-*.jar" />
-        </copy>
-        <copy todir="${jogl.dist.dir}">
-            <fileset dir="${jogl.dist.dir}/jogl-solx86/32" includes="gluegen-natives-*.jar" />
-        </copy>
-        <copy todir="${jogl.dist.dir}">
-            <fileset dir="${jogl.dist.dir}/jogl-solx86/64" includes="gluegen-natives-*.jar" />
-        </copy>
-
-    <!-- Build a source archive as well -->
-    <!-- First copy the generated files out of the Linux build results into the appropriate -->
-    <!-- directory of this source tree (so that they'll be blown away properly with an -->
-    <!-- "ant clean") -->
-    <mkdir dir="../${rootrel.build.jogl}/gensrc/classes/javax/media/opengl/glu" />
-    <copy file="${jogl.dist.dir}/jogl-linux/DebugGL2.java" todir="../${rootrel.build.jogl}/gensrc/classes/javax/media/opengl" />
-    <copy file="${jogl.dist.dir}/jogl-linux/TraceGL2.java" todir="../${rootrel.build.jogl}/gensrc/classes/javax/media/opengl" />
-    <copy file="${jogl.dist.dir}/jogl-linux/GL.java"      todir="../${rootrel.build.jogl}/gensrc/classes/javax/media/opengl" />
-    <copy file="${jogl.dist.dir}/jogl-linux/GLU.java"     todir="../${rootrel.build.jogl}/gensrc/classes/javax/media/opengl/glu" />
-    <copy file="${jogl.dist.dir}/jogl-linux/GLUquadric.java"     todir="../${rootrel.build.jogl}/gensrc/classes/javax/media/opengl/glu" />
-        <zip destfile="${jogl.dist.dir}/jogl-${tmp.version}-src.zip"
-         basedir="../.."
-         includes="gluegen/LICENSE.txt,gluegen/doc/**,gluegen/make/**,gluegen/src/**,jogl/*.txt,jogl/${rootrel.build.jogl}/gensrc/classes/javax/media/opengl/**,jogl/doc/**,jogl/make/**,jogl/src/jogl/**"
-         excludes="**/*.class,**/*~"
-         />
-        <!-- Create zip archives suitable for developers -->
-        <!-- Unfortunately, we have to replicate the os/arch name combinations from
-             gluegen-cpptasks.xml. The reason for this is that we can't generate these
-             zip archives on the platform where the builds run; we have to run the dist
-             target in order to get the platform-independent jogl.jar. -->
-        <antcall target="dist.build.zip" inheritAll="true">
-            <param name="zip.os.arch"    value="linux-i586" />
-            <param name="zip.so.suffix"  value=".so" />
-            <param name="zip.src.so.dir" value="${jogl.dist.dir}/jogl-linux/32" />
-        </antcall>
-        <antcall target="dist.build.zip" inheritAll="true">
-            <param name="zip.os.arch"    value="linux-amd64" />
-            <param name="zip.so.suffix"  value=".so" />
-            <param name="zip.src.so.dir" value="${jogl.dist.dir}/jogl-linux/64" />
-        </antcall>
-        <antcall target="dist.build.zip" inheritAll="true">
-            <param name="zip.os.arch"    value="macosx-ppc" />
-            <param name="zip.so.suffix"  value=".jnilib" />
-            <param name="zip.src.so.dir" value="${jogl.dist.dir}/jogl-macosx/ppc" />
-        </antcall>
-        <antcall target="dist.build.zip" inheritAll="true">
-            <param name="zip.os.arch"    value="macosx-universal" />
-            <param name="zip.so.suffix"  value=".jnilib" />
-            <param name="zip.src.so.dir" value="${jogl.dist.dir}/jogl-macosx/fat" />
-        </antcall>
-        <antcall target="dist.build.zip" inheritAll="true">
-            <param name="zip.os.arch"    value="solaris-i586" />
-            <param name="zip.so.suffix"  value=".so" />
-            <param name="zip.src.so.dir" value="${jogl.dist.dir}/jogl-solx86/32" />
-        </antcall>
-        <antcall target="dist.build.zip" inheritAll="true">
-            <param name="zip.os.arch"    value="solaris-amd64" />
-            <param name="zip.so.suffix"  value=".so" />
-            <param name="zip.src.so.dir" value="${jogl.dist.dir}/jogl-solx86/64" />
-        </antcall>
-        <antcall target="dist.build.zip" inheritAll="true">
-            <param name="zip.os.arch"    value="solaris-sparc" />
-            <param name="zip.so.suffix"  value=".so" />
-            <param name="zip.src.so.dir" value="${jogl.dist.dir}/jogl-solsparc/32" />
-        </antcall>
-        <antcall target="dist.build.zip" inheritAll="true">
-            <param name="zip.os.arch"    value="solaris-sparcv9" />
-            <param name="zip.so.suffix"  value=".so" />
-            <param name="zip.src.so.dir" value="${jogl.dist.dir}/jogl-solsparc/64" />
-        </antcall>
-        <antcall target="dist.build.zip" inheritAll="true">
-            <param name="zip.os.arch"    value="windows-i586" />
-            <param name="zip.so.suffix"  value=".dll" />
-            <param name="zip.src.so.dir" value="${jogl.dist.dir}/jogl-win/32" />
-        </antcall>
-        <antcall target="dist.build.zip" inheritAll="true">
-            <param name="zip.os.arch"    value="windows-amd64" />
-            <param name="zip.so.suffix"  value=".dll" />
-            <param name="zip.src.so.dir" value="${jogl.dist.dir}/jogl-win/64" />
-        </antcall>
-        <!-- Create one last zip archive by hand, this one containing all of the -->
-        <!-- Java Web Start jar files (for easier redistribution) -->
-        <zip destfile="${jogl.dist.dir}/jogl-${tmp.version}-webstart.zip"
-         basedir="${jogl.dist.dir}"
-         includes="*.jar" />
-        <!-- Create a version.txt file indicating which version we just built -->
-        <echo message="${tmp.version}" file="${jogl.dist.dir}/version.txt" />
-    </target>
-
-    <!-- ================================================================== -->
-    <!--
        - Clean up all that is built.
       -->
     <target name="clean" description="Remove all build products" depends="declare.common">
diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml
index b08b9c4f1..98a62b875 100644
--- a/make/build-nativewindow.xml
+++ b/make/build-nativewindow.xml
@@ -894,412 +894,6 @@
 
     <!-- ================================================================== -->
     <!--
-       - Build the platform-independent distribution out of jars built for
-       - Windows, Linux and Mac OS X; the Java sources for Jogl can't be
-       - fully cross-compiled at this time. To run this target, you need to
-       - specify the property nativewindow.dist.dir as a System property (i.e.,
-       - "ant -Dnativewindow.dist.dir=../dist dist"); directories named nativewindow-linux,
-       - nativewindow-win, and nativewindow-macosx need to be inside that directory and each
-       - of those directories needs to contain both the nativewindow.jar for that
-       - platform as well as the native code (libnativewindow.so, nativewindow.dll, or
-       - libnativewindow.jnilib). Also builds jars containing the native code for
-       - Windows, Linux, Mac OS X, Solaris/SPARC and Solaris/x86.
-      -->
-    <target name="dist.dir.check" unless="nativewindow.dist.dir">
-        <fail>
-  
-    ******************************************************************
-    ** To build the Jogl distribution out of the platform-specific  **
-    ** component jars and native code, the property nativewindow.dist.dir   **
-    ** needs to be specified on the command line. Please read the   **
-    ** comments associated with the "dist" target in the build.xml. **
-    ******************************************************************
-        </fail>
-    </target>
-
-    <target name="dist.check.windows" if="nativewindow.dist.dir">
-        <condition property="windows.complete">
-      <and>
-        <available file="${nativewindow.dist.dir}/nativewindow-win/nativewindow.jar" />
-        <available file="${nativewindow.dist.dir}/nativewindow-win/32/nativewindow.dll" />
-        <available file="${nativewindow.dist.dir}/nativewindow-win/32/nativewindow_awt.dll" />
-        <available file="${nativewindow.dist.dir}/nativewindow-win/32/gluegen-rt.dll" />
-        <available file="${nativewindow.dist.dir}/nativewindow-win/32/gluegen-rt-natives-windows-i586.jar" />
-      </and>
-    </condition>
-    <fail unless="windows.complete">
-    ******************************************************************
-    ** Files are missing from the Windows build. This will cause    **    
-    ** the distribution to be incomplete. Please check the status   **
-    ** of the Windows build and try again.                          **
-    ******************************************************************
-        </fail>
-    </target>
-
-    <target name="dist.check.windows-amd64" if="nativewindow.dist.dir">
-        <condition property="windows-amd64.complete">
-      <and>
-        <available file="${nativewindow.dist.dir}/nativewindow-win/64/nativewindow.dll" />
-        <available file="${nativewindow.dist.dir}/nativewindow-win/64/nativewindow_awt.dll" />
-        <available file="${nativewindow.dist.dir}/nativewindow-win/64/gluegen-rt.dll" />
-        <available file="${nativewindow.dist.dir}/nativewindow-win/64/gluegen-rt-natives-windows-amd64.jar" />
-      </and>
-    </condition>
-    <fail unless="windows-amd64.complete">
-    *********************************************************************
-    ** Files are missing from the Windows/AMD64 build. This will cause **    
-    ** the distribution to be incomplete. Please check the status      **
-    ** of the Windows/AMD64 build and try again.                       **
-    *********************************************************************
-        </fail>
-    </target>
-
-    <target name="dist.check.linux" if="nativewindow.dist.dir">
-        <condition property="linux.complete">
-      <and>
-        <available file="${nativewindow.dist.dir}/nativewindow-linux/nativewindow.jar" />
-        <available file="${nativewindow.dist.dir}/nativewindow-linux/32/libnativewindow.so" />
-        <available file="${nativewindow.dist.dir}/nativewindow-linux/32/libnativewindow_awt.so" />
-        <available file="${nativewindow.dist.dir}/nativewindow-linux/32/libgluegen-rt.so" />
-        <available file="${nativewindow.dist.dir}/nativewindow-linux/32/gluegen-rt-natives-linux-i586.jar" />
-      </and>
-    </condition>
-    <fail unless="linux.complete">
-    ******************************************************************
-    ** Files are missing from the Linux build. This will cause      **    
-    ** the distribution to be incomplete. Please check the status   **
-    ** of the Linux build and try again.                            **
-    ******************************************************************
-        </fail>
-    </target>
-
-    <target name="dist.check.linux-amd64" if="nativewindow.dist.dir">
-        <condition property="linux-amd64.complete">
-      <and>
-        <available file="${nativewindow.dist.dir}/nativewindow-linux/64/libnativewindow.so" />
-        <available file="${nativewindow.dist.dir}/nativewindow-linux/64/libnativewindow_awt.so" />
-        <available file="${nativewindow.dist.dir}/nativewindow-linux/64/libgluegen-rt.so" />
-        <available file="${nativewindow.dist.dir}/nativewindow-linux/64/gluegen-rt-natives-linux-amd64.jar" />
-      </and>
-    </condition>
-    <fail unless="linux-amd64.complete">
-    *******************************************************************
-    ** Files are missing from the Linux/AMD64 build. This will cause **    
-    ** the distribution to be incomplete. Please check the status    **
-    ** of the Linux/AMD64 build and try again.                       **
-    *******************************************************************
-        </fail>
-    </target>
-
-    <target name="dist.check.macosx" if="nativewindow.dist.dir">
-        <condition property="macosx.complete">
-      <and>
-        <available file="${nativewindow.dist.dir}/nativewindow-macosx/nativewindow.jar" />
-        <available file="${nativewindow.dist.dir}/nativewindow-macosx/ppc/libnativewindow.jnilib" />
-        <available file="${nativewindow.dist.dir}/nativewindow-macosx/ppc/libnativewindow_awt.jnilib" />
-        <available file="${nativewindow.dist.dir}/nativewindow-macosx/ppc/libgluegen-rt.jnilib" />
-        <available file="${nativewindow.dist.dir}/nativewindow-macosx/ppc/gluegen-rt-natives-macosx-ppc.jar" />
-      </and>
-    </condition>
-    <fail unless="macosx.complete">
-    ******************************************************************
-    ** Files are missing from the Mac OS X build. This will cause   **    
-    ** the distribution to be incomplete. Please check the status   **
-    ** of the Mac OS X build and try again.                         **
-    ******************************************************************
-        </fail>
-    </target>
-
-
-    <target name="dist.check.macosxfat" if="nativewindow.dist.dir">
-        <condition property="macosxfat.complete">
-      <and>
-        <available file="${nativewindow.dist.dir}/nativewindow-macosx/nativewindow.jar" />
-        <available file="${nativewindow.dist.dir}/nativewindow-macosx/fat/libnativewindow.jnilib" />
-        <available file="${nativewindow.dist.dir}/nativewindow-macosx/fat/libnativewindow_awt.jnilib" />
-        <available file="${nativewindow.dist.dir}/nativewindow-macosx/fat/libgluegen-rt.jnilib" />
-        <available file="${nativewindow.dist.dir}/nativewindow-macosx/fat/gluegen-rt-natives-macosx-universal.jar" />
-      </and>
-    </condition>
-    <fail unless="macosxfat.complete">
-    ******************************************************************
-    ** Files are missing from the Mac OS X build. This will cause   **    
-    ** the distribution to be incomplete. Please check the status   **
-    ** of the Mac OS X build and try again.                         **
-    ******************************************************************
-        </fail>
-    </target>
-
-
-
-    <target name="dist.check.solsparc" if="nativewindow.dist.dir">
-        <condition property="solsparc.complete">
-      <and>
-        <available file="${nativewindow.dist.dir}/nativewindow-solsparc/nativewindow.jar" />
-        <available file="${nativewindow.dist.dir}/nativewindow-solsparc/32/libnativewindow.so" />
-        <available file="${nativewindow.dist.dir}/nativewindow-solsparc/32/libnativewindow_awt.so" />
-        <available file="${nativewindow.dist.dir}/nativewindow-solsparc/32/libgluegen-rt.so" />
-        <available file="${nativewindow.dist.dir}/nativewindow-solsparc/32/gluegen-rt-natives-solaris-sparc.jar" />
-      </and>
-    </condition>
-    <fail unless="solsparc.complete">
-    ******************************************************************
-    ** Files are missing from the Solaris/SPARC build. This will    **    
-    ** cause the distribution to be incomplete. Please check the    **
-    ** status of the Solaris/SPARC build and try again.             **
-    ******************************************************************
-        </fail>
-    </target>
-
-    <target name="dist.check.solsparcv9" if="nativewindow.dist.dir">
-        <condition property="solsparcv9.complete">
-      <and>
-        <available file="${nativewindow.dist.dir}/nativewindow-solsparc/nativewindow.jar" />
-        <available file="${nativewindow.dist.dir}/nativewindow-solsparc/64/libnativewindow.so" />
-        <available file="${nativewindow.dist.dir}/nativewindow-solsparc/64/libnativewindow_awt.so" />
-        <available file="${nativewindow.dist.dir}/nativewindow-solsparc/64/libgluegen-rt.so" />
-        <available file="${nativewindow.dist.dir}/nativewindow-solsparc/64/gluegen-rt-natives-solaris-sparcv9.jar" />
-      </and>
-    </condition>
-    <fail unless="solsparcv9.complete">
-    ******************************************************************
-    ** Files are missing from the Solaris/SPARCv9 build. This will  **    
-    ** cause the distribution to be incomplete. Please check the    **
-    ** status of the Solaris/SPARCv9 build and try again.           **
-    ******************************************************************
-        </fail>
-    </target>
-
-    <target name="dist.check.solx86" if="nativewindow.dist.dir">
-        <condition property="solx86.complete">
-      <and>
-        <available file="${nativewindow.dist.dir}/nativewindow-solx86/nativewindow.jar" />
-        <available file="${nativewindow.dist.dir}/nativewindow-solx86/32/libnativewindow.so" />
-        <available file="${nativewindow.dist.dir}/nativewindow-solx86/32/libnativewindow_awt.so" />
-        <available file="${nativewindow.dist.dir}/nativewindow-solx86/32/libgluegen-rt.so" />
-        <available file="${nativewindow.dist.dir}/nativewindow-solx86/32/gluegen-rt-natives-solaris-i586.jar" />
-      </and>
-    </condition>
-    <fail unless="solx86.complete">
-    ******************************************************************
-    ** Files are missing from the Solaris/x86 build. This will      **    
-    ** cause the distribution to be incomplete. Please check the    **
-    ** status of the Solaris/x86 build and try again.               **
-    ******************************************************************
-        </fail>
-    </target>
-
-    <target name="dist.check.solamd64" if="nativewindow.dist.dir">
-        <condition property="solamd64.complete">
-      <and>
-        <available file="${nativewindow.dist.dir}/nativewindow-solx86/64/libnativewindow.so" />
-        <available file="${nativewindow.dist.dir}/nativewindow-solx86/64/libnativewindow_awt.so" />
-        <available file="${nativewindow.dist.dir}/nativewindow-solx86/64/libgluegen-rt.so" />
-        <available file="${nativewindow.dist.dir}/nativewindow-solx86/64/gluegen-rt-natives-solaris-amd64.jar" />
-      </and>
-    </condition>
-    <fail unless="solamd64.complete">
-    ******************************************************************
-    ** Files are missing from the Solaris/x86/64 (amd64) build. This * 
-    ** will cause the distribution                                  **
-    ** to be incomplete. Please check the                           **
-    ** status of the Solaris/x86 (amd64) build and try again.       **
-    ******************************************************************
-        </fail>
-    </target>
-
-    <!-- Helper task for dist target below -->
-    <!-- Required parameters: -->
-    <!--   zip.os.arch    = the os/arch combination for this zip file (i.e., "windows-i586") -->
-    <!--   zip.src.so.dir = the directory containing the .so's / .dll's / .jnilib's for this platform-->
-    <target name="dist.build.zip">
-        <property name="nativewindow.tmp.version" value="nativewindow-${tmp.version}-${zip.os.arch}" />
-        <!-- Create all needed directories -->
-        <delete dir="${nativewindow.dist.dir}/tmp" failonerror="false" />
-        <mkdir dir="${nativewindow.dist.dir}/tmp/${nativewindow.tmp.version}/lib" />
-        <!-- Copy in files -->
-        <copy todir="${nativewindow.dist.dir}/tmp/${nativewindow.tmp.version}/lib">
-            <fileset dir="${zip.src.so.dir}" includes="*${zip.so.suffix}" />
-        </copy>
-        <copy file="${nativewindow.dist.dir}/nativewindow.jar" todir="${nativewindow.dist.dir}/tmp/${nativewindow.tmp.version}/lib" />
-        <copy file="${nativewindow.dist.dir}/gluegen-rt.jar" todir="${nativewindow.dist.dir}/tmp/${nativewindow.tmp.version}/lib" />
-        <copy file="../CHANGELOG.txt"          todir="${nativewindow.dist.dir}/tmp/${nativewindow.tmp.version}" />
-        <copy file="../COPYRIGHT.txt"          todir="${nativewindow.dist.dir}/tmp/${nativewindow.tmp.version}" />
-        <copy file="../LICENSE.txt"            tofile="${nativewindow.dist.dir}/tmp/${nativewindow.tmp.version}/LICENSE-NATIVEWINDOW-${tmp.version}.txt" />
-        <copy file="README-zip-bundles.txt"
-          tofile="${nativewindow.dist.dir}/tmp/${nativewindow.tmp.version}/README.txt"
-          overwrite="true">
-          <filterset>
-              <filter token="VERSION" value="${tmp.version}"/>
-          </filterset>
-        </copy>
-        <copy file="../doc/userguide/index.html" tofile="${nativewindow.dist.dir}/tmp/${nativewindow.tmp.version}/Userguide.html" />
-        <!-- zip it up -->
-        <zip destfile="${nativewindow.dist.dir}/${nativewindow.tmp.version}.zip"
-         basedir="${nativewindow.dist.dir}/tmp"
-         includes="${nativewindow.tmp.version}/**" />
-    </target>
-
-    <target name="dist" depends="dist.dir.check,dist.check.windows,dist.check.windows-amd64,dist.check.linux,dist.check.linux-amd64,dist.check.macosx,dist.check.macosxfat,dist.check.solsparc,dist.check.solsparcv9,dist.check.solx86,dist.check.solamd64,setup-version-RI,setup-version-non-RI">
-        <delete>
-            <fileset dir="${nativewindow.dist.dir}" includes="*.jar" />
-        </delete>
-        <delete>
-            <fileset dir="${nativewindow.dist.dir}" includes="*.zip" />
-        </delete>
-        <delete dir="${nativewindow.dist.dir}/tmp" failonerror="false" />
-        <delete dir="${nativewindow.dist.dir}/META-INF" failonerror="false" />
-        <!-- Extract manifest from one of the jars to re-use it in the dist jar -->
-        <unjar src="${nativewindow.dist.dir}/nativewindow-win/nativewindow.jar" dest="${nativewindow.dist.dir}" >
-            <patternset>
-                <include name="META-INF/MANIFEST.MF" />
-            </patternset>
-        </unjar>
-        <!-- Build jar files suitable for Java Web Start -->
-        <jar manifest="${nativewindow.dist.dir}/META-INF/MANIFEST.MF" destfile="${nativewindow.dist.dir}/nativewindow.jar" duplicate="preserve">
-        <zipgroupfileset dir="${nativewindow.dist.dir}"
-                         includes="nativewindow-win/nativewindow.jar, nativewindow-linux/nativewindow.jar, nativewindow-macosx/nativewindow.jar" />
-        </jar>
-        <!-- Apply Pack200 repacking to allow later compression by that mechanism -->
-        <apply executable="pack200" verbose="true" >
-            <arg value="--repack" />
-            <fileset file="${nativewindow.dist.dir}/nativewindow.jar" />
-        </apply>
-        <jar destfile="${nativewindow.dist.dir}/nativewindow-natives-windows-i586.jar"
-             basedir="${nativewindow.dist.dir}/nativewindow-win/32"
-             includes="nativewindow.dll,nativewindow_awt.dll" />
-        <jar destfile="${nativewindow.dist.dir}/nativewindow-natives-windows-amd64.jar"
-             basedir="${nativewindow.dist.dir}/nativewindow-win/64"
-             includes="nativewindow.dll,nativewindow_awt.dll" />
-        <jar destfile="${nativewindow.dist.dir}/nativewindow-natives-linux-i586.jar"
-             basedir="${nativewindow.dist.dir}/nativewindow-linux/32"
-             includes="libnativewindow.so,libnativewindow_awt.so" />
-        <jar destfile="${nativewindow.dist.dir}/nativewindow-natives-linux-amd64.jar"
-             basedir="${nativewindow.dist.dir}/nativewindow-linux/64"
-             includes="libnativewindow.so,libnativewindow_awt.so" />
-        <jar destfile="${nativewindow.dist.dir}/nativewindow-natives-macosx-ppc.jar"
-             basedir="${nativewindow.dist.dir}/nativewindow-macosx/ppc"
-             includes="libnativewindow.jnilib,libnativewindow_awt.jnilib" />
-        <jar destfile="${nativewindow.dist.dir}/nativewindow-natives-macosx-universal.jar"
-             basedir="${nativewindow.dist.dir}/nativewindow-macosx/fat"
-             includes="libnativewindow.jnilib,libnativewindow_awt.jnilib" />
-        <jar destfile="${nativewindow.dist.dir}/nativewindow-natives-solaris-sparc.jar"
-             basedir="${nativewindow.dist.dir}/nativewindow-solsparc/32"
-             includes="libnativewindow.so,libnativewindow_awt.so" />
-        <jar destfile="${nativewindow.dist.dir}/nativewindow-natives-solaris-sparcv9.jar"
-             basedir="${nativewindow.dist.dir}/nativewindow-solsparc/64"
-             includes="libnativewindow.so,libnativewindow_awt.so" />
-        <jar destfile="${nativewindow.dist.dir}/nativewindow-natives-solaris-i586.jar"
-             basedir="${nativewindow.dist.dir}/nativewindow-solx86/32"
-             includes="libnativewindow.so,libnativewindow_awt.so" />
-        <jar destfile="${nativewindow.dist.dir}/nativewindow-natives-solaris-amd64.jar"
-             basedir="${nativewindow.dist.dir}/nativewindow-solx86/64"
-             includes="libnativewindow.so,libnativewindow_awt.so" />
-        <!-- Copy gluegen-rt.jar from Linux build (arbitrary; this jar is platform-independent) -->
-        <copy file="${nativewindow.dist.dir}/nativewindow-linux/gluegen-rt.jar" todir="${nativewindow.dist.dir}" />
-        <!-- Copy gluegen-rt native jars out of platform-specific subdirectories -->
-        <copy todir="${nativewindow.dist.dir}">
-            <fileset dir="${nativewindow.dist.dir}/nativewindow-win/32" includes="gluegen-natives-*.jar" />
-        </copy>
-        <copy todir="${nativewindow.dist.dir}">
-            <fileset dir="${nativewindow.dist.dir}/nativewindow-win/64" includes="gluegen-natives-*.jar" />
-        </copy>
-        <copy todir="${nativewindow.dist.dir}">
-            <fileset dir="${nativewindow.dist.dir}/nativewindow-linux/32" includes="gluegen-natives-*.jar" />
-        </copy>
-        <copy todir="${nativewindow.dist.dir}">
-            <fileset dir="${nativewindow.dist.dir}/nativewindow-linux/64" includes="gluegen-natives-*.jar" />
-        </copy>
-        <copy todir="${nativewindow.dist.dir}">
-            <fileset dir="${nativewindow.dist.dir}/nativewindow-macosx/ppc" includes="gluegen-natives-*.jar" />
-        </copy>
-        <copy todir="${nativewindow.dist.dir}">
-            <fileset dir="${nativewindow.dist.dir}/nativewindow-macosx/fat" includes="gluegen-natives-*.jar" />
-        </copy>
-        <copy todir="${nativewindow.dist.dir}">
-            <fileset dir="${nativewindow.dist.dir}/nativewindow-solsparc/32" includes="gluegen-natives-*.jar" />
-        </copy>
-        <copy todir="${nativewindow.dist.dir}">
-            <fileset dir="${nativewindow.dist.dir}/nativewindow-solsparc/64" includes="gluegen-natives-*.jar" />
-        </copy>
-        <copy todir="${nativewindow.dist.dir}">
-            <fileset dir="${nativewindow.dist.dir}/nativewindow-solx86/32" includes="gluegen-natives-*.jar" />
-        </copy>
-        <copy todir="${nativewindow.dist.dir}">
-            <fileset dir="${nativewindow.dist.dir}/nativewindow-solx86/64" includes="gluegen-natives-*.jar" />
-        </copy>
-
-        <zip destfile="${nativewindow.dist.dir}/nativewindow-${tmp.version}-src.zip"
-         basedir="../.."
-         includes="jogl/*.txt,jogl/${rootrel.build.nativewindow}/gensrc/classes/javax/media/nativewindow/**,jogl/doc/**,jogl/make/**,jogl/src/nativewindow/**"
-         excludes="**/*.class,**/*~"
-         />
-        <!-- Create zip archives suitable for developers -->
-        <!-- Unfortunately, we have to replicate the os/arch name combinations from
-             gluegen-cpptasks.xml. The reason for this is that we can't generate these
-             zip archives on the platform where the builds run; we have to run the dist
-             target in order to get the platform-independent nativewindow.jar. -->
-        <antcall target="dist.build.zip" inheritAll="true">
-            <param name="zip.os.arch"    value="linux-i586" />
-            <param name="zip.so.suffix"  value=".so" />
-            <param name="zip.src.so.dir" value="${nativewindow.dist.dir}/nativewindow-linux/32" />
-        </antcall>
-        <antcall target="dist.build.zip" inheritAll="true">
-            <param name="zip.os.arch"    value="linux-amd64" />
-            <param name="zip.so.suffix"  value=".so" />
-            <param name="zip.src.so.dir" value="${nativewindow.dist.dir}/nativewindow-linux/64" />
-        </antcall>
-        <antcall target="dist.build.zip" inheritAll="true">
-            <param name="zip.os.arch"    value="macosx-ppc" />
-            <param name="zip.so.suffix"  value=".jnilib" />
-            <param name="zip.src.so.dir" value="${nativewindow.dist.dir}/nativewindow-macosx/ppc" />
-        </antcall>
-        <antcall target="dist.build.zip" inheritAll="true">
-            <param name="zip.os.arch"    value="macosx-universal" />
-            <param name="zip.so.suffix"  value=".jnilib" />
-            <param name="zip.src.so.dir" value="${nativewindow.dist.dir}/nativewindow-macosx/fat" />
-        </antcall>
-        <antcall target="dist.build.zip" inheritAll="true">
-            <param name="zip.os.arch"    value="solaris-i586" />
-            <param name="zip.so.suffix"  value=".so" />
-            <param name="zip.src.so.dir" value="${nativewindow.dist.dir}/nativewindow-solx86/32" />
-        </antcall>
-        <antcall target="dist.build.zip" inheritAll="true">
-            <param name="zip.os.arch"    value="solaris-amd64" />
-            <param name="zip.so.suffix"  value=".so" />
-            <param name="zip.src.so.dir" value="${nativewindow.dist.dir}/nativewindow-solx86/64" />
-        </antcall>
-        <antcall target="dist.build.zip" inheritAll="true">
-            <param name="zip.os.arch"    value="solaris-sparc" />
-            <param name="zip.so.suffix"  value=".so" />
-            <param name="zip.src.so.dir" value="${nativewindow.dist.dir}/nativewindow-solsparc/32" />
-        </antcall>
-        <antcall target="dist.build.zip" inheritAll="true">
-            <param name="zip.os.arch"    value="solaris-sparcv9" />
-            <param name="zip.so.suffix"  value=".so" />
-            <param name="zip.src.so.dir" value="${nativewindow.dist.dir}/nativewindow-solsparc/64" />
-        </antcall>
-        <antcall target="dist.build.zip" inheritAll="true">
-            <param name="zip.os.arch"    value="windows-i586" />
-            <param name="zip.so.suffix"  value=".dll" />
-            <param name="zip.src.so.dir" value="${nativewindow.dist.dir}/nativewindow-win/32" />
-        </antcall>
-        <antcall target="dist.build.zip" inheritAll="true">
-            <param name="zip.os.arch"    value="windows-amd64" />
-            <param name="zip.so.suffix"  value=".dll" />
-            <param name="zip.src.so.dir" value="${nativewindow.dist.dir}/nativewindow-win/64" />
-        </antcall>
-        <!-- Create one last zip archive by hand, this one containing all of the -->
-        <!-- Java Web Start jar files (for easier redistribution) -->
-        <zip destfile="${nativewindow.dist.dir}/nativewindow-${tmp.version}-webstart.zip"
-         basedir="${nativewindow.dist.dir}"
-         includes="*.jar" />
-        <!-- Create a version.txt file indicating which version we just built -->
-        <echo message="${tmp.version}" file="${nativewindow.dist.dir}/version.txt" />
-    </target>
-
-    <!-- ================================================================== -->
-    <!--
        - Clean up all that is built.
       -->
     <target name="clean" description="Remove all build products" depends="declare.common">
diff --git a/make/build-newt.xml b/make/build-newt.xml
index 33eb57ac8..da314090e 100644
--- a/make/build-newt.xml
+++ b/make/build-newt.xml
@@ -641,348 +641,6 @@
 
     <!-- ================================================================== -->
     <!--
-       - Build the platform-independent distribution out of jars built for
-       - Windows, Linux and Mac OS X; the Java sources for Jogl can't be
-       - fully cross-compiled at this time. To run this target, you need to
-       - specify the property newt.dist.dir as a System property (i.e.,
-       - "ant -Dnewt.dist.dir=../dist dist"); directories named newt-linux,
-       - newt-win, and newt-macosx need to be inside that directory and each
-       - of those directories needs to contain both the newt.jar for that
-       - platform as well as the native code (libnewt.so, newt.dll, or
-       - libnewt.jnilib). Also builds jars containing the native code for
-       - Windows, Linux, Mac OS X, Solaris/SPARC and Solaris/x86.
-      -->
-    <target name="dist.dir.check" unless="newt.dist.dir">
-        <fail>
-  
-    ******************************************************************
-    ** To build the Jogl distribution out of the platform-specific  **
-    ** component jars and native code, the property newt.dist.dir   **
-    ** needs to be specified on the command line. Please read the   **
-    ** comments associated with the "dist" target in the build.xml. **
-    ******************************************************************
-        </fail>
-    </target>
-
-    <target name="dist.check.windows" if="newt.dist.dir">
-        <condition property="windows.complete">
-      <and>
-        <available file="${newt.dist.dir}/newt-win/newt.jar" />
-        <available file="${newt.dist.dir}/newt-win/32/newt.dll" />
-      </and>
-    </condition>
-    <fail unless="windows.complete">
-    ******************************************************************
-    ** Files are missing from the Windows build. This will cause    **    
-    ** the distribution to be incomplete. Please check the status   **
-    ** of the Windows build and try again.                          **
-    ******************************************************************
-        </fail>
-    </target>
-
-    <target name="dist.check.windows-amd64" if="newt.dist.dir">
-        <condition property="windows-amd64.complete">
-      <and>
-        <available file="${newt.dist.dir}/newt-win/64/newt.dll" />
-      </and>
-    </condition>
-    <fail unless="windows-amd64.complete">
-    *********************************************************************
-    ** Files are missing from the Windows/AMD64 build. This will cause **    
-    ** the distribution to be incomplete. Please check the status      **
-    ** of the Windows/AMD64 build and try again.                       **
-    *********************************************************************
-        </fail>
-    </target>
-
-    <target name="dist.check.linux" if="newt.dist.dir">
-        <condition property="linux.complete">
-      <and>
-        <available file="${newt.dist.dir}/newt-linux/newt.jar" />
-        <available file="${newt.dist.dir}/newt-linux/32/libnewt.so" />
-      </and>
-    </condition>
-    <fail unless="linux.complete">
-    ******************************************************************
-    ** Files are missing from the Linux build. This will cause      **    
-    ** the distribution to be incomplete. Please check the status   **
-    ** of the Linux build and try again.                            **
-    ******************************************************************
-        </fail>
-    </target>
-
-    <target name="dist.check.linux-amd64" if="newt.dist.dir">
-        <condition property="linux-amd64.complete">
-      <and>
-        <available file="${newt.dist.dir}/newt-linux/64/libnewt.so" />
-      </and>
-    </condition>
-    <fail unless="linux-amd64.complete">
-    *******************************************************************
-    ** Files are missing from the Linux/AMD64 build. This will cause **    
-    ** the distribution to be incomplete. Please check the status    **
-    ** of the Linux/AMD64 build and try again.                       **
-    *******************************************************************
-        </fail>
-    </target>
-
-    <target name="dist.check.macosx" if="newt.dist.dir">
-        <condition property="macosx.complete">
-      <and>
-        <available file="${newt.dist.dir}/newt-macosx/newt.jar" />
-        <available file="${newt.dist.dir}/newt-macosx/ppc/libnewt.jnilib" />
-      </and>
-    </condition>
-    <fail unless="macosx.complete">
-    ******************************************************************
-    ** Files are missing from the Mac OS X build. This will cause   **    
-    ** the distribution to be incomplete. Please check the status   **
-    ** of the Mac OS X build and try again.                         **
-    ******************************************************************
-        </fail>
-    </target>
-
-
-    <target name="dist.check.macosxfat" if="newt.dist.dir">
-        <condition property="macosxfat.complete">
-      <and>
-        <available file="${newt.dist.dir}/newt-macosx/newt.jar" />
-        <available file="${newt.dist.dir}/newt-macosx/fat/libnewt.jnilib" />
-      </and>
-    </condition>
-    <fail unless="macosxfat.complete">
-    ******************************************************************
-    ** Files are missing from the Mac OS X build. This will cause   **    
-    ** the distribution to be incomplete. Please check the status   **
-    ** of the Mac OS X build and try again.                         **
-    ******************************************************************
-        </fail>
-    </target>
-
-
-
-    <target name="dist.check.solsparc" if="newt.dist.dir">
-        <condition property="solsparc.complete">
-      <and>
-        <available file="${newt.dist.dir}/newt-solsparc/newt.jar" />
-        <available file="${newt.dist.dir}/newt-solsparc/32/libnewt.so" />
-      </and>
-    </condition>
-    <fail unless="solsparc.complete">
-    ******************************************************************
-    ** Files are missing from the Solaris/SPARC build. This will    **    
-    ** cause the distribution to be incomplete. Please check the    **
-    ** status of the Solaris/SPARC build and try again.             **
-    ******************************************************************
-        </fail>
-    </target>
-
-    <target name="dist.check.solsparcv9" if="newt.dist.dir">
-        <condition property="solsparcv9.complete">
-      <and>
-        <available file="${newt.dist.dir}/newt-solsparc/newt.jar" />
-        <available file="${newt.dist.dir}/newt-solsparc/64/libnewt.so" />
-      </and>
-    </condition>
-    <fail unless="solsparcv9.complete">
-    ******************************************************************
-    ** Files are missing from the Solaris/SPARCv9 build. This will  **    
-    ** cause the distribution to be incomplete. Please check the    **
-    ** status of the Solaris/SPARCv9 build and try again.           **
-    ******************************************************************
-        </fail>
-    </target>
-
-    <target name="dist.check.solx86" if="newt.dist.dir">
-        <condition property="solx86.complete">
-      <and>
-        <available file="${newt.dist.dir}/newt-solx86/newt.jar" />
-        <available file="${newt.dist.dir}/newt-solx86/32/libnewt.so" />
-      </and>
-    </condition>
-    <fail unless="solx86.complete">
-    ******************************************************************
-    ** Files are missing from the Solaris/x86 build. This will      **    
-    ** cause the distribution to be incomplete. Please check the    **
-    ** status of the Solaris/x86 build and try again.               **
-    ******************************************************************
-        </fail>
-    </target>
-
-    <target name="dist.check.solamd64" if="newt.dist.dir">
-        <condition property="solamd64.complete">
-      <and>
-        <available file="${newt.dist.dir}/newt-solx86/64/libnewt.so" />
-      </and>
-    </condition>
-    <fail unless="solamd64.complete">
-    ******************************************************************
-    ** Files are missing from the Solaris/x86/64 (amd64) build. This * 
-    ** will cause the distribution                                  **
-    ** to be incomplete. Please check the                           **
-    ** status of the Solaris/x86 (amd64) build and try again.       **
-    ******************************************************************
-        </fail>
-    </target>
-
-    <!-- Helper task for dist target below -->
-    <!-- Required parameters: -->
-    <!--   zip.os.arch    = the os/arch combination for this zip file (i.e., "windows-i586") -->
-    <!--   zip.src.so.dir = the directory containing the .so's / .dll's / .jnilib's for this platform-->
-    <target name="dist.build.zip">
-        <property name="newt.tmp.version" value="newt-${tmp.version}-${zip.os.arch}" />
-        <!-- Create all needed directories -->
-        <delete dir="${newt.dist.dir}/tmp" failonerror="false" />
-        <mkdir dir="${newt.dist.dir}/tmp/${newt.tmp.version}/lib" />
-        <!-- Copy in files -->
-        <copy todir="${newt.dist.dir}/tmp/${newt.tmp.version}/lib">
-            <fileset dir="${zip.src.so.dir}" includes="*${zip.so.suffix}" />
-        </copy>
-        <copy file="${newt.dist.dir}/newt.jar" todir="${newt.dist.dir}/tmp/${newt.tmp.version}/lib" />
-        <copy file="../CHANGELOG.txt"          todir="${newt.dist.dir}/tmp/${newt.tmp.version}" />
-        <copy file="../COPYRIGHT.txt"          todir="${newt.dist.dir}/tmp/${newt.tmp.version}" />
-        <copy file="../LICENSE.txt"            tofile="${newt.dist.dir}/tmp/${newt.tmp.version}/LICENSE-NEWT-${tmp.version}.txt" />
-        <copy file="README-zip-bundles.txt"
-          tofile="${newt.dist.dir}/tmp/${newt.tmp.version}/README.txt"
-          overwrite="true">
-          <filterset>
-              <filter token="VERSION" value="${tmp.version}"/>
-          </filterset>
-        </copy>
-        <copy file="../doc/userguide/index.html" tofile="${newt.dist.dir}/tmp/${newt.tmp.version}/Userguide.html" />
-        <!-- zip it up -->
-        <zip destfile="${newt.dist.dir}/${newt.tmp.version}.zip"
-         basedir="${newt.dist.dir}/tmp"
-         includes="${newt.tmp.version}/**" />
-    </target>
-
-    <target name="dist" depends="dist.dir.check,dist.check.windows,dist.check.windows-amd64,dist.check.linux,dist.check.linux-amd64,dist.check.macosx,dist.check.macosxfat,dist.check.solsparc,dist.check.solsparcv9,dist.check.solx86,dist.check.solamd64,setup-version-RI,setup-version-non-RI">
-        <delete>
-            <fileset dir="${newt.dist.dir}" includes="*.jar" />
-        </delete>
-        <delete>
-            <fileset dir="${newt.dist.dir}" includes="*.zip" />
-        </delete>
-        <delete dir="${newt.dist.dir}/tmp" failonerror="false" />
-        <delete dir="${newt.dist.dir}/META-INF" failonerror="false" />
-        <!-- Extract manifest from one of the jars to re-use it in the dist jar -->
-        <unjar src="${newt.dist.dir}/newt-win/newt.jar" dest="${newt.dist.dir}" >
-            <patternset>
-                <include name="META-INF/MANIFEST.MF" />
-            </patternset>
-        </unjar>
-        <!-- Build jar files suitable for Java Web Start -->
-        <jar manifest="${newt.dist.dir}/META-INF/MANIFEST.MF" destfile="${newt.dist.dir}/newt.jar" duplicate="preserve">
-        <zipgroupfileset dir="${newt.dist.dir}"
-                         includes="newt-win/newt.jar, newt-linux/newt.jar, newt-macosx/newt.jar" />
-        </jar>
-        <!-- Apply Pack200 repacking to allow later compression by that mechanism -->
-        <apply executable="pack200" verbose="true" >
-            <arg value="--repack" />
-            <fileset file="${newt.dist.dir}/newt.jar" />
-        </apply>
-        <jar destfile="${newt.dist.dir}/newt-natives-windows-i586.jar"
-             basedir="${newt.dist.dir}/newt-win/32"
-             includes="newt.dll" />
-        <jar destfile="${newt.dist.dir}/newt-natives-windows-amd64.jar"
-             basedir="${newt.dist.dir}/newt-win/64"
-             includes="newt.dll" />
-        <jar destfile="${newt.dist.dir}/newt-natives-linux-i586.jar"
-             basedir="${newt.dist.dir}/newt-linux/32"
-             includes="libnewt.so" />
-        <jar destfile="${newt.dist.dir}/newt-natives-linux-amd64.jar"
-             basedir="${newt.dist.dir}/newt-linux/64"
-             includes="libnewt.so" />
-        <jar destfile="${newt.dist.dir}/newt-natives-macosx-ppc.jar"
-             basedir="${newt.dist.dir}/newt-macosx/ppc"
-             includes="libnewt.jnilib" />
-        <jar destfile="${newt.dist.dir}/newt-natives-macosx-universal.jar"
-             basedir="${newt.dist.dir}/newt-macosx/fat"
-             includes="libnewt.jnilib" />
-        <jar destfile="${newt.dist.dir}/newt-natives-solaris-sparc.jar"
-             basedir="${newt.dist.dir}/newt-solsparc/32"
-             includes="libnewt.so" />
-        <jar destfile="${newt.dist.dir}/newt-natives-solaris-sparcv9.jar"
-             basedir="${newt.dist.dir}/newt-solsparc/64"
-             includes="libnewt.so" />
-        <jar destfile="${newt.dist.dir}/newt-natives-solaris-i586.jar"
-             basedir="${newt.dist.dir}/newt-solx86/32"
-             includes="libnewt.so" />
-        <jar destfile="${newt.dist.dir}/newt-natives-solaris-amd64.jar"
-             basedir="${newt.dist.dir}/newt-solx86/64"
-             includes="libnewt.so" />
-
-        <zip destfile="${newt.dist.dir}/newt-${tmp.version}-src.zip"
-         basedir="../.."
-         includes="jogl/*.txt,jogl/doc/**,jogl/make/**,jogl/src/newt/**"
-         excludes="**/*.class,**/*~"
-         />
-        <!-- Create zip archives suitable for developers -->
-        <!-- Unfortunately, we have to replicate the os/arch name combinations from
-             gluegen-cpptasks.xml. The reason for this is that we can't generate these
-             zip archives on the platform where the builds run; we have to run the dist
-             target in order to get the platform-independent newt.jar. -->
-        <antcall target="dist.build.zip" inheritAll="true">
-            <param name="zip.os.arch"    value="linux-i586" />
-            <param name="zip.so.suffix"  value=".so" />
-            <param name="zip.src.so.dir" value="${newt.dist.dir}/newt-linux/32" />
-        </antcall>
-        <antcall target="dist.build.zip" inheritAll="true">
-            <param name="zip.os.arch"    value="linux-amd64" />
-            <param name="zip.so.suffix"  value=".so" />
-            <param name="zip.src.so.dir" value="${newt.dist.dir}/newt-linux/64" />
-        </antcall>
-        <antcall target="dist.build.zip" inheritAll="true">
-            <param name="zip.os.arch"    value="macosx-ppc" />
-            <param name="zip.so.suffix"  value=".jnilib" />
-            <param name="zip.src.so.dir" value="${newt.dist.dir}/newt-macosx/ppc" />
-        </antcall>
-        <antcall target="dist.build.zip" inheritAll="true">
-            <param name="zip.os.arch"    value="macosx-universal" />
-            <param name="zip.so.suffix"  value=".jnilib" />
-            <param name="zip.src.so.dir" value="${newt.dist.dir}/newt-macosx/fat" />
-        </antcall>
-        <antcall target="dist.build.zip" inheritAll="true">
-            <param name="zip.os.arch"    value="solaris-i586" />
-            <param name="zip.so.suffix"  value=".so" />
-            <param name="zip.src.so.dir" value="${newt.dist.dir}/newt-solx86/32" />
-        </antcall>
-        <antcall target="dist.build.zip" inheritAll="true">
-            <param name="zip.os.arch"    value="solaris-amd64" />
-            <param name="zip.so.suffix"  value=".so" />
-            <param name="zip.src.so.dir" value="${newt.dist.dir}/newt-solx86/64" />
-        </antcall>
-        <antcall target="dist.build.zip" inheritAll="true">
-            <param name="zip.os.arch"    value="solaris-sparc" />
-            <param name="zip.so.suffix"  value=".so" />
-            <param name="zip.src.so.dir" value="${newt.dist.dir}/newt-solsparc/32" />
-        </antcall>
-        <antcall target="dist.build.zip" inheritAll="true">
-            <param name="zip.os.arch"    value="solaris-sparcv9" />
-            <param name="zip.so.suffix"  value=".so" />
-            <param name="zip.src.so.dir" value="${newt.dist.dir}/newt-solsparc/64" />
-        </antcall>
-        <antcall target="dist.build.zip" inheritAll="true">
-            <param name="zip.os.arch"    value="windows-i586" />
-            <param name="zip.so.suffix"  value=".dll" />
-            <param name="zip.src.so.dir" value="${newt.dist.dir}/newt-win/32" />
-        </antcall>
-        <antcall target="dist.build.zip" inheritAll="true">
-            <param name="zip.os.arch"    value="windows-amd64" />
-            <param name="zip.so.suffix"  value=".dll" />
-            <param name="zip.src.so.dir" value="${newt.dist.dir}/newt-win/64" />
-        </antcall>
-        <!-- Create one last zip archive by hand, this one containing all of the -->
-        <!-- Java Web Start jar files (for easier redistribution) -->
-        <zip destfile="${newt.dist.dir}/newt-${tmp.version}-webstart.zip"
-         basedir="${newt.dist.dir}"
-         includes="*.jar" />
-        <!-- Create a version.txt file indicating which version we just built -->
-        <echo message="${tmp.version}" file="${newt.dist.dir}/version.txt" />
-    </target>
-
-    <!-- ================================================================== -->
-    <!--
        - Clean up all that is built.
       -->
     <target name="clean" description="Remove all build products" depends="declare.common">