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

1 files changed, 115 insertions, 249 deletions

diff --git a/make/build-newt.xml b/make/build-newt.xml
index ad04973e4..db357bf37 100644
--- a/make/build-newt.xml
+++ b/make/build-newt.xml
@@ -27,14 +27,14 @@
    -                       Java and C file generators. Note that it is only supported
    -                       to create the Javadoc for the platform on which you are
    -                       currently running.
-   - 
+   -
    - Note: on Windows the "win32.c.compiler" property in newt.properties
    - is required to select the appropriate C compiler. See the example
    - newt.properties in this directory for valid values. On Mac OS X
    - universal binaries may also be built by setting the "macosxfat"
    - property in newt.properties; again see the example file in this
    - directory.
-   -   
+   -
    - Thanks to Rob Grzywinski and Artur Biesiadowski for the bulk of the
    - ANT build, including the GlueGen and StaticGLInfo tasks, the building of
    - the Java generated sources, the first and second phase Java compiles, and
@@ -56,31 +56,13 @@
    -->
 <project name="NEWT" basedir="." default="all">
 
-  <import file="versions.xml" />
-
-  <!-- Pull in GlueGen cpptasks build file -->
-  <property name="gluegen.root" value="../../gluegen" />
-  <import file="${gluegen.root}/make/gluegen-cpptasks.xml" />
+    <import file="build-common.xml"/>
 
     <!-- ================================================================== -->
-    <!-- 
+    <!--
        - Base initialization and detection of operating system.
       -->
-    <target name="base.init" depends="gluegen.cpptasks.detect.os">
-
-        <property name="javac.bootclasspath-cdc.jar" value="../../gluegen/make/lib/cdc_fp.jar"/>
-
-        <condition property="setup.nodesktop">
-            <and>
-                <isfalse value="${isWindows}" />
-                <isfalse value="${isOSX}" />
-                <isfalse value="${isX11}" />
-            </and>
-        </condition>
-
-        <condition property="setup.noall">
-            <isset property="setup.noAWT"/> 
-        </condition>
+    <target name="base.init" depends="common.init">
 
         <condition property="setup.nonatives">
             <and>
@@ -93,184 +75,82 @@
             </and>
         </condition>
 
-        <echo message="setup.nonatives: ${setup.nonatives}" />
-        <echo message="setup.nodesktop: ${setup.nodesktop}" />
-        <echo message="setup.noall: ${setup.noall}" />
-        <echo message="setup.noCDC: ${setup.noCDC}" />
-        <echo message="setup.noAWT: ${setup.noAWT}" />
         <echo message="setup.noOpenGL: ${setup.noOpenGL}" />
-        <echo message="javac.bootclasspath-cdc.jar: ${javac.bootclasspath-cdc.jar}" />
+        <echo message="isWindows: ${isWindows}" />
+        <echo message="isOSX: ${isOSX}" />
         <echo message="isX11: ${isX11}" />
         <echo message="useKD: ${useKD}" />
         <echo message="useIntelGDL: ${useIntelGDL}" />
         <echo message="useBroadcomEGL: ${useBroadcomEGL}" />
+        <echo message="setup.nonatives: ${setup.nonatives}" />
 
         <!-- partitioning -->
 
         <property name="java.part.core"
-                  value="com/sun/javafx/newt/*, com/sun/javafx/newt/util/*, com/sun/javafx/newt/impl/*, com/sun/javafx/newt/intel/gdl/*"/>
+                  value="com/jogamp/newt/*, com/jogamp/newt/util/*, com/jogamp/newt/impl/*, com/jogamp/newt/intel/gdl/*"/>
 
         <property name="java.part.x11"
-                  value="com/sun/javafx/newt/x11/*"/>
+                  value="com/jogamp/newt/x11/*"/>
 
         <property name="java.part.windows"
-                  value="com/sun/javafx/newt/windows/*"/>
+                  value="com/jogamp/newt/windows/*"/>
 
         <property name="java.part.macosx"
-                  value="com/sun/javafx/newt/macosx/*"/>
+                  value="com/jogamp/newt/macosx/*"/>
 
         <property name="java.part.opengl"
-                  value="com/sun/javafx/newt/opengl/*, com/sun/javafx/newt/opengl/kd/*"/>
+                  value="com/jogamp/newt/opengl/*, com/jogamp/newt/opengl/kd/*"/>
 
         <property name="java.part.broadcomegl"
-                  value="com/sun/javafx/newt/opengl/broadcom/egl/*"/>
+                  value="com/jogamp/newt/opengl/broadcom/egl/*"/>
 
         <property name="java.part.awt"
-                  value="com/sun/javafx/newt/awt/*"/>
+                  value="com/jogamp/newt/awt/*"/>
 
         <!-- condition excludes -->
 
         <condition property="java.excludes.awt"
                    value="${java.part.awt}">
-           <isset property="setup.noAWT"/> 
+           <isset property="setup.noAWT"/>
         </condition>
 
         <condition property="java.excludes.opengl"
                    value="${java.part.opengl} ${java.part.broadcomegl}">
-           <isset property="setup.noOpenGL"/> 
+           <isset property="setup.noOpenGL"/>
         </condition>
 
         <property name="java.excludes.cdcfp" value="${java.part.awt}"/>
 
         <condition property="java.excludes.desktop"
                    value="${java.part.x11} ${java.part.windows}, ${java.part.macosx}, ${java.part.awt}">
-           <isset property="setup.nodesktop"/> 
+           <isset property="setup.nodesktop"/>
         </condition>
 
         <property name="java.excludes.all" value="${java.excludes.awt}, ${java.excludes.opengl} ${java.excludes.desktop}" />
         <echo message="java.excludes.all: ${java.excludes.all}" />
 
-
-        <!-- Set the project root directory to be up one directory. -->
-        <property name="project.root" value=".." />
-    
-        <!-- Set the configuration and build files to this directory. -->
-        <property name="make" value="." />
-    </target>
-
-    <target name="base.init.sourcelevel.1">
-        <property name="newt.sourcelevel" value="1.4" />
     </target>
 
-    <!--target name="base.init.sourcelevel.2" if="gluegen.nsig">
-        <property name="newt.sourcelevel" value="1.5" />
-    </target-->
-
     <!-- ================================================================== -->
-    <!-- 
-       - Load user properties which override build defaults.
-      -->
-    <target name="load.user.properties" depends="base.init,base.init.sourcelevel.1" unless="user.properties.file">
-        <!-- Load the user specified properties file that defines various host
-           - specific paths.  The user will be notified if this is does not
-           - exist. -->
-        <property name="user.properties.file" value="${user.home}/newt.properties" />
-        <property file="${user.properties.file}" />
-        <echo message="Loaded ${user.properties.file}." />
-        <property file="${user.home}/gluegen.properties" />
-        <echo message="Loaded ${user.home}/gluegen.properties." />
-    </target>
-
-    <!-- ================================================================== -->
-    <!-- 
+    <!--
        - Declare all paths and user defined variables.
       -->
-    <target name="declare.common" description="Declare properties" depends="load.user.properties">
-        <!-- The location and name of the configuration ANT file that will 
-           - validate to ensure that all user-define variables are set. -->
-        <property name="validate.user.properties" value="${make}/validate-properties.xml" />
-           
-        <!-- NOTE: the value of the debug and optimise attributes will not be overridden if already set externally -->
-        <property name="javacdebug"       value="true" /> 
-        <property name="javacdebuglevel"  value="source,lines" /> 
-
-        <!-- Names of directories relative to the project root.
-             Some of these are used in FileMappers later for dependence information
-             and need exact string matching, which is why they use file.separator
-             instead of "/". -->
-        <condition property="rootrel.build" value="build">
-          <not>
-              <isset property="rootrel.build"/>
-          </not>
-        </condition>
-        <property name="rootrel.build.newt" value="${rootrel.build}/newt" />
+    <target name="declare.common" description="Declare properties" depends="base.init">
         <property name="rootrel.src" value="src/newt" />
         <property name="rootrel.src.java" value="${rootrel.src}/classes" />
         <property name="rootrel.src.c" value="${rootrel.src}/native" />
-        <property name="rootrel.obj" value="${rootrel.build.newt}/obj" />
-
-        <property name="gluegen-rt.jar" value="../../gluegen/${rootrel.build}/gluegen-rt.jar" />
-        <property name="nativewindow.core.jar" value="../${rootrel.build}/nativewindow/nativewindow.core.jar" />
-        <property name="nativewindow.x11.jar" value="../${rootrel.build}/nativewindow/nativewindow.x11.jar" />
-        <property name="nativewindow.awt.jar" value="../${rootrel.build}/nativewindow/nativewindow.awt.jar" />
-        <property name="jogl.core.jar" value="../${rootrel.build}/jogl/jogl.core.jar" />
-        <property name="jogl.egl.jar" value="../${rootrel.build}/jogl/jogl.egl.jar" />
-
-        <property name="gluegen-rt-cdc.jar" value="../../gluegen/${rootrel.build}/gluegen-rt-cdc.jar" />
-        <property name="nativewindow.core.cdc.jar" value="../${rootrel.build}/nativewindow/nativewindow.core.cdc.jar" />
-        <property name="nativewindow.x11.cdc.jar" value="../${rootrel.build}/nativewindow/nativewindow.x11.cdc.jar" />
-        <property name="jogl.core.cdc.jar" value="../${rootrel.build}/jogl/jogl.core.cdc.jar" />
-        <property name="jogl.egl.cdc.jar" value="../${rootrel.build}/jogl/jogl.egl.cdc.jar" />
 
         <!-- 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="build"    value="${project.root}/${rootrel.build.newt}" />
-        
+
         <!-- The generated source directories. -->
-        <property name="src.generated" value="${build}/gensrc" />
+        <property name="src.generated" value="${build.newt}/gensrc" />
         <property name="src.generated.c" value="${src.generated}/native/newt" />
 
         <!-- The compiler output directories. -->
-        <property name="classes" value="${build}/classes" />
-        <property name="classes-cdc" value="${build}/classes-cdc" />
-        <property name="obj"      value="${project.root}/${rootrel.obj}" />
-
-        <path id="nativewindow_gluegen_jogl.classpath">
-            <pathelement location="${gluegen-rt.jar}" />
-            <pathelement location="${nativewindow.core.jar}" />
-            <pathelement location="${nativewindow.x11.jar}" />
-            <pathelement location="${nativewindow.awt.jar}" />
-            <pathelement location="${jogl.core.jar}" />
-            <pathelement location="${jogl.egl.jar}" />
-        </path>
-
-        <path id="nativewindow_gluegen_jogl.classpath-cdc">
-            <pathelement location="${gluegen-rt-cdc.jar}" />
-            <pathelement location="${nativewindow.core.cdc.jar}" />
-            <pathelement location="${nativewindow.x11.cdc.jar}" />
-            <pathelement location="${jogl.core.cdc.jar}" />
-            <pathelement location="${jogl.egl.cdc.jar}" />
-        </path>
-
-        <!-- The resulting newt.jar. -->
-        <property name="newt.core.jar" value="${build}/newt.core.jar" />
-        <property name="newt.x11.jar"  value="${build}/newt.x11.jar" />
-        <property name="newt.win.jar"  value="${build}/newt.win.jar" />
-        <property name="newt.osx.jar"  value="${build}/newt.osx.jar" />
-        <property name="newt.ogl.jar"  value="${build}/newt.ogl.jar" />
-        <property name="newt.broadcomegl.jar"  value="${build}/newt.broadcomegl.jar" />
-        <property name="newt.awt.jar"  value="${build}/newt.awt.jar" />
-        <property name="newt.all.jar"  value="${build}/newt.all.jar" />
-        <property name="newt.all-noawt.jar"  value="${build}/newt.all-noawt.jar" />
-
-        <property name="newt.core.cdc.jar" value="${build}/newt.core.cdc.jar" />
-        <property name="newt.x11.cdc.jar"  value="${build}/newt.x11.cdc.jar" />
-        <property name="newt.win.cdc.jar"  value="${build}/newt.win.cdc.jar" />
-        <property name="newt.osx.cdc.jar"  value="${build}/newt.osx.cdc.jar" />
-        <property name="newt.ogl.cdc.jar"  value="${build}/newt.ogl.cdc.jar" />
-        <property name="newt.broadcomegl.cdc.jar"  value="${build}/newt.broadcomegl.cdc.jar" />
-        <property name="newt.all.cdc.jar" value="${build}/newt.all.cdc.jar" />
+        <property name="classes" value="${build.newt}/classes" />
+        <property name="classes-cdc" value="${build.newt}/classes-cdc" />
 
         <!-- The javadoc dirs. -->
         <property name="javadoc" value="${project.root}/javadoc_newt_public" />
@@ -279,23 +159,20 @@
         <property name="javadoc.link" value="http://java.sun.com/j2se/1.4.2/docs/api/" />
         <property name="javadoc.windowtitle" value="NEWT API -- ${newt_base_version} Specification" />
         <property name="javadoc.overview" value="spec-overview.html" />
-        <property name="javadoc.spec.packagenames" value="com.sun.javafx.newt, com.sun.javafx.newt.opengl" />
+        <property name="javadoc.spec.packagenames" value="com.jogamp.newt, com.jogamp.newt.opengl" />
 
         <property name="javadoc.packagenames" value="${javadoc.spec.packagenames}" />
 
-        <property name="javadoc.dev.packagenames" value="${javadoc.packagenames},com.sun.javafx.newt.*" />
+        <property name="javadoc.dev.packagenames" value="${javadoc.packagenames},com.jogamp.newt.*" />
     <property name="javadoc.bottom" value="Copyright 2005 Sun Microsystems, Inc. All rights reserved. Use is subject to &lt;a href=&quot;http://jcp.org/en/jsr/detail?id=231&quot;&gt;license terms&lt;/a&gt;." />
     </target>
-    
+
     <!-- ================================================================== -->
-    <!-- 
+    <!--
        - Initialize all parameters required for the build and create any
        - required directories.
       -->
     <target name="init" depends="declare.common">
-        <!-- Call the external config validator script to make sure the config is ok and consistent -->
-        <ant antfile="${validate.user.properties}" inheritall="true"/>
-        
         <mkdir dir="${src.generated.c}" />
         <mkdir dir="${src.generated.c}/X11" />
         <mkdir dir="${src.generated.c}/MacOSX" />
@@ -305,20 +182,21 @@
         <mkdir dir="${src.generated.c}/BroadcomEGL" />
         <mkdir dir="${classes}" />
         <mkdir dir="${classes-cdc}" />
-        <mkdir dir="${obj}" />
+        <mkdir dir="${obj.newt}" />
     </target>
 
     <!-- ================================================================== -->
-    <!-- 
+    <!--
        - Compile the original and generated source.
       -->
     <target name="java.compile.javase">
         <!-- Perform the second pass Java compile; everything. -->
         <javac destdir="${classes}"
                excludes="${java.excludes.all}"
-               source="${newt.sourcelevel}"
+               source="${target.sourcelevel}"
                fork="yes"
-               memoryMaximumSize="128m"
+               includeAntRuntime="false"
+               memoryMaximumSize="${javac.memorymax}"
                debug="${javacdebug}" debuglevel="${javacdebuglevel}">
             <src path="${src.java}" />
             <classpath refid="nativewindow_gluegen_jogl.classpath"/>
@@ -329,10 +207,11 @@
         <!-- Perform the first pass Java compile; everything -->
         <javac destdir="${classes-cdc}"
                excludes="${java.excludes.all} ${java.excludes.cdcfp}"
-               source="${newt.sourcelevel}"
+               source="${target.sourcelevel}"
                bootclasspath="${javac.bootclasspath-cdc.jar}"
                fork="yes"
-               memoryMaximumSize="128m"
+               includeAntRuntime="false"
+               memoryMaximumSize="${javac.memorymax}"
                debug="${javacdebug}" debuglevel="${javacdebuglevel}">
             <classpath refid="nativewindow_gluegen_jogl.classpath-cdc"/>
             <src path="${src.java}" />
@@ -342,7 +221,7 @@
     <target name="java.compile" depends="java.compile.javase,java.compile.javacdc" />
 
     <!-- ================================================================== -->
-    <!-- 
+    <!--
        - Compile the native C code for JOGL (and optionally the Cg binding).
       -->
 
@@ -356,7 +235,7 @@
       </compiler>
 
       <!-- linker configuration -->
- 
+
       <linker id="linker.cfg.linux.newt.broadcom_egl" extends="linker.cfg.linux">
         <syslibset dir="/nfsroot/lg/lib" libs="EGL"/>
         <syslibset dir="/nfsroot/lg/lib" libs="GLES_CM"/>
@@ -409,7 +288,7 @@
       <property name="linker.cfg.id.core"                   value="linker.cfg.win32.msvc" />
       <property name="linker.cfg.id.oswin"                  value="linker.cfg.win32.msvc.newt" />
     </target>
-    
+
     <target name="c.configure.win32.mingw" if="isMingW">
       <echo message="Win32.MingW" />
       <property name="compiler.cfg.id"                      value="compiler.cfg.win32.mingw" />
@@ -427,7 +306,7 @@
       </condition>
       <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
     </target>
-    
+
     <target name="c.configure.linux.amd64" if="isLinuxAMD64">
       <echo message="Linux.AMD64" />
       <property name="compiler.cfg.id"                      value="compiler.cfg.linux.amd64" />
@@ -438,7 +317,7 @@
       </condition>
       <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
     </target>
-    
+
     <target name="c.configure.linux.ia64" if="isLinuxIA64">
       <echo message="Linux.IA64" />
       <property name="compiler.cfg.id"                      value="compiler.cfg.linux" />
@@ -454,15 +333,15 @@
       <property name="linker.cfg.id.core"                   value="linker.cfg.solaris" />
       <property name="linker.cfg.id.oswin"                  value="linker.cfg.solaris.newt.x11" />
     </target>
-  
- 
+
+
     <target name="c.configure.solaris.sparcv9" depends="c.configure.x11" if="isSolarisSparcv9">
       <echo message="SolarisSparcv9" />
       <property name="compiler.cfg.id"                      value="compiler.cfg.solaris.sparcv9" />
       <property name="linker.cfg.id.core"                   value="linker.cfg.solaris.sparcv9" />
       <property name="linker.cfg.id.oswin"                  value="linker.cfg.solaris.sparcv9.newt.x11" />
     </target>
-   
+
 
     <target name="c.configure.solaris.amd64" depends="c.configure.x11" if="isSolarisAMD64">
       <echo message="SolarisAMD64" />
@@ -470,7 +349,7 @@
       <property name="linker.cfg.id.core"                   value="linker.cfg.solaris.amd64" />
       <property name="linker.cfg.id.oswin"                  value="linker.cfg.solaris.amd64.newt.x11" />
     </target>
-   
+
     <target name="c.configure.freebsd" depends="c.configure.x11" if="isFreeBSD">
       <echo message="FreeBSD" />
       <property name="compiler.cfg.id"                      value="compiler.cfg.freebsd.newt" />
@@ -494,7 +373,7 @@
       <property name="linker.cfg.id.core"                   value="linker.cfg.macosx" />
       <property name="linker.cfg.id.oswin"                  value="linker.cfg.macosx.newt" />
     </target>
-    
+
     <target name="c.configure.2" depends="c.configure.win32,c.configure.linux,c.configure.solaris32,c.configure.solaris.sparcv9,c.configure.solaris.amd64,c.configure.macosx,c.configure.freebsd,c.configure.hpux" />
 
     <target name="c.configure" depends="c.configure.1,c.configure.2" />
@@ -518,9 +397,9 @@
         <echo message="Output lib name = @{output.lib.name}" />
 
         <!-- NOTE: the value of the debug and optimise attributes will not be overridden if already set externally -->
-        <property name="c.compiler.debug"     value="false" /> 
-        <!-- Optimise flags one of { none, size, speed, minimal, full, aggressive, extreme, unsafe } --> 
-        <property name="c.compiler.optimise"  value="none" /> 
+        <property name="c.compiler.debug"     value="false" />
+        <!-- Optimise flags one of { none, size, speed, minimal, full, aggressive, extreme, unsafe } -->
+        <property name="c.compiler.optimise"  value="none" />
 
         <condition property="c.compiler.use-debug"><istrue value="${c.compiler.debug}"/></condition>
 
@@ -535,25 +414,25 @@
 
         <echo message="Compiling @{output.lib.name}" />
 
-        <cc outtype="shared" 
-            objdir="${obj}" 
-            outfile="${obj}/@{output.lib.name}"
-            optimize="${c.compiler.optimise}" 
+        <cc outtype="shared"
+            objdir="${obj.newt}"
+            outfile="${obj.newt}/@{output.lib.name}"
+            optimize="${c.compiler.optimise}"
             debug="${c.compiler.debug}"
-            multithreaded="true" 
-            exceptions="false" 
-            rtti="false">   
-  
+            multithreaded="true"
+            exceptions="false"
+            rtti="false">
+
           <!-- TODO: versioninfo  companyname="java.net"
                         legalcopyright="Copyright"
-                        productname="JOGL" 
+                        productname="JOGL"
                         productversion="x.y.z"
                         description="Description"
-                        fileversion="x.y.z" 
-                        filecomments="File Comment" /-->      
-  
+                        fileversion="x.y.z"
+                        filecomments="File Comment" /-->
+
           <fileset dir="${project.root}"><patternset refid="@{c.compiler.src.files}"/></fileset>
-  
+
           <compiler extends="@{compiler.cfg.id}" >
             <sysincludepath path="${java.includes.dir}"/>
             <sysincludepath path="${java.includes.dir.platform}"/>
@@ -567,52 +446,52 @@
             <includepath path="${src.generated.c}/IntelGDL" if="useIntelGDL" />
             <includepath path="stub_includes/embedded/IntelGDL" if="useIntelGDL" />
             <includepath path="${src.generated.c}/BroadcomEGL" if="useBroadcomEGL" />
-  
+
             <!-- This must come last to not override real include paths -->
             <!-- includepath path="stub_includes/macosx" if="isOSX" / -->
           </compiler>
-  
+
           <linker extends="@{linker.cfg.id}">
-            <syslibset dir="${java.lib.dir.platform}" libs="jawt" if="@{output.lib.name}.useLibJAWT"/>
-            <syslibset dir="${java.lib.dir.platform}/server" libs="jvm" if="@{output.lib.name}.useLibJVM"/>
+            <syslibset dir="${java.lib.platform}" libs="jawt" if="@{output.lib.name}.useLibJAWT"/>
+            <syslibset dir="${java.lib.platform}/server" libs="jvm" if="@{output.lib.name}.useLibJVM"/>
           </linker>
         </cc>
 
         <!-- FIXME: this is a hack; the cpptask should have an option to change the
              suffix or at least understand the override from dylib to jnilib -->
         <antcall target="rename.dylib" inheritRefs="true">
-            <param name="src"  value="${build}/obj/lib@{output.lib.name}.dylib" />
-            <param name="dest" value="${build}/obj/lib@{output.lib.name}.jnilib" />
-            <param name="dest-cdc" value="${build}/obj/lib@{output.lib.name}.so" />
+            <param name="src"  value="${obj.newt}/lib@{output.lib.name}.dylib" />
+            <param name="dest" value="${obj.newt}/lib@{output.lib.name}.jnilib" />
+            <param name="dest-cdc" value="${obj.newt}/lib@{output.lib.name}.so" />
         </antcall>
 
         <!-- FIXME: this is a hack; the cpptask should have an option to change the
              suffix or at least understand the override from dylib to jnilib -->
         <antcall target="rename.mingw.dll" inheritRefs="true">
-            <param name="src"  value="${build}/obj/lib@{output.lib.name}.so" />
-            <param name="dest" value="${build}/obj/@{output.lib.name}.dll" />
+            <param name="src"  value="${obj.newt}/lib@{output.lib.name}.so" />
+            <param name="dest" value="${obj.newt}/@{output.lib.name}.dll" />
         </antcall>
       </sequential>
-    </macrodef>  
+    </macrodef>
 
     <target name="c.build.newt.prepare.KD" if="useKD">
-      <javah destdir="${src.generated.c}/KD" classpath="${classes}" class="com.sun.javafx.newt.opengl.kd.KDWindow" />
+      <javah destdir="${src.generated.c}/KD" classpath="${classes}" class="com.jogamp.newt.opengl.kd.KDWindow" />
     </target>
 
     <target name="c.build.newt.prepare.IntelGDL" if="useIntelGDL">
-      <javah destdir="${src.generated.c}/IntelGDL" classpath="${classes}" class="com.sun.javafx.newt.intel.gdl.Display" />
-      <javah destdir="${src.generated.c}/IntelGDL" classpath="${classes}" class="com.sun.javafx.newt.intel.gdl.Screen" />
-      <javah destdir="${src.generated.c}/IntelGDL" classpath="${classes}" class="com.sun.javafx.newt.intel.gdl.Window" />
+      <javah destdir="${src.generated.c}/IntelGDL" classpath="${classes}" class="com.jogamp.newt.intel.gdl.Display" />
+      <javah destdir="${src.generated.c}/IntelGDL" classpath="${classes}" class="com.jogamp.newt.intel.gdl.Screen" />
+      <javah destdir="${src.generated.c}/IntelGDL" classpath="${classes}" class="com.jogamp.newt.intel.gdl.Window" />
     </target>
 
     <target name="c.build.newt.prepare.BroadcomEGL" if="useBroadcomEGL">
-      <javah destdir="${src.generated.c}/BroadcomEGL" classpath="${classes}" class="com.sun.javafx.newt.opengl.broadcom.egl.Window" />
+      <javah destdir="${src.generated.c}/BroadcomEGL" classpath="${classes}" class="com.jogamp.newt.opengl.broadcom.egl.Window" />
     </target>
 
     <target name="c.build.newt.prepare.desktop" unless="setup.nodesktop">
-      <javah destdir="${src.generated.c}/Windows" classpath="${classes}" class="com.sun.javafx.newt.windows.WindowsWindow" />
-      <javah destdir="${src.generated.c}/MacOSX" classpath="${classes}" class="com.sun.javafx.newt.macosx.MacWindow" />
-      <javah destdir="${src.generated.c}/X11" classpath="${classes}" class="com.sun.javafx.newt.x11.X11Window" />
+      <javah destdir="${src.generated.c}/Windows" classpath="${classes}" class="com.jogamp.newt.windows.WindowsWindow" />
+      <javah destdir="${src.generated.c}/MacOSX" classpath="${classes}" class="com.jogamp.newt.macosx.MacWindow" />
+      <javah destdir="${src.generated.c}/X11" classpath="${classes}" class="com.jogamp.newt.x11.X11Window" />
     </target>
 
     <target name="c.build.newt.prepare" depends="c.build.newt.prepare.KD,c.build.newt.prepare.IntelGDL,c.build.newt.prepare.BroadcomEGL,c.build.newt.prepare.desktop" />
@@ -626,22 +505,26 @@
 
     <target name="c.manifest" if="isVC8Family">
       <!-- exec mt, the Microsoft Manifest Tool, to include DLL manifests in order to resolve the location of msvcr80.dll -->
-      <msvc.manifest objdir="${obj}" dllname="newt" />
+      <msvc.manifest objdir="${obj.newt}" dllname="newt" />
     </target>
 
     <target name="c.build.newt.natives" depends="c.build.newt.windowlib" unless="setup.nonatives">
     </target>
 
     <target name="c.build.newt" depends="c.configure,c.build.newt.prepare,c.build.newt.natives">
+      <antcall target="gluegen.cpptasks.striplibs" inheritRefs="true">
+          <param name="libdir" value="${obj.newt}"/>
+      </antcall>
+
       <antcall target="c.manifest" inheritRefs="true" />
       <!-- Create the Java Web Start jar file for the built native code -->
-      <jar destfile="${build}/newt-natives-${os.and.arch}.jar" filesonly="true">
-        <fileset dir="${obj}">
+      <jar destfile="${build.newt}/newt-natives-${os.and.arch}.jar" filesonly="true">
+        <fileset dir="${obj.newt}">
           <include name="*.${native.library.suffix}" />
         </fileset>
       </jar>
-      <jar destfile="${build}/newt-natives-${os.and.arch}-cdc.jar" filesonly="true">
-        <fileset dir="${obj}">
+      <jar destfile="${build.newt}/newt-natives-${os.and.arch}-cdc.jar" filesonly="true">
+        <fileset dir="${obj.newt}">
           <include name="*.${native.library.suffix-cdc}" />
         </fileset>
       </jar>
@@ -662,14 +545,11 @@
             <isset property="newt.ri" />
           </not>
         </condition>
-        <tstamp>
-             <format property="timestamp" pattern="yyyyMMdd-HH:mm:ss"/>
-        </tstamp>
         <copy file="${manifestfile}"
           tofile="tempversion"
           overwrite="true">
           <filterset>
-              <filter token="VERSION" value="${newt_base_version}-pre-${timestamp}"/>
+              <filter token="VERSION" value="${newt.version}"/>
               <filter token="BASEVERSION" value="${newt_base_version}"/>
           </filterset>
         </copy>
@@ -684,14 +564,11 @@
             <isset property="newt.ri" />
           </not>
         </condition>
-        <tstamp>
-             <format property="timestamp" pattern="yyyyMMdd-HH:mm:ss"/>
-        </tstamp>
         <copy file="${manifestfile}"
           tofile="tempversion-cdc"
           overwrite="true">
           <filterset>
-              <filter token="VERSION" value="${newt_base_version}-pre-${timestamp}"/>
+              <filter token="VERSION" value="${newt.version}"/>
               <filter token="BASEVERSION" value="${newt_base_version}"/>
           </filterset>
         </copy>
@@ -727,46 +604,46 @@
     </target>
 
     <target name="build-jars-desktop" depends="setup-manifestfile" unless="setup.nodesktop">
-        <jar manifest="tempversion" destfile="${newt.x11.jar}" filesonly="true">
+        <jar manifest="tempversion" destfile="${newt.os.x11.jar}" filesonly="true">
             <fileset dir="${classes}"
                      includes="${java.part.x11}"/>
         </jar>
-        <jar manifest="tempversion" destfile="${newt.win.jar}" filesonly="true">
+        <jar manifest="tempversion" destfile="${newt.os.win.jar}" filesonly="true">
             <fileset dir="${classes}"
                      includes="${java.part.windows}"/>
         </jar>
-        <jar manifest="tempversion" destfile="${newt.osx.jar}" filesonly="true">
+        <jar manifest="tempversion" destfile="${newt.os.osx.jar}" filesonly="true">
             <fileset dir="${classes}"
                      includes="${java.part.macosx}"/>
         </jar>
     </target>
 
     <target name="build-jars-desktop-cdc" depends="setup-manifestfile-cdc" unless="setup.nodesktop">
-        <jar manifest="tempversion-cdc" destfile="${newt.x11.cdc.jar}" filesonly="true">
+        <jar manifest="tempversion-cdc" destfile="${newt.os.x11.cdc.jar}" filesonly="true">
             <fileset dir="${classes-cdc}"
                      includes="${java.part.x11}"/>
         </jar>
-        <jar manifest="tempversion-cdc" destfile="${newt.win.cdc.jar}" filesonly="true">
+        <jar manifest="tempversion-cdc" destfile="${newt.os.win.cdc.jar}" filesonly="true">
             <fileset dir="${classes-cdc}"
                      includes="${java.part.windows}"/>
         </jar>
-        <jar manifest="tempversion-cdc" destfile="${newt.osx.cdc.jar}" filesonly="true">
+        <jar manifest="tempversion-cdc" destfile="${newt.os.osx.cdc.jar}" filesonly="true">
             <fileset dir="${classes-cdc}"
                      includes="${java.part.macosx}"/>
         </jar>
     </target>
 
-    <target name="build-jars-all-awt" depends="setup-manifestfile" unless="setup.noall">
+    <target name="build-jars-all-awt" depends="setup-manifestfile" unless="setup.noAWT">
         <jar manifest="tempversion" destfile="${newt.all.jar}" filesonly="true">
             <fileset dir="${classes}"
-                     includes="com/sun/javafx/newt/**" />
+                     includes="com/jogamp/newt/**" />
         </jar>
     </target>
 
     <target name="build-jars-all-noawt" depends="setup-manifestfile">
         <jar manifest="tempversion" destfile="${newt.all-noawt.jar}" filesonly="true">
             <fileset dir="${classes}"
-                     includes="com/sun/javafx/newt/**"
+                     includes="com/jogamp/newt/**"
                      excludes="${java.part.awt}" />
         </jar>
     </target>
@@ -774,7 +651,7 @@
     <target name="build-jars-all-cdc" depends="setup-manifestfile-cdc">
         <jar manifest="tempversion-cdc" destfile="${newt.all.cdc.jar}" filesonly="true">
             <fileset dir="${classes-cdc}"
-                     includes="com/sun/javafx/newt/**"
+                     includes="com/jogamp/newt/**"
                      excludes="${java.excludes.cdcfp}" />
         </jar>
     </target>
@@ -797,17 +674,17 @@
     <!-- ================================================================== -->
     <!--
        - Build the Javadocs for the sources.
-       - NOTE:  these are not entirely correct as the javadocs targets depend 
-       -        on the platform specific build targets.  To circumvent any 
+       - NOTE:  these are not entirely correct as the javadocs targets depend
+       -        on the platform specific build targets.  To circumvent any
        -        errors, ensure that the source is built first.
       -->
-    <target name="javadoc" depends="load.user.properties,init">
+    <target name="javadoc" depends="init">
         <!-- Build the general Javadoc -->
         <javadoc packagenames="${javadoc.packagenames}"
                  excludepackagenames="${java.excludes.javadoc.packagenames}"
-                 sourcepath="${src.java};${src.generated.java}"        
+                 sourcepath="${src.java};${src.generated.java}"
                  destdir="${javadoc}" windowtitle="${javadoc.windowtitle}"
-                 overview="${javadoc.overview}" 
+                 overview="${javadoc.overview}"
                  source="1.4"
                  linkoffline="${javadoc.link} 142-packages"
          bottom="${javadoc.bottom}" >
@@ -815,7 +692,7 @@
         </javadoc>
     </target>
 
-    <target name="javadoc.spec" depends="load.user.properties,init">
+    <target name="javadoc.spec" depends="init">
         <!-- Build the general Javadoc -->
         <javadoc packagenames="${javadoc.spec.packagenames}"
                  excludepackagenames="${java.excludes.javadoc.packagenames}"
@@ -828,14 +705,14 @@
          <classpath refid="nativewindow_gluegen_jogl.classpath"/>
         </javadoc>
     </target>
-                                                                                                                                   
-    <target name="javadoc.dev" depends="load.user.properties,init">
+
+    <target name="javadoc.dev" depends="init">
         <!-- Build the internal developer Javadoc -->
         <javadoc packagenames="${javadoc.dev.packagenames}"
                  excludepackagenames="${java.excludes.javadoc.packagenames}"
-                 sourcepath="${src.java};${src.generated.java}"        
+                 sourcepath="${src.java};${src.generated.java}"
                  destdir="${javadoc.dev}" windowtitle="${javadoc.windowtitle}"
-                 overview="${javadoc.overview}" 
+                 overview="${javadoc.overview}"
                  source="1.4"
                  linkoffline="${javadoc.link} 142-packages"
          bottom="${javadoc.bottom}" >
@@ -851,7 +728,7 @@
       -->
     <target name="clean" description="Remove all build products" depends="declare.common">
         <delete includeEmptyDirs="true" quiet="true">
-            <fileset dir="${build}" />
+            <fileset dir="${build.newt}" />
             <fileset dir="${javadoc}" />
             <fileset dir="${javadoc.spec}" />
             <fileset dir="${javadoc.dev}" />
@@ -862,22 +739,11 @@
     <!--
        - Build everything.
       -->
-    <target name="all" description="Build NEWT JAR file(s) and native libraries." depends="load.user.properties,init,jar,c.build.newt,generate.version.txt" />
-
-    <target name="setup-version-RI" if="newt.ri">
-        <property name="tmp.version" value="${newt_base_version}" />
-    </target>
-
-    <target name="setup-version-non-RI" unless="newt.ri">
-        <tstamp>
-             <format property="version.timestamp" pattern="yyyyMMdd"/>
-        </tstamp>
-        <property name="tmp.version" value="${newt_base_version}-pre-${version.timestamp}" />
-    </target>
+    <target name="all" description="Build NEWT JAR file(s) and native libraries." depends="init,jar,c.build.newt,generate.version.txt" />
 
-    <target name="generate.version.txt" depends="setup-version-RI,setup-version-non-RI">
+    <target name="generate.version.txt" depends="init">
         <!-- Create a version.txt file indicating which version we just built -->
-        <echo message="${tmp.version}" file="${build}/version.txt" />
+        <echo message="${newt.version}" file="${build.newt}/version.txt" />
     </target>
 
     <!-- ================================================================== -->