Merge lp:~xranby/ubuntu/precise/libjogl2-java/fix-for-908765 into lp:ubuntu/precise/libjogl2-java

[Xerxes Rånby]

The jogl2 ant build script took a different code path on armv7 builders, the new otherArchsoswin_armv7.patch removes the use of dir="${env.TARGET_PLATFORM_LIBS}" in similar spirit of the already existing otherArchsoswin_2.diff.

Unmerged revisions

14. By Xerxes Rånby on 2011-12-26

debian/patches/otherArchsoswin_armv7.patch: Fix armv7 FTBFS (LP: #908765)

=== removed file '.pc/applied-patches'
--- .pc/applied-patches	2011-11-22 00:42:13 +0000
+++ .pc/applied-patches	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-variousFixes.diff
-swt.diff
-otherArchsoswin.diff
-disable_android.diff
-disable_git_call.diff
-disable_android_2.diff
-arch_naming.diff
-linker.cfg.id.os.diff
-otherArchsoswin_2.diff

=== removed directory '.pc/arch_naming.diff'
=== removed directory '.pc/arch_naming.diff/make'
=== removed file '.pc/arch_naming.diff/make/build-nativewindow.xml'
--- .pc/arch_naming.diff/make/build-nativewindow.xml	2011-10-09 19:26:30 +0000
+++ .pc/arch_naming.diff/make/build-nativewindow.xml	1970-01-01 00:00:00 +0000
@@ -1,901 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   - Ant build for the NativeWindow package.  This build has been tested with ANT 1.7.0.  The
-   - optional.jar that contains the optional ANT tasks must be in the ANT
-   - classpath (typically the ant/lib directory).
-   -
-   - A clean download of the NativeWindow sources is required for this build.
-   -
-   - This build has no dependence on environment variables; the needed
-   - ones (e.g. java.home, ANT_HOME) are all set by the Ant wrapper shell
-   - script, by the virtual machine, or elsewhere. However, on all platforms,
-   - the C compiler and linker should be in the path. All other paths that
-   - need to be set are in host.properties.
-   -
-   - NOTE:  because the GlueGen config files have their own relative paths
-   -        which cannot be overridden by GlueGen, GlueGen MUST be run from
-   -        the "make" directory. This also means that this build.xml MUST
-   -        be run from the "make" directory.
-   -
-   - Public targets:
-   -   all: (default; autodetects OS and chooses C compiler from gluegen.properties)
-   -   clean:        clean all built
-   -   javadoc:      create the standard developer Javadoc (recommended)
-   -                 (Note: should build all first - may be dependence in the future)
-   -   javadoc.spec: create the standard developer Javadoc but exclude com.jogamp.* classes
-   -   javadoc.dev:  create the internal developer Javadoc.  This includes the
-   -                       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 gluegen.properties
-   - is required to select the appropriate C compiler. See the example
-   - gluegen.properties in the gluegen workspace for valid values. On Mac OS X
-   - universal binaries may also be built by setting the "macosxfat"
-   - property in gluegen.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 tasks, the building of
-   - the Java generated sources, the first and second phase Java compiles, and
-   - the building of the jar file. Thanks to Alex Radeski for the bulk of the
-   - port to the ant-contrib CPPTask framework. Thanks to Athomas Goldberg for
-   - the original OS detection code.
-   -
-   - Some environment defs affecting native compilation
-       setup.noNativeAWT
-
-   - Internal settings, may not be necessary to set them manually,
-     since all JAR archives are orthogonal.
-       setup.noAWT
-   -->
-<project name="NativeWindow" basedir="." default="all">
-
-    <import file="build-common.xml"/>
-
-	<!-- needed for outofdate task -->
-    <taskdef resource="net/sf/antcontrib/antlib.xml">
-      <classpath> <pathelement location="${ant-contrib.jar}"/> </classpath>
-    </taskdef>
-
-	<!-- ================================================================== -->
-    <!-- 
-       - Base initialization and detection of operating system.
-      -->
-    <target name="base.init" depends="common.init">
-
-        <!-- partitioning -->
-
-        <property name="java.part.swt"
-                  value="jogamp/nativewindow/swt/**"/>
-
-        <property name="java.part.core"
-                  value="javax/media/nativewindow/* javax/media/nativewindow/util/* javax/media/nativewindow/egl/* com/jogamp/nativewindow/* jogamp/nativewindow/* jogamp/nativewindow/jvm/* ${java.part.swt}"/>
-
-        <property name="java.part.awt"
-                  value="javax/media/nativewindow/awt/* jogamp/nativewindow/jawt/** jogamp/nativewindow/**/awt/**"/>
-
-        <property name="java.part.x11"
-                  value="jogamp/nativewindow/x11/** javax/media/nativewindow/x11/*" />
-
-        <property name="java.part.windows"
-                  value="jogamp/nativewindow/windows/** javax/media/nativewindow/windows/*" />
-
-        <property name="java.part.macosx"
-                  value="jogamp/nativewindow/macosx/** javax/media/nativewindow/macosx/*" />
-
-        <!-- condition excludes -->
-
-        <condition property="java.excludes.awt"
-                   value="${java.part.awt}">
-           <isset property="setup.noAWT"/> 
-        </condition>
-
-        <property name="java.excludes.all" value="${java.excludes.awt}" />
-        <echo message="java.excludes.all: ${java.excludes.all}" />
-    </target>
-
-
-    <!-- ================================================================== -->
-    <!-- 
-       - Declare all paths and user defined variables.
-      -->
-    <target name="declare.common" description="Declare properties" depends="base.init">
-
-        <property name="config.nativewindow" value="${config}/nativewindow" />
-
-        <property name="rootrel.src" value="src/nativewindow" />
-        <property name="rootrel.src.java" value="${rootrel.src}/classes" />
-        <property name="rootrel.src.c" value="${rootrel.src}/native" />
-
-        <property name="rootrel.src.generated" value="${rootrel.build}/nativewindow/gensrc" />
-        <property name="rootrel.generated.c" value="${rootrel.src.generated}/native" />
-
-        <!-- The source directories. -->
-        <property name="src.java" value="${project.root}/${rootrel.src.java}" />
-        <property name="src.c"    value="${project.root}/${rootrel.src.c}" />
-        
-        <!-- The generated source directories. -->
-        <property name="src.generated" value="${build.nativewindow}/gensrc" />
-        <property name="src.generated.java" value="${src.generated}/classes" />
-        <property name="src.generated.c" value="${src.generated}/native" />
-        
-        <!-- The compiler output directories. -->
-        <property name="classes" value="${build.nativewindow}/classes" />
-
-        <property name="javah.classpath" value="${gluegen-rt.jar}:${classes}" />
-
-        <!-- The headers from which Java files are generated -->
-        <dirset id="stub.includes.fileset.all" dir=".">
-            <include name="${stub.includes}/macosx/**" />
-            <include name="${stub.includes}/win32/**" />
-            <include name="${stub.includes}/x11/**" />
-            <include name="${stub.includes}/gluegen/**" />
-            <include name="${stub.includes}/khr/**" />
-            <include name="${stub.includes}/jni/**" />
-        </dirset>
-        <fileset id="stub.includes.dependencies.fileset.1" dir="${stub.includes}">
-            <include name="macosx/**" />
-            <include name="win32/**" />
-            <include name="x11/**" />
-            <include name="common/**" />
-            <include name="jni/**" />
-        </fileset>
-        <fileset id="stub.includes.dependencies.fileset.2" file="${gluegen.jar}" />
-        <fileset id="stub.includes.dependencies.fileset.3" dir="${config.nativewindow}">
-            <include name="*.cfg" />
-            <include name="*.java" />
-            <include name="*.c" />
-        </fileset>
-
-        <!-- The javadoc dirs. -->
-        <property name="javadoc" value="${project.root}/javadoc_nativewindow_public" />
-        <property name="javadoc.spec" value="${project.root}/javadoc_nativewindow_spec" />
-        <property name="javadoc.dev" value="${project.root}/javadoc_nativewindow_dev" />
-        <property name="javadoc.windowtitle" value="Native Windowing Interface (NativeWindow) API -- ${nativewindow_base_version} Specification" />
-        <property name="javadoc.overview" value="../src/nativewindow/classes/javax/media/nativewindow/package.html" />
-        <property name="javadoc.spec.packagenames" value="javax.media.nativewindow.*" />
-
-        <property name="javadoc.packagenames" value="${javadoc.spec.packagenames}" />
-
-        <property name="javadoc.dev.packagenames" value="${javadoc.packagenames},com.jogamp.nativewindow.util.*,jogamp.nativewindow.*,com.jogamp.gluegen,com.jogamp.gluegen.runtime" />
-    <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">
-        <!-- Create the required output directories. -->
-        <mkdir dir="${src.generated.java}" />
-        <mkdir dir="${src.generated.c}" />
-        <mkdir dir="${src.generated.c}/MacOSX" />
-        <mkdir dir="${src.generated.c}/Windows" />
-        <mkdir dir="${src.generated.c}/X11" />
-        <mkdir dir="${classes}" />
-        <mkdir dir="${obj.nativewindow}" />
-    </target>
-
-    <!--
-       - Check to see whether we need to rebuild the generated sources.
-      -->
-    <target name="java.generate.check">
-        <!-- Blow away all target files if any dependencies are violated
-             (the uptodate task doesn't allow arbitrary source and target filesets but should) -->
-             <!--
-        <dependset>
-            <srcfileset refid="stub.includes.dependencies.fileset.1" />
-            <srcfileset refid="stub.includes.dependencies.fileset.2" />
-            <srcfileset refid="stub.includes.dependencies.fileset.3" />
-            <targetfileset dir="${src.generated}">
-                <include name="**/*.java" />
-                <include name="**/*.c" />
-            </targetfileset>
-        </dependset>
-        -->
-
-        <!-- Now check for the presence of one well-known file -->
-        <uptodate property="java.generate.skip.x11windowlib"
-                  targetfile="${src.generated.java}/jogamp/nativewindow/x11/X11Lib.java">
-            <srcfiles refid="stub.includes.dependencies.fileset.1" />
-            <srcfiles refid="stub.includes.dependencies.fileset.2" />
-            <srcfiles refid="stub.includes.dependencies.fileset.3" />
-        </uptodate>
-        <uptodate property="java.generate.skip.jawt"
-                  targetfile="${src.generated.java}/jogamp/nativewindow/jawt/JAWT.java">
-            <srcfiles refid="stub.includes.dependencies.fileset.1" />
-            <srcfiles refid="stub.includes.dependencies.fileset.2" />
-            <srcfiles refid="stub.includes.dependencies.fileset.3" />
-        </uptodate>
-
-        <condition property="java.generate.skip">
-          <and>
-              <isset property="java.generate.skip.x11windowlib"/>
-              <isset property="java.generate.skip.jawt"/>
-          </and>
-        </condition>
-
-        <!--property name="java.generate.skip" value="true"/-->
-    </target>
-
-    <target name="java.generate.windowlib" if="windowlib.os.cfg">
-        <echo message="Generating Windowing Lib implementation class" />
-        <gluegen src="${stub.includes}/${window.os.system}/window-lib.c"
-                 outputRootDir="${build.nativewindow}"
-                 config="${windowlib.os.cfg}"
-                 includeRefid="stub.includes.fileset.platform"
-                 literalInclude="${stub.includes.gluegen.gg}"
-                 emitter="com.jogamp.gluegen.JavaEmitter"
-                 debug="false"
-                 dumpCPP="false">
-            <classpath refid="gluegen.classpath" />
-        </gluegen>
-    </target>
-
-    <target name="java.generate.jawt" unless="setup.noAWT">
-        <!-- NOTE:  the "literalInclude" in this GlueGen call is simply to
-           -        get around the fact that neither FileSet nor DirSet can
-           -        handle different drives in an effective manner. -->
-        <echo message="Generating JAWT interface class" />
-        <echo message="java.home.dir=${java.home.dir}" />
-        <gluegen src="${jawt.platform.header}"
-                 outputRootDir="${build.nativewindow}"
-                 config="${jawt.cfg}"
-                 includeRefid="stub.includes.fileset.platform"
-                 literalInclude="${stub.includes.gluegen.gg}, ${stub.includes}/jni"
-                 emitter="com.jogamp.gluegen.JavaEmitter">
-            <classpath refid="gluegen.classpath" />
-        </gluegen>
-    </target>
-
-    <target name="java.generate.platforms" >
-        <echo message="Generating platform-specifics: os: ${window.os.system}, cfgs: ${windowlib.os.cfg}, ${jawt.cfg}" />
-        <dirset id="stub.includes.fileset.platform" dir="." includes="${stub.includes}/${window.os.system}/** ${stub.includes}/gluegen/** ${stub.includes}/khr/**" />
-        <antcall target="java.generate.windowlib" inheritRefs="true" />
-        <antcall target="java.generate.jawt" inheritRefs="true" />
-    </target>
-
-    <!--
-       - Setup the generating ANT tasks and use it to generate the Java files 
-       - from the C GL headers.  This involves setting the taskdef and creating
-       - the classpath reference id then running the task on each header.
-      -->
-    <target name="java.generate" depends="init, common.gluegen.build, java.generate.check" unless="java.generate.skip">
-
-        <!-- Add the GlueGen task to ANT -->
-        <taskdef name="gluegen" classname="com.jogamp.gluegen.ant.GlueGenTask"
-                 classpathref="gluegen.classpath" />
-                 
-        <!-- Use the GlueGen task to generate the Java files -->
-
-        <echo message="Generating platform-specifics: X11" />
-        <antcall target="java.generate.platforms" inheritRefs="true">
-            <param name="window.os.system"                       value="x11"/>
-            <param name="windowlib.os.cfg"                       value="${config.nativewindow}/x11-lib.cfg" />
-            <param name="jawt.cfg"                               value="${config.nativewindow}/jawt-x11.cfg" />
-            <param name="jawt.platform.header"                   value="${stub.includes}/jni/x11/jawt_md.h" />
-        </antcall>
-
-        <echo message="Generating platform-specifics: Win32" />
-        <antcall target="java.generate.platforms" inheritRefs="true">
-            <param name="window.os.system"                       value="win32"/>
-            <param name="windowlib.os.cfg"                       value="${config.nativewindow}/win32-lib.cfg" />
-            <param name="jawt.cfg"                               value="${config.nativewindow}/jawt-win32.cfg" />
-            <param name="jawt.platform.header"                   value="${stub.includes}/jni/win32/jawt_md.h" />
-        </antcall>          
-
-        <echo message="Generating platform-specifics: MaxOsX" />
-        <antcall target="java.generate.platforms" inheritRefs="true">
-          <param name="window.os.system"                     value="macosx"/>
-          <param name="jawt.cfg"                             value="${config.nativewindow}/jawt-macosx.cfg" />
-          <param name="jawt.platform.header"                 value="${stub.includes}/jni/macosx/jawt_md.h" />
-        </antcall>
-    
-        <!-- Inform the user that the generators have successfully created 
-           - the necessary Java files -->
-        <echo message="" />
-        <echo message="GlueGen has successfully generated files." />
-    
-    </target>      
-
-    <!-- ================================================================== -->
-    <!-- 
-       - Compile the original and generated source.  The composable pipelines
-       - will be generated.
-      -->
-    <target name="java.compile.javase" depends="java.generate">
-        <!-- Perform the second pass Java compile; everything. -->
-        <javac destdir="${classes}"
-               excludes="${java.excludes.all}"
-               source="${target.sourcelevel}"
-               fork="yes"
-               includeAntRuntime="false"
-               memoryMaximumSize="${javac.memorymax}"
-               debug="${javacdebug}" debuglevel="${javacdebuglevel}">
-            <classpath refid="swt_gluegen.classpath"/>
-            <src path="${src.java}" />
-            <src path="${src.generated.java}" />
-        </javac>
-    </target>
-
-    <target name="java.compile" depends="java.compile.javase" />
-
-    <!-- ================================================================== -->
-    <!-- 
-       - Compile the native C code for JOGL (and optionally the Cg binding).
-      -->
-
-    <target name="c.configure.1" depends="gluegen.cpptasks.detect.os,gluegen.cpptasks.setup.compiler">
-      <!-- compiler configuration -->
-
-      <!-- Note that we can use the base setups in the gluegen-cpptasks for most of these -->
-      <compiler id="compiler.cfg.freebsd.nativewindow" extends="compiler.cfg.freebsd">
-        <!-- Need to force X11R6 headers on to include path after stub_includes -->
-        <includepath path="/usr/local/include" />
-      </compiler>
-
-      <compiler id="compiler.cfg.linux.armv7.nativewindow.x11" extends="compiler.cfg.linux.armv7">
-        <!-- Need to force /usr/include headers on to include path (after all others), due to crosscompiler usage -->
-        <compilerarg value="-idirafter" />
-        <compilerarg value="/usr/include" />
-      </compiler>
-
-      <!-- linker configuration -->
-
-      <linker id="linker.cfg.freebsd.nativewindow.x11" extends="linker.cfg.freebsd">
-        <syslibset dir="/usr/local/lib" libs="X11"/>
-        <syslibset dir="/usr/local/lib" libs="Xxf86vm" />
-        <syslibset dir="/usr/local/lib" libs="Xinerama"/>
-        <syslibset dir="/usr/local/lib" libs="Xrender"/>
-      </linker>
-
-      <linker id="linker.cfg.freebsd.amd64.nativewindow.x11" extends="linker.cfg.freebsd.amd64">
-        <syslibset dir="/usr/local/lib" libs="X11" />
-        <syslibset dir="/usr/local/lib" libs="Xxf86vm" />
-        <syslibset dir="/usr/local/lib" libs="Xinerama"/>
-        <syslibset dir="/usr/local/lib" libs="Xrender"/>
-      </linker>
-
-      <linker id="linker.cfg.linux.nativewindow.x11" extends="linker.cfg.linux">
-        <syslibset libs="X11"/>
-        <syslibset libs="Xxf86vm" />
-        <syslibset libs="Xinerama"/>
-        <syslibset libs="Xrender"/>
-      </linker>
-
-      <linker id="linker.cfg.linux.x86.nativewindow.x11" extends="linker.cfg.linux.x86">
-        <syslibset libs="X11"/>
-        <syslibset libs="Xxf86vm" />
-        <syslibset libs="Xinerama"/>
-        <syslibset libs="Xrender"/>
-      </linker>
-
-      <linker id="linker.cfg.linux.amd64.nativewindow.x11" extends="linker.cfg.linux.amd64">
-        <syslibset libs="X11"/>
-        <syslibset libs="Xxf86vm" />
-        <syslibset libs="Xinerama"/>
-        <syslibset libs="Xrender"/>
-      </linker>
-
-      <linker id="linker.cfg.linux.armv7.nativewindow.x11" extends="linker.cfg.linux.armv7">
-        <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="X11" />
-        <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="Xxf86vm" />
-        <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="Xinerama" />
-        <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="Xrender" />
-      </linker>
-
-      <linker id="linker.cfg.solaris.nativewindow.x11" extends="linker.cfg.solaris">
-        <syslibset libs="X11"/>
-      </linker>
-
-      <linker id="linker.cfg.solaris.sparcv9.nativewindow.x11" extends="linker.cfg.solaris.sparcv9">
-        <syslibset dir="/usr/lib/sparcv9" libs="X11"/>
-      </linker>
-
-      <linker id="linker.cfg.solaris.amd64.nativewindow.x11" extends="linker.cfg.solaris.amd64">
-        <syslibset dir="/usr/lib/amd64" libs="X11"/>
-      </linker>
-
-      <linker id="linker.cfg.win32.mingw.nativewindow" extends="linker.cfg.win32.mingw">
-        <linkerarg value="-Wl,--kill-at" />        <!-- remove @ from function names -->
-        <syslibset libs="gdi32, kernel32"/>
-      </linker>
-
-      <linker id="linker.cfg.win64.mingw.nativewindow" extends="linker.cfg.win64.mingw">
-        <linkerarg value="-Wl,--kill-at" />        <!-- remove @ from function names -->
-        <syslibset libs="gdi32, kernel32"/>
-      </linker>
-
-      <linker id="linker.cfg.win32.msvc.nativewindow" extends="linker.cfg.win32.msvc">
-        <syslibset libs="gdi32, user32, kernel32" />
-      </linker>
-      
-      <linker id="linker.cfg.macosx.nativewindow" extends="linker.cfg.macosx">
-        <linkerarg value="-framework" />
-        <linkerarg value="Cocoa" />
-      </linker>
-
-      <linker id="linker.cfg.hpux.nativewindow" extends="linker.cfg.hpux">
-        <syslibset dir="/usr/lib" libs="X11"/>
-        <syslibset dir="/usr/lib" libs="Xinerama"/>
-      </linker>
-    </target>
-
-    <target name="c.configure.win32.vc" if="isVCFamily">
-      <echo message="Win32.VC" />
-      <property name="compiler.cfg.id"                      value="compiler.cfg.win32.msvc" />
-      <property name="linker.cfg.id.oswin"                  value="linker.cfg.win32.msvc.nativewindow" />
-    </target>
-    
-    <target name="c.configure.win32.mingw" if="isMingW32">
-      <echo message="Win32.MingW" />
-      <property name="compiler.cfg.id"                      value="compiler.cfg.win32.mingw" />
-      <property name="linker.cfg.id.oswin"                  value="linker.cfg.win32.mingw.nativewindow" />
-    </target>
-
-    <target name="c.configure.win64.mingw" if="isMingW64">
-      <echo message="Win64.MingW" />
-      <property name="compiler.cfg.id"                      value="compiler.cfg.win64.mingw" />
-      <property name="linker.cfg.id.oswin"                  value="linker.cfg.win64.mingw.nativewindow" />
-    </target>
-
-    <target name="c.configure.linux.x86" if="isLinuxX86">
-      <echo message="Linux.x86" />
-      <property name="compiler.cfg.id"                      value="compiler.cfg.linux.x86" />
-      <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.x86.nativewindow.x11" />
-    </target>
-    
-    <target name="c.configure.linux.amd64" if="isLinuxAMD64">
-      <echo message="Linux.AMD64" />
-      <property name="compiler.cfg.id"                      value="compiler.cfg.linux.amd64" />
-      <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.amd64.nativewindow.x11" />
-    </target>
-    
-    <target name="c.configure.linux.armv7" if="isLinuxARMv7">
-      <echo message="Linux.armv7" />
-      <property name="compiler.cfg.id"                      value="compiler.cfg.linux.armv7.nativewindow.x11" />
-      <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.armv7.nativewindow.x11" />
-    </target>
-    
-    <target name="c.configure.linux.ia64" if="isLinuxIA64">
-      <echo message="Linux.IA64" />
-      <property name="compiler.cfg.id"                      value="compiler.cfg.linux" />
-      <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.nativewindow.x11" />
-    </target>
-
-    <target name="c.configure.linux.hppa" if="isLinuxHPPA">
-      <echo message="Linux.HPPA" />
-      <property name="compiler.cfg.id"                      value="compiler.cfg.linux" />
-      <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.nativewindow.x11" />
-    </target>
-
-    <target name="c.configure.linux.mips" if="isLinuxMIPS">
-      <echo message="Linux.MIPS" />
-      <property name="compiler.cfg.id"                      value="compiler.cfg.linux" />
-      <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.nativewindow.x11" />
-    </target>
-
-    <target name="c.configure.linux.mipsel" if="isLinuxMIPSEL">
-      <echo message="Linux.MIPSEL" />
-      <property name="compiler.cfg.id"                      value="compiler.cfg.linux" />
-      <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.nativewindow.x11" />
-    </target>
-
-    <target name="c.configure.linux.ppc" if="isLinuxPPC">
-      <echo message="Linux.PPC" />
-      <property name="compiler.cfg.id"                      value="compiler.cfg.linux" />
-      <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.nativewindow.x11" />
-    </target>
-
-    <target name="c.configure.linux.s390" if="isLinuxS390">
-      <echo message="Linux.S390" />
-      <property name="compiler.cfg.id"                      value="compiler.cfg.linux" />
-      <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.nativewindow.x11" />
-    </target>
-
-    <target name="c.configure.linux.sparc" if="isLinuxSPARC">
-      <echo message="Linux.SPARC" />
-      <property name="compiler.cfg.id"                      value="compiler.cfg.linux" />
-      <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.nativewindow.x11" />
-    </target>
-
-    <target name="c.configure.linux" depends="c.configure.linux.armv7,c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.sparc,c.configure.x11" if="isLinux" />
-
-    <target name="c.configure.android" if="isAndroid">
-      <echo message="Android" />
-      <property name="compiler.cfg.id"                      value="compiler.cfg.android" />
-      <property name="linker.cfg.id.oswin"                  value="linker.cfg.android" />
-    </target>
-    
-    <target name="c.configure.solaris32" depends="c.configure.x11" if="isSolaris32Bit">
-      <echo message="Solaris" />
-      <property name="compiler.cfg.id"                      value="compiler.cfg.solaris" />
-      <property name="linker.cfg.id.oswin"                  value="linker.cfg.solaris.nativewindow.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.oswin"                  value="linker.cfg.solaris.sparcv9.nativewindow.x11" />
-    </target>
-   
-
-    <target name="c.configure.solaris.amd64" depends="c.configure.x11" if="isSolarisAMD64">
-      <echo message="SolarisAMD64" />
-      <property name="compiler.cfg.id"                      value="compiler.cfg.solaris.amd64" />
-      <property name="linker.cfg.id.oswin"                  value="linker.cfg.solaris.amd64.nativewindow.x11" />
-    </target>
-   
-    <target name="c.configure.freebsd.x86" if="isFreeBSDX86">
-      <echo message="FreeBSD.x86" />
-      <property name="compiler.cfg.id"                      value="compiler.cfg.freebsd.nativewindow" />
-      <property name="linker.cfg.id.oswin"                  value="linker.cfg.freebsd.nativewindow.x11" />
-    </target>
-    
-    <target name="c.configure.freebsd.amd64" if="isFreeBSDAMD64">
-      <echo message="FreeBSD.AMD64" />
-      <property name="compiler.cfg.id"                      value="compiler.cfg.freebsd.nativewindow" />
-      <property name="linker.cfg.id.oswin"                  value="linker.cfg.freebsd.amd64.nativewindow.x11" />
-    </target>
-    
-    <target name="c.configure.freebsd" depends="c.configure.freebsd.x86,c.configure.freebsd.amd64,c.configure.x11" if="isFreeBSD" />
-
-    <target name="c.configure.hpux" depends="c.configure.x11" if="isHPUX">
-      <echo message="HP-UX" />
-      <property name="compiler.cfg.id"                      value="compiler.cfg.hpux" />
-      <property name="linker.cfg.id.oswin"                  value="linker.cfg.hpux.nativewindow.x11" />
-    </target>
-
-    <target name="c.configure.win32" depends="c.configure.win32.vc,c.configure.win32.mingw,c.configure.win64.mingw" if="isWindows" />
-
-    <target name="c.configure.x11" if="isX11" />
-
-    <target name="c.configure.macosx" if="isOSX">
-      <property name="compiler.cfg.id"                      value="compiler.cfg.macosx" />
-      <property name="linker.cfg.id.oswin"                  value="linker.cfg.macosx.nativewindow" />
-    </target>
-    
-    <target name="c.configure.2" depends="c.configure.win32,c.configure.linux,c.configure.android,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" />
-
-    <target name="rename.mingw.dll" if="isMingW">
-        <move file="${src}" tofile="${dest}" />
-    </target>
-
-    <target name="rename.dylib" if="isOSX">
-        <move file="${src}" tofile="${dest}" />
-    </target>
-
-    <macrodef name="c.build">
-      <attribute name="c.compiler.src.files" />
-      <attribute name="compiler.cfg.id" />
-      <attribute name="linker.cfg.id" />
-      <attribute name="output.lib.name" />
-      <attribute name="c.compiler.use-jawt" default="false"/>
-      <sequential>
-        <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" /> 
-
-        <condition property="c.compiler.use-debug"><istrue value="${c.compiler.debug}"/></condition>
-
-        <!-- since properties are immutable, we need one for each target -->
-        <condition property="@{output.lib.name}.useLibJAWT">
-            <istrue value="@{c.compiler.use-jawt}" />
-        </condition>
-        <echo message="c.compiler.use-jawt @{c.compiler.use-jawt}"/>
-        <echo message="@{output.lib.name}.useLibJAWT ${@{output.lib.name}.useLibJAWT}"/>
-
-        <condition property="@{output.lib.name}.useLibJVM">
-          <and>
-            <isset property="isHPUX"/>
-            <isset property="@{output.lib.name}.useLibJAWT"/>
-          </and>
-        </condition> 
-
-        <patternset id="c.src.files.awt">
-          <include name="${rootrel.src.c}/JAWT*.c"/>
-          <include name="${rootrel.generated.c}/X11/JAWT*.c" if="isX11"/>
-          <include name="${rootrel.generated.c}/MacOSX/JAWT*.c" if="isOSX"/>
-          <include name="${rootrel.generated.c}/Windows/JAWT*.c" if="isWindows"/>
-        </patternset>
-
-        <patternset id="c.src.files.x11">
-          <include name="${rootrel.generated.c}/X11/X11*.c"/>
-          <include name="${rootrel.src.c}/x11/Xmisc.c"/>
-          <include name="${rootrel.src.c}/x11/XineramaHelper.c"/>
-          <include name="${rootrel.src.c}/NativewindowCommon.c"/>
-        </patternset>
-
-        <patternset id="c.src.files.windows">
-          <include name="${rootrel.generated.c}/Windows/GDI*.c"/>
-          <include name="${rootrel.src.c}/windows/GDImisc.c"/>
-          <include name="${rootrel.src.c}/windows/WindowsDWM.c"/>
-          <include name="${rootrel.src.c}/NativewindowCommon.c"/>
-        </patternset>
-
-        <patternset id="c.src.files.macosx">
-          <include name="${rootrel.src.c}/macosx/OSXmisc.c"/>
-          <include name="${rootrel.src.c}/NativewindowCommon.c"/>
-        </patternset>
-
-        <echo message="Compiling @{output.lib.name}" />
-
-        <!-- have to wrap cc task with outofdate, because otherwise cc links a new library
-             even when no files have been compiled -->
-      	<outofdate>
-          <sourcefiles>
-            <fileset dir="${project.root}"><patternset refid="@{c.compiler.src.files}"/></fileset>
-          </sourcefiles>
-          <targetfiles>
-            <fileset dir="${obj.nativewindow}" includes="lib@{output.lib.name}.so"/>
-            <fileset dir="${obj.nativewindow}" includes="@{output.lib.name}.dll"/>
-            <fileset dir="${obj.nativewindow}" includes="lib@{output.lib.name}.jnilib"/>
-          </targetfiles>
-          <sequential>
-            <cc outtype="shared" 
-                objdir="${obj.nativewindow}" 
-                outfile="${obj.nativewindow}/@{output.lib.name}"
-                optimize="${c.compiler.optimise}" 
-                debug="${c.compiler.debug}"
-                multithreaded="true" 
-                exceptions="false" 
-                rtti="false">   
-      
-              <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}"/>
-                <sysincludepath path="${stub.includes.gluegen.cc}"/>
-                <!-- This is for the generated headers for handwritten C code -->
-                <includepath path="${src.generated.c}" />
-                <includepath path="${src.generated.c}/X11"     if="isX11"/>
-                <includepath path="${src.generated.c}/MacOSX"  if="isOSX"/>
-                <includepath path="${src.generated.c}/Windows" if="isWindows"/>
-                <includepath path="${src.c}/windows"           if="isWindows"/>
-                <includepath path="${src.c}"/>
-      
-                <!-- 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"/>
-              </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="${obj.nativewindow}/lib@{output.lib.name}.dylib" />
-                <param name="dest" value="${obj.nativewindow}/lib@{output.lib.name}.jnilib" />
-            </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="${obj.nativewindow}/lib@{output.lib.name}.so" />
-                <param name="dest" value="${obj.nativewindow}/@{output.lib.name}.dll" />
-            </antcall>
-
-            <!-- this stripping may be called more than once on the same library dir,
-                 but that should cause no harm, and doing it here inside outofdate
-                 prevents the JARs from always being rebuilt even if no source code changes -->
-            <antcall target="gluegen.cpptasks.striplibs" inheritRefs="true">
-                <param name="libdir" value="${obj.nativewindow}"/>
-            </antcall>
-
-          </sequential>
-      	</outofdate>
-      </sequential>
-    </macrodef>  
-
-    <target name="c.fixup.jawt.version.macosx" if="isOSX" unless="setup.noNativeAWT">
-      <!-- Edit the link to the JAWT version in the resulting jnilib
-           file; this isn't strictly needed but seems to allow the
-           universal binaries to work on 10.3 machines as well, which
-           is desirable for some end users -->
-      <apply executable="install_name_tool">
-        <arg value="-change" />
-        <arg value="/System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Libraries/libjawt.dylib" />
-        <arg value="/System/Library/Frameworks/JavaVM.framework/Libraries/libjawt.dylib" />
-        <srcfile />
-        <fileset dir="${obj.nativewindow}" includes="libnativewindow_awt.jnilib" />
-      </apply>
-    </target>
-
-    <target name="c.build.nativewindow.awt" unless="setup.noNativeAWT">
-      <c.build c.compiler.src.files="c.src.files.awt"
-               c.compiler.use-jawt="true"
-               output.lib.name="nativewindow_awt"
-               compiler.cfg.id="${compiler.cfg.id}"
-               linker.cfg.id="${linker.cfg.id.oswin}"/>
-    </target>
-
-    <target name="c.build.nativewindow.windowlib.x11" if="isX11">
-      <javah destdir="${src.generated.c}/X11" classpath="${javah.classpath}" class="jogamp.nativewindow.x11.X11Lib" />
-
-      <c.build c.compiler.src.files="c.src.files.x11"
-               output.lib.name="nativewindow_x11"
-               compiler.cfg.id="${compiler.cfg.id}"
-               linker.cfg.id="${linker.cfg.id.oswin}"/>
-    </target>
-
-    <target name="c.build.nativewindow.windowlib.windows" if="isWindows">
-      <javah destdir="${src.generated.c}/Windows" classpath="${javah.classpath}" class="jogamp.nativewindow.windows.GDI" />
-
-      <c.build c.compiler.src.files="c.src.files.windows"
-               output.lib.name="nativewindow_win32"
-               compiler.cfg.id="${compiler.cfg.id}"
-               linker.cfg.id="${linker.cfg.id.oswin}"/>
-    </target>
-
-    <target name="c.build.nativewindow.windowlib.macosx" if="isOSX">
-      <javah destdir="${src.generated.c}/MacOSX" classpath="${javah.classpath}" class="jogamp.nativewindow.macosx.OSXUtil" />
-
-      <c.build c.compiler.src.files="c.src.files.macosx"
-               output.lib.name="nativewindow_macosx"
-               compiler.cfg.id="${compiler.cfg.id}"
-               linker.cfg.id="${linker.cfg.id.oswin}"/>
-    </target>
-
-    <target name="c.build.nativewindow.windowlib" depends="c.build.nativewindow.windowlib.x11, c.build.nativewindow.windowlib.windows, c.build.nativewindow.windowlib.macosx"/>
-
-    <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.nativewindow}" dllname="nativewindow_awt" />
-      <msvc.manifest objdir="${obj.nativewindow}" dllname="nativewindow_win32" />
-    </target>
-
-    <target name="c.build.nativewindow" depends="c.configure,c.build.nativewindow.windowlib,c.build.nativewindow.awt">
-      <antcall target="c.fixup.jawt.version.macosx" inheritrefs="true" />
-      <antcall target="c.manifest" inheritRefs="true" />
-    </target>
-
-    <!-- ================================================================== -->
-    <!--
-       - Build the nativewindow.jar files.
-      -->
-    <target name="build-jars" depends="gluegen.cpptasks.detect.os,build-jars-javase" />
-
-    <target name="setup-manifestfile">
-        <property name="manifestfile" value="nativewindowversion"/>
-        <copy file="${manifestfile}"
-          tofile="${build.nativewindow}/manifest.mf"
-          overwrite="true">
-          <filterset>
-              <filter token="VERSION" value="${nativewindow.version}"/>
-              <filter token="SCM_BRANCH" value="${jogl.build.branch}"/>
-              <filter token="SCM_COMMIT" value="${jogl.build.commit}"/>
-              <filter token="BASEVERSION" value="${nativewindow_base_version}"/>
-          </filterset>
-        </copy>
-    </target>
-
-    <target name="build-jars-awt" depends="setup-manifestfile" unless="setup.noAWT">
-        <jar manifest="${build.nativewindow}/manifest.mf" destfile="${nativewindow.awt.jar}" filesonly="true">
-            <fileset dir="${classes}"
-                     includes="${java.part.awt}"
-                     excludes="${java.excludes.awt}"/>
-        </jar>
-    </target>
-
-    <target name="build-jars-x11" depends="setup-manifestfile">
-        <jar manifest="${build.nativewindow}/manifest.mf" destfile="${nativewindow.os.x11.jar}" filesonly="true">
-            <fileset dir="${classes}"
-                     includes="${java.part.x11}" />
-        </jar>
-    </target>
-
-    <target name="build-jars-windows" depends="setup-manifestfile">
-        <jar manifest="${build.nativewindow}/manifest.mf" destfile="${nativewindow.os.win.jar}" filesonly="true">
-            <fileset dir="${classes}"
-                     includes="${java.part.windows}" />
-        </jar>
-    </target>
-
-    <target name="build-jars-macosx" depends="setup-manifestfile">
-        <jar manifest="${build.nativewindow}/manifest.mf" destfile="${nativewindow.os.macosx.jar}" filesonly="true">
-            <fileset dir="${classes}"
-                     includes="${java.part.macosx}" />
-        </jar>
-    </target>
-
-    <target name="build-jars-javase" depends="setup-manifestfile,build-jars-awt,build-jars-x11,build-jars-windows,build-jars-macosx">
-        <jar manifest="${build.nativewindow}/manifest.mf" destfile="${nativewindow.core.jar}" filesonly="true">
-            <fileset dir="${classes}"
-                     includes="${java.part.core}"
-                     excludes="${java.part.awt} ${java.part.x11} ${java.part.windows}"/>
-        </jar>
-        <jar manifest="${build.nativewindow}/manifest.mf" destfile="${build.nativewindow}/nativewindow-natives-${os.and.arch}.jar" filesonly="true">
-            <fileset dir="${obj.nativewindow}">
-              <include name="*.${native.library.suffix}" />
-            </fileset>
-        </jar>
-    </target>
-
-    <!-- ================================================================== -->
-    <!--
-       - Build the Javadocs for the sources.
-       - NOTE:  these are not entirely correct as the javadoc targets depend 
-       -        on the platform specific build targets.  To circumvent any 
-       -        errors, ensure that the source is built first.
-      -->
-    <target name="javadoc" depends="init">
-        <!-- Build the general public Javadoc -->
-        <javadoc packagenames="${javadoc.packagenames}"
-                 excludepackagenames="${java.excludes.javadoc.packagenames}"
-                 sourcepath="${src.java};${src.generated.java}"        
-                 classpath="${gluegen-rt.jar}"
-                 destdir="${javadoc}" windowtitle="${javadoc.windowtitle}"
-                 overview="${javadoc.overview}" 
-                 source="${target.sourcelevel}"
-                 linkoffline="${javadoc.link} 142-packages"
-         bottom="${javadoc.bottom}" >
-        </javadoc>
-    </target>
-
-    <target name="javadoc.spec" depends="init">
-        <!-- Build the specification Javadoc -->
-        <javadoc packagenames="${javadoc.spec.packagenames}"
-                 excludepackagenames="${java.excludes.javadoc.packagenames}"
-                 sourcepath="${src.java};${src.generated.java}"
-                 classpath="${gluegen-rt.jar}"
-                 destdir="${javadoc.spec}" windowtitle="${javadoc.windowtitle}"
-                 overview="${javadoc.overview}"
-                 source="${target.sourcelevel}"
-                 linkoffline="${javadoc.link} 142-packages"
-                 bottom="${javadoc.bottom}" >
-        </javadoc>
-    </target>
-                                                                                                                                   
-    <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}"        
-                 classpath="${gluegen-rt.jar}"
-                 destdir="${javadoc.dev}" windowtitle="${javadoc.windowtitle}"
-                 overview="${javadoc.overview}" 
-                 source="${target.sourcelevel}"
-                 linkoffline="${javadoc.link} 142-packages"
-         bottom="${javadoc.bottom}" >
-        </javadoc>
-    </target>
-
-    <target name="all.doc" description="Build NativeWindow docs" depends="init,javadoc,javadoc.spec,javadoc.dev" />
-
-    <!-- ================================================================== -->
-    <!--
-       - Clean up all that is built.
-      -->
-    <target name="clean" description="Remove all build products" depends="declare.common">
-        <delete includeEmptyDirs="true" quiet="true">
-            <fileset dir="${build.nativewindow}" />
-            <fileset dir="${javadoc}" />
-            <fileset dir="${javadoc.spec}" />
-            <fileset dir="${javadoc.dev}" />
-        </delete>
-    </target>
-
-    <!-- ================================================================== -->
-    <!--
-       - Build everything.
-      -->
-    <target name="all" description="Build NativeWindow JAR file(s) and native libraries." depends="init,java.compile,c.build.nativewindow,build-jars,generate.version.txt" />
-
-    <target name="generate.version.txt" depends="init">
-        <!-- Create a version.txt file indicating which version we just built -->
-        <echo message="${nativewindow.version}" file="${build.nativewindow}/version.txt" />
-    </target>
-
-</project>

=== removed directory '.pc/disable_android.diff'
=== removed directory '.pc/disable_android.diff/make'
=== removed file '.pc/disable_android.diff/make/build-newt.xml'
--- .pc/disable_android.diff/make/build-newt.xml	2011-10-06 15:53:38 +0000
+++ .pc/disable_android.diff/make/build-newt.xml	1970-01-01 00:00:00 +0000
@@ -1,762 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   - Ant build for NEWT.  This build has been tested with ANT 1.7.0.  The
-   - optional.jar that contains the optional ANT tasks must be in the ANT
-   - classpath (typically the ant/lib directory).
-   -
-   - A clean download of NEWT is required for this build.
-   -
-   - This build has no dependence on environment variables; the needed
-   - ones (e.g. java.home, ANT_HOME) are all set by the Ant wrapper shell
-   - script, by the virtual machine, or elsewhere. However, on all platforms,
-   - the C compiler and linker should be in the path. All other paths that
-   - need to be set are in host.properties.
-   -
-   - NOTE:  because the GlueGen config files have their own relative paths
-   -        which cannot be overridden by GlueGen, GlueGen MUST be run from
-   -        the "make" directory. This also means that this build.xml MUST
-   -        be run from the "make" directory.
-   -
-   - Public targets:
-   -   all: (default; autodetects OS and chooses C compiler from newt.properties)
-   -   clean:        clean all built
-   -   javadoc:      create the standard developer Javadoc (recommended)
-   -                 (Note: should build all first - may be dependence in the future)
-   -   javadoc.spec: create the standard developer Javadoc but exclude com.jogamp.* classes
-   -   javadoc.dev:  create the internal developer Javadoc.  This includes the
-   -                       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
-   - the building of the jar file. Thanks to Alex Radeski for the bulk of the
-   - port to the ant-contrib CPPTask framework. Thanks to Athomas Goldberg for
-   - the original OS detection code.
-   -
-   - Some environment defs affecting compilation
-
-   - Some environment defs affecting native compilation
-       setup.noNativeDesktop
-       setup.addNativeKD
-       setup.addNativeIntelGDL
-       setup.addNativeBroadcomEGL
-
-   - Internal settings, may not be necessary to set them manually,
-     since all JAR archives are orthogonal.
-       setup.noAWT
-       setup.noOpenGL
-
-   -->
-<project name="NEWT" basedir="." default="all">
-
-    <import file="build-common.xml"/>
-
-    <!-- needed for outofdate task -->
-    <taskdef resource="net/sf/antcontrib/antlib.xml">
-      <classpath> <pathelement location="${ant-contrib.jar}"/> </classpath>
-    </taskdef>
-
-    <!-- ================================================================== -->
-    <!--
-       - Base initialization and detection of operating system.
-      -->
-    <target name="base.init" depends="common.init">
-
-        <condition property="setup.nonatives">
-            <and>
-                <isfalse value="${isWindows}" />
-                <isfalse value="${isOSX}" />
-                <isfalse value="${isX11}" />
-                <isfalse value="${isAndroid}" />
-                <isfalse value="${setup.addNativeKD}" />
-                <isfalse value="${setup.addNativeIntelGDL}" />
-                <isfalse value="${setup.addNativeBroadcomEGL}" />
-            </and>
-        </condition>
-
-        <echo message="setup.noOpenGL: ${setup.noOpenGL}" />
-        <echo message="isWindows: ${isWindows}" />
-        <echo message="isOSX: ${isOSX}" />
-        <echo message="isX11: ${isX11}" />
-        <echo message="isAndroid: ${isAndroid}" />
-        <echo message="setup.addNativeKD: ${setup.addNativeKD}" />
-        <echo message="setup.addNativeIntelGDL: ${setup.addNativeIntelGDL}" />
-        <echo message="setup.addNativeBroadcomEGL: ${setup.addNativeBroadcomEGL}" />
-        <echo message="setup.nonatives: ${setup.nonatives}" />
-
-        <!-- partitioning -->
-
-        <property name="java.part.core"
-                  value="com/jogamp/newt/* com/jogamp/newt/event/* com/jogamp/newt/util/* jogamp/newt/* jogamp/newt/event/*"/>
-
-        <property name="java.part.opengl"
-                  value="com/jogamp/newt/opengl/**"/>
-
-        <property name="java.part.driver.awt"
-                  value="jogamp/newt/driver/awt/**"/>
-
-        <property name="java.part.awt"
-                  value="com/jogamp/newt/awt/** com/jogamp/newt/event/awt/** jogamp/newt/awt/** ${java.part.driver.awt}"/>
-
-        <property name="java.part.driver.x11"
-                  value="jogamp/newt/driver/x11/**"/>
-
-        <property name="java.part.driver.windows"
-                  value="jogamp/newt/driver/windows/**"/>
-
-        <property name="java.part.driver.macosx"
-                  value="jogamp/newt/driver/macosx/**"/>
-
-        <property name="java.part.driver.kd"
-                  value="jogamp/newt/driver/kd/**"/>
-
-        <property name="java.part.driver.intelgdl"
-                  value="jogamp/newt/driver/intel/gdl/**"/>
-
-        <property name="java.part.driver.broadcomegl"
-                  value="jogamp/newt/driver/broadcom/egl/**"/>
-
-        <property name="java.part.driver.android"
-                  value="jogamp/newt/driver/android/**"/>
-
-        <!-- condition excludes -->
-
-        <condition property="java.excludes.awt"
-                   value="${java.part.awt}">
-           <isset property="setup.noAWT"/>
-        </condition>
-
-        <condition property="java.excludes.opengl" value="${java.part.opengl}">
-           <isset property="setup.noOpenGL"/>
-        </condition>
-
-        <property name="java.excludes.all" value="${java.excludes.awt}, ${java.excludes.opengl}" />
-        <echo message="java.excludes.all: ${java.excludes.all}" />
-
-    </target>
-
-    <!-- ================================================================== -->
-    <!--
-       - Declare all paths and user defined variables.
-      -->
-    <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" />
-
-        <!-- The source directories. -->
-        <property name="src.java" value="${project.root}/${rootrel.src.java}" />
-        <property name="src.c"    value="${project.root}/${rootrel.src.c}" />
-
-        <!-- The generated source directories. -->
-        <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.newt}/classes" />
-
-        <property name="javah.classpath" value="${gluegen-rt.jar}:${build.nativewindow}/classes:${classes}" />
-
-        <!-- The javadoc dirs. -->
-        <property name="javadoc" value="${project.root}/javadoc_newt_public" />
-        <property name="javadoc.spec" value="${project.root}/javadoc_newt_spec" />
-        <property name="javadoc.dev" value="${project.root}/javadoc_newt_dev" />
-        <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.jogamp.newt, com.jogamp.newt.event, com.jogamp.newt.opengl, com.jogamp.newt.util" />
-
-        <property name="javadoc.packagenames" value="${javadoc.spec.packagenames}" />
-
-        <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">
-        <mkdir dir="${src.generated.c}" />
-        <mkdir dir="${src.generated.c}/Android" />
-        <mkdir dir="${src.generated.c}/X11" />
-        <mkdir dir="${src.generated.c}/MacOSX" />
-        <mkdir dir="${src.generated.c}/Windows" />
-        <mkdir dir="${src.generated.c}/KD" />
-        <mkdir dir="${src.generated.c}/IntelGDL" />
-        <mkdir dir="${src.generated.c}/BroadcomEGL" />
-        <mkdir dir="${classes}" />
-        <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="${target.sourcelevel}"
-               fork="yes"
-               includeAntRuntime="false"
-               memoryMaximumSize="${javac.memorymax}"
-               debug="${javacdebug}" debuglevel="${javacdebuglevel}">
-            <src path="${src.java}" />
-            <classpath refid="jogl_nativewindow_gluegen.classpath"/>
-        </javac>
-    </target>
-
-    <target name="java.compile" depends="java.compile.javase" />
-
-    <!-- ================================================================== -->
-    <!--
-       - Compile the native C code for JOGL (and optionally the Cg binding).
-      -->
-
-    <target name="c.configure.1" depends="gluegen.cpptasks.detect.os,gluegen.cpptasks.setup.compiler">
-      <!-- compiler configuration -->
-      <!-- Note that we can use the base setups in the gluegen-cpptasks for most of these -->
-      <compiler id="compiler.cfg.freebsd.newt" extends="compiler.cfg.freebsd">
-        <includepath path="/usr/local/include" />
-      </compiler>
-
-      <compiler id="compiler.cfg.linux.armv7.newt.x11" extends="compiler.cfg.linux.armv7">
-        <!-- Need to force /usr/include headers on to include path (after all others), due to crosscompiler usage -->
-        <compilerarg value="-idirafter" />
-        <compilerarg value="/usr/include" />
-      </compiler>
-
-      <!-- linker configuration -->
-
-      <linker id="linker.cfg.freebsd.newt.x11" extends="linker.cfg.freebsd">
-        <syslibset dir="/usr/local/lib" libs="X11"/>
-        <syslibset libs="Xrandr"/>
-        <syslibset dir="/usr/local/lib" libs="Xxf86vm" />
-      </linker>
-
-      <linker id="linker.cfg.freebsd.amd64.newt.x11" extends="linker.cfg.freebsd.amd64">
-        <syslibset dir="/usr/local/lib" libs="X11"/>
-        <syslibset libs="Xrandr"/>
-        <syslibset dir="/usr/local/lib" libs="Xxf86vm" />
-      </linker>
-
-      <linker id="linker.cfg.linux.newt.broadcom_egl" extends="linker.cfg.linux">
-        <syslibset libs="EGL"/>
-        <syslibset libs="GLES_CM"/>
-      </linker>
-
-      <linker id="linker.cfg.linux.newt.x11" extends="linker.cfg.linux">
-        <syslibset libs="X11"/>
-        <syslibset libs="Xrandr"/>
-        <syslibset libs="Xxf86vm" />
-      </linker>
-
-      <linker id="linker.cfg.linux.x86.newt.x11" extends="linker.cfg.linux.x86">
-        <syslibset libs="X11"/>
-        <syslibset libs="Xrandr"/>
-        <syslibset libs="Xxf86vm" />
-      </linker>
-
-      <linker id="linker.cfg.linux.amd64.newt.x11" extends="linker.cfg.linux.amd64">
-        <syslibset libs="X11"/>
-        <syslibset libs="Xrandr"/>
-        <syslibset libs="Xxf86vm" />
-      </linker>
-
-      <linker id="linker.cfg.linux.armv7.newt.x11" extends="linker.cfg.linux.armv7">
-        <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="X11" />
-        <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="Xrandr" />
-        <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="Xxf86vm" />
-      </linker>
-
-      <linker id="linker.cfg.android.newt" extends="linker.cfg.android">
-        <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="android" />
-      </linker>
-
-      <linker id="linker.cfg.solaris.newt.x11" extends="linker.cfg.solaris">
-        <syslibset libs="X11"/>
-      </linker>
-
-      <linker id="linker.cfg.solaris.sparcv9.newt.x11" extends="linker.cfg.solaris.sparcv9">
-        <syslibset dir="/usr/lib/sparcv9" libs="X11"/>
-      </linker>
-
-      <linker id="linker.cfg.solaris.amd64.newt.x11" extends="linker.cfg.solaris.amd64">
-        <syslibset dir="/usr/lib/amd64" libs="X11"/>
-      </linker>
-
-      <linker id="linker.cfg.win32.mingw.newt" extends="linker.cfg.win32.mingw">
-        <linkerarg value="-Wl,--kill-at" />        <!-- remove @ from function names -->
-        <syslibset libs="gdi32, kernel32"/>
-      </linker>
-
-      <linker id="linker.cfg.win64.mingw.newt" extends="linker.cfg.win64.mingw">
-        <linkerarg value="-Wl,--kill-at" />        <!-- remove @ from function names -->
-        <syslibset libs="gdi32, kernel32"/>
-      </linker>
-
-      <linker id="linker.cfg.win32.msvc.newt" extends="linker.cfg.win32.msvc">
-        <syslibset libs="gdi32, user32, kernel32" />
-      </linker>
-
-      <linker id="linker.cfg.macosx.newt" extends="linker.cfg.macosx">
-        <linkerarg value="-framework" />
-        <linkerarg value="Cocoa" />
-      </linker>
-
-      <linker id="linker.cfg.hpux.newt" extends="linker.cfg.hpux">
-        <syslibset dir="/usr/lib" libs="X11"/>
-      </linker>
-    </target>
-
-    <target name="c.configure.win32.vc" if="isVCFamily">
-      <echo message="Win32.VC" />
-      <property name="compiler.cfg.id"                      value="compiler.cfg.win32.msvc" />
-      <property name="linker.cfg.id.oswin"                  value="linker.cfg.win32.msvc.newt" />
-    </target>
-
-    <target name="c.configure.win32.mingw" if="isMingW32">
-      <echo message="Win32.MingW" />
-      <property name="compiler.cfg.id"                      value="compiler.cfg.win32.mingw" />
-      <property name="linker.cfg.id.oswin"                  value="linker.cfg.win32.mingw.newt" />
-    </target>
-
-    <target name="c.configure.win64.mingw" if="isMingW64">
-      <echo message="Win64.MingW" />
-      <property name="compiler.cfg.id"                      value="compiler.cfg.win64.mingw" />
-      <property name="linker.cfg.id.oswin"                  value="linker.cfg.win64.mingw.newt" />
-    </target>
-
-    <target name="c.configure.linux.x86" if="isLinuxX86">
-      <echo message="Linux.x86" />
-      <property name="compiler.cfg.id"                      value="compiler.cfg.linux.x86" />
-      <condition property="linker.cfg.id.oswin"             value="linker.cfg.linux.x86.newt.x11"
-                                                            else="linker.cfg.linux.x86">
-          <isset property="isX11" />
-      </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" />
-      <condition property="linker.cfg.id.oswin"             value="linker.cfg.linux.amd64.newt.x11"
-                                                            else="linker.cfg.linux.amd64">
-          <isset property="isX11" />
-      </condition>
-      <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
-    </target>
-
-    <target name="c.configure.linux.armv7" if="isLinuxARMv7">
-      <echo message="Linux.armv7" />
-      <property name="compiler.cfg.id"                      value="compiler.cfg.linux.armv7.newt.x11" />
-      <condition property="linker.cfg.id.oswin"             value="linker.cfg.linux.armv7.newt.x11"
-                                                            else="linker.cfg.linux.armv7">
-          <isset property="isX11" />
-      </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" />
-      <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.newt.x11" />
-    </target>
-
-    <target name="c.configure.linux" depends="c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.armv7,c.configure.linux.ia64,c.configure.x11" if="isLinux"/>
-
-    <target name="c.configure.android" if="isAndroid">
-      <echo message="Android" />
-      <property name="compiler.cfg.id"                      value="compiler.cfg.android" />
-      <property name="linker.cfg.id.oswin"                  value="linker.cfg.android.newt" />
-    </target>
-    
-    <target name="c.configure.solaris32" depends="c.configure.x11" if="isSolaris32Bit">
-      <echo message="Solaris" />
-      <property name="compiler.cfg.id"                      value="compiler.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.oswin"                  value="linker.cfg.solaris.sparcv9.newt.x11" />
-    </target>
-
-
-    <target name="c.configure.solaris.amd64" depends="c.configure.x11" if="isSolarisAMD64">
-      <echo message="SolarisAMD64" />
-      <property name="compiler.cfg.id"                      value="compiler.cfg.solaris.amd64" />
-      <property name="linker.cfg.id.oswin"                  value="linker.cfg.solaris.amd64.newt.x11" />
-    </target>
-
-    <target name="c.configure.freebsd.x86" if="isFreeBSDX86">
-      <echo message="FreeBSD.x86" />
-      <property name="compiler.cfg.id"                      value="compiler.cfg.freebsd.newt" />
-      <condition property="linker.cfg.id.oswin"             value="linker.cfg.freebsd.newt.x11"
-                                                            else="linker.cfg.freebsd">
-          <isset property="isX11" />
-      </condition>
-      <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
-    </target>
-
-    <target name="c.configure.freebsd.amd64" if="isFreeBSDAMD64">
-      <echo message="FreeBSD.AMD64" />
-      <property name="compiler.cfg.id"                      value="compiler.cfg.freebsd.newt" />
-      <condition property="linker.cfg.id.oswin"             value="linker.cfg.freebsd.amd64.newt.x11"
-                                                            else="linker.cfg.freebsd.amd64">
-          <isset property="isX11" />
-      </condition>
-      <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
-    </target>
-
-    <target name="c.configure.freebsd" depends="c.configure.freebsd.x86,c.configure.freebsd.amd64,c.configure.x11" if="isFreeBSD"/>
-
-    <target name="c.configure.hpux" depends="c.configure.x11" if="isHPUX">
-      <echo message="HP-UX" />
-      <property name="compiler.cfg.id"                      value="compiler.cfg.hpux" />
-      <property name="linker.cfg.id.oswin"                  value="linker.cfg.hpux.newt.x11" />
-    </target>
-
-    <target name="c.configure.win32" depends="c.configure.win32.vc,c.configure.win32.mingw,c.configure.win64.mingw" if="isWindows" />
-
-    <target name="c.configure.x11" if="isX11" />
-
-    <target name="c.configure.macosx" if="isOSX">
-      <property name="compiler.cfg.id"                      value="compiler.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.android,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" />
-
-    <target name="rename.mingw.dll" if="isMingW">
-        <move file="${src}" tofile="${dest}" />
-    </target>
-
-    <target name="rename.dylib" if="isOSX">
-        <move file="${src}" tofile="${dest}" />
-    </target>
-
-    <macrodef name="c.build">
-      <attribute name="c.compiler.src.files" />
-      <attribute name="compiler.cfg.id" />
-      <attribute name="linker.cfg.id" />
-      <attribute name="output.lib.name" />
-      <attribute name="c.compiler.use-jawt" default="false"/>
-      <sequential>
-        <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" />
-
-        <condition property="c.compiler.use-debug"><istrue value="${c.compiler.debug}"/></condition>
-
-        <patternset id="c.src.files.newt">
-          <include name="${rootrel.src.c}/NewtCommon.c" />
-          <include name="${rootrel.src.c}/WindowsWindow.c" if="isWindows"/>
-          <include name="${rootrel.src.c}/*.m"             if="isOSX"/>
-          <include name="${rootrel.src.c}/AndroidWindow.c" if="isAndroid"/>
-          <include name="${rootrel.src.c}/X11Window.c"     if="isX11"/>
-          <include name="${rootrel.src.c}/KDWindow.c"      if="setup.addNativeKD"/>
-          <include name="${rootrel.src.c}/IntelGDL.c"      if="setup.addNativeIntelGDL"/>
-          <include name="${rootrel.src.c}/BroadcomEGL.c"   if="setup.addNativeBroadcomEGL"/>
-        </patternset>
-
-        <echo message="Compiling @{output.lib.name}" />
-
-        <!-- have to wrap cc task with outofdate, because otherwise cc links a new library
-             even when no files have been compiled -->
-        <outofdate>
-          <sourcefiles>
-            <fileset dir="${project.root}"><patternset refid="@{c.compiler.src.files}"/></fileset>
-          </sourcefiles>
-          <targetfiles>
-            <fileset dir="${obj.newt}" includes="lib@{output.lib.name}.so"/>
-            <fileset dir="${obj.newt}" includes="@{output.lib.name}.dll"/>
-            <fileset dir="${obj.newt}" includes="lib@{output.lib.name}.jnilib"/>
-          </targetfiles>
-          <sequential>
-            <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">
-    
-              <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}"/>
-                <sysincludepath path="${stub.includes.gluegen.cc}"/>
-                <includepath path="stub_includes/khr"/>
-                <includepath path="stub_includes/egl"/>
-                <!-- This is for finding Xrandr.h on Solaris. -->
-                <includepath path="/usr/X11/include" />
-                <!-- This is for the generated headers for handwritten C code -->
-                <includepath path="${src.generated.c}" />
-                <includepath path="${src.generated.c}/Android"      if="isAndroid"/>
-                <includepath path="${src.generated.c}/X11"          if="isX11"/>
-                <includepath path="${src.generated.c}/MacOSX"       if="isOSX"/>
-                <includepath path="${src.generated.c}/Windows"      if="isWindows"/>
-                <includepath path="${src.generated.c}/KD"           if="setup.addNativeKD" />
-                <includepath path="${src.generated.c}/IntelGDL"     if="setup.addNativeIntelGDL" />
-                <includepath path="stub_includes/embedded/IntelGDL" if="setup.addNativeIntelGDL" />
-                <includepath path="${src.generated.c}/BroadcomEGL"  if="setup.addNativeBroadcomEGL" />
-    
-                <!-- 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.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="${obj.newt}/lib@{output.lib.name}.dylib" />
-                <param name="dest" value="${obj.newt}/lib@{output.lib.name}.jnilib" />
-            </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="${obj.newt}/lib@{output.lib.name}.so" />
-                <param name="dest" value="${obj.newt}/@{output.lib.name}.dll" />
-            </antcall>
-
-          	<!-- this stripping may be called more than once on the same library dir,
-          	     but that should cause no harm, and doing it here inside outofdate
-          	     prevents the JARs from always being rebuilt even if no source code changes -->
-          	<antcall target="gluegen.cpptasks.striplibs" inheritRefs="true">
-                <param name="libdir" value="${obj.newt}"/>
-            </antcall>
-
-          </sequential>
-        </outofdate>
-      </sequential>
-    </macrodef>
-
-    <target name="c.build.newt.prepare">
-      <javah destdir="${src.generated.c}/KD"          classpath="${javah.classpath}" class="jogamp.newt.driver.kd.KDWindow" />
-
-      <javah destdir="${src.generated.c}/IntelGDL"    classpath="${javah.classpath}" class="jogamp.newt.driver.intel.gdl.Display" />
-      <javah destdir="${src.generated.c}/IntelGDL"    classpath="${javah.classpath}" class="jogamp.newt.driver.intel.gdl.Screen" />
-      <javah destdir="${src.generated.c}/IntelGDL"    classpath="${javah.classpath}" class="jogamp.newt.driver.intel.gdl.Window" />
-
-      <javah destdir="${src.generated.c}/BroadcomEGL" classpath="${javah.classpath}" class="jogamp.newt.driver.broadcom.egl.Window" />
-
-      <javah destdir="${src.generated.c}/Windows"     classpath="${javah.classpath}" class="jogamp.newt.driver.windows.WindowsWindow" />
-      <javah destdir="${src.generated.c}/Windows"     classpath="${javah.classpath}" class="jogamp.newt.driver.windows.WindowsScreen" />
-      <javah destdir="${src.generated.c}/Windows"     classpath="${javah.classpath}" class="jogamp.newt.driver.windows.WindowsDisplay" />
-      <javah destdir="${src.generated.c}/MacOSX"      classpath="${javah.classpath}" class="jogamp.newt.driver.macosx.MacWindow" />
-      <javah destdir="${src.generated.c}/MacOSX"      classpath="${javah.classpath}" class="jogamp.newt.driver.macosx.MacScreen" />
-      <javah destdir="${src.generated.c}/MacOSX"      classpath="${javah.classpath}" class="jogamp.newt.driver.macosx.MacDisplay" />
-      <javah destdir="${src.generated.c}/X11"         classpath="${javah.classpath}" class="jogamp.newt.driver.x11.X11Window" />
-      <javah destdir="${src.generated.c}/X11"         classpath="${javah.classpath}" class="jogamp.newt.driver.x11.X11Screen" />
-      <javah destdir="${src.generated.c}/X11"         classpath="${javah.classpath}" class="jogamp.newt.driver.x11.X11Display" />
-      <javah destdir="${src.generated.c}/Android"     classpath="${javah.classpath}:${android.jar}" class="jogamp.newt.driver.android.AndroidWindow" />
-    </target>
-
-    <target name="c.build.newt.windowlib" unless="setup.nonatives">
-      <c.build c.compiler.src.files="c.src.files.newt"
-               output.lib.name="newt"
-               compiler.cfg.id="${compiler.cfg.id}"
-               linker.cfg.id="${linker.cfg.id.oswin}"/>
-    </target>
-
-    <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.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="c.manifest" inheritRefs="true" />
-    </target>
-
-    <!-- ================================================================== -->
-    <!--
-       - Build the newt.jar files.
-      -->
-    <target name="build-jars" depends="gluegen.cpptasks.detect.os,build-jars-javase" />
-
-    <target name="setup-manifestfile">
-        <property name="manifestfile" value="newtversion"/>
-        <copy file="${manifestfile}"
-          tofile="${build.newt}/manifest.mf"
-          overwrite="true">
-          <filterset>
-              <filter token="VERSION" value="${newt.version}"/>
-              <filter token="SCM_BRANCH" value="${jogl.build.branch}"/>
-              <filter token="SCM_COMMIT" value="${jogl.build.commit}"/>
-              <filter token="BASEVERSION" value="${newt_base_version}"/>
-          </filterset>
-        </copy>
-    </target>
-
-    <target name="build-jars-awt" depends="setup-manifestfile" unless="setup.noAWT">
-        <jar manifest="${build.newt}/manifest.mf" destfile="${newt.awt.jar}" filesonly="true">
-            <fileset dir="${classes}"
-                     includes="${java.part.awt}"/>
-        </jar>
-    </target>
-
-    <target name="build-jars-opengl" depends="setup-manifestfile" unless="setup.noOpenGL">
-        <jar manifest="${build.newt}/manifest.mf" destfile="${newt.ogl.jar}" filesonly="true">
-            <fileset dir="${classes}"
-                     includes="${java.part.opengl}"/>
-        </jar>
-    </target>
-
-    <target name="build-jars-driver" depends="setup-manifestfile">
-        <jar manifest="${build.newt}/manifest.mf" destfile="${newt.driver.x11.jar}" filesonly="true">
-            <fileset dir="${classes}"
-                     includes="${java.part.driver.x11}"/>
-        </jar>
-        <jar manifest="${build.newt}/manifest.mf" destfile="${newt.driver.win.jar}" filesonly="true">
-            <fileset dir="${classes}"
-                     includes="${java.part.driver.windows}"/>
-        </jar>
-        <jar manifest="${build.newt}/manifest.mf" destfile="${newt.driver.macosx.jar}" filesonly="true">
-            <fileset dir="${classes}"
-                     includes="${java.part.driver.macosx}"/>
-        </jar>
-        <jar manifest="${build.newt}/manifest.mf" destfile="${newt.driver.android.jar}" filesonly="true">
-            <fileset dir="${classes}"
-                     includes="${java.part.driver.android}"/>
-        </jar>
-        <jar manifest="${build.newt}/manifest.mf" destfile="${newt.driver.kd.jar}" filesonly="true">
-            <fileset dir="${classes}"
-                     includes="${java.part.driver.kd}"/>
-        </jar>
-        <jar manifest="${build.newt}/manifest.mf" destfile="${newt.driver.broadcomegl.jar}" filesonly="true">
-            <fileset dir="${classes}"
-                     includes="${java.part.driver.broadcomegl}"/>
-        </jar>
-        <jar manifest="${build.newt}/manifest.mf" destfile="${newt.driver.intelgdl.jar}" filesonly="true">
-            <fileset dir="${classes}"
-                     includes="${java.part.driver.intelgdl}"/>
-        </jar>
-    </target>
-
-    <target name="build-jars-javase" depends="setup-manifestfile,build-jars-opengl,build-jars-awt,build-jars-driver">
-        <jar manifest="${build.newt}/manifest.mf" destfile="${newt.core.jar}" filesonly="true">
-            <fileset dir="${classes}"
-                     includes="${java.part.core}"/>
-        </jar>
-        <jar manifest="${build.newt}/manifest.mf" destfile="${newt.event.jar}" filesonly="true">
-            <fileset dir="${classes}">
-                <include name="com/jogamp/newt/Display*" />
-                <include name="com/jogamp/newt/Screen*" />
-                <include name="com/jogamp/newt/Window*" />
-                <include name="com/jogamp/newt/ScreenMode*" />
-                <include name="com/jogamp/newt/event/**" />
-                <include name="jogamp/newt/Debug*" />
-            </fileset>
-        </jar>
-        <jar manifest="${build.newt}/manifest.mf" destfile="${build.newt}/newt-natives-${os.and.arch}.jar" filesonly="true">
-            <fileset dir="${obj.newt}">
-              <include name="*.${native.library.suffix}" />
-            </fileset>
-        </jar>
-    </target>
-
-    <!-- ================================================================== -->
-    <!--
-       - 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
-       -        errors, ensure that the source is built first.
-      -->
-    <target name="javadoc" depends="init">
-        <!-- Build the general Javadoc -->
-        <javadoc packagenames="${javadoc.packagenames}"
-                 excludepackagenames="${java.excludes.javadoc.packagenames}"
-                 sourcepath="${src.java};${src.generated.java}"
-                 destdir="${javadoc}" windowtitle="${javadoc.windowtitle}"
-                 overview="${javadoc.overview}"
-                 source="${target.sourcelevel}"
-                 linkoffline="${javadoc.link} 142-packages"
-         bottom="${javadoc.bottom}" >
-         <classpath refid="jogl_nativewindow_gluegen.classpath"/>
-        </javadoc>
-    </target>
-
-    <target name="javadoc.spec" depends="init">
-        <!-- Build the general Javadoc -->
-        <javadoc packagenames="${javadoc.spec.packagenames}"
-                 excludepackagenames="${java.excludes.javadoc.packagenames}"
-                 sourcepath="${src.java};${src.generated.java}"
-                 destdir="${javadoc.spec}" windowtitle="${javadoc.windowtitle}"
-                 overview="${javadoc.overview}"
-                 source="${target.sourcelevel}"
-                 linkoffline="${javadoc.link} 142-packages"
-                 bottom="${javadoc.bottom}" >
-         <classpath refid="jogl_nativewindow_gluegen.classpath"/>
-        </javadoc>
-    </target>
-
-    <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}"
-                 destdir="${javadoc.dev}" windowtitle="${javadoc.windowtitle}"
-                 overview="${javadoc.overview}"
-                 source="${target.sourcelevel}"
-                 linkoffline="${javadoc.link} 142-packages"
-         bottom="${javadoc.bottom}" >
-         <classpath refid="jogl_nativewindow_gluegen.classpath"/>
-        </javadoc>
-    </target>
-
-    <target name="all.doc" description="Build NEWT docs" depends="init,javadoc,javadoc.spec,javadoc.dev" />
-
-    <!-- ================================================================== -->
-    <!--
-       - Clean up all that is built.
-      -->
-    <target name="clean" description="Remove all build products" depends="declare.common">
-        <delete includeEmptyDirs="true" quiet="true">
-            <fileset dir="${build.newt}" />
-            <fileset dir="${javadoc}" />
-            <fileset dir="${javadoc.spec}" />
-            <fileset dir="${javadoc.dev}" />
-        </delete>
-    </target>
-
-    <!-- ================================================================== -->
-    <!--
-       - Build everything.
-      -->
-    <target name="all" description="Build NEWT JAR file(s) and native libraries." depends="init,java.compile,c.build.newt,build-jars,generate.version.txt" />
-
-    <target name="generate.version.txt" depends="init">
-        <!-- Create a version.txt file indicating which version we just built -->
-        <echo message="${newt.version}" file="${build.newt}/version.txt" />
-    </target>
-
-</project>

=== removed file '.pc/disable_android.diff/make/build-test.xml'
--- .pc/disable_android.diff/make/build-test.xml	2011-10-06 15:53:38 +0000
+++ .pc/disable_android.diff/make/build-test.xml	1970-01-01 00:00:00 +0000
@@ -1,495 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="JOGLTest" basedir="." default="all">
-
-    <description>JUNIT Tests JOGL</description>
-
-    <import file="build-common.xml"/>
-
-    <taskdef resource="net/sf/antcontrib/antlib.xml">
-      <classpath> <pathelement location="${ant-contrib.jar}"/> </classpath>
-    </taskdef>
-
-    <!-- ================================================================== -->
-    <!-- 
-       - Declare all paths and user defined variables.
-      -->
-    <target name="declare.common" description="Declare properties" depends="common.init">
-        <property name="rootrel.src.test"     value="src/test" />
-        <property name="src.test"             value="${project.root}/${rootrel.src.test}" />
-
-        <property name="classes"              value="${build.test}/classes" />
-        <property name="classes.path"         location="${classes}"/> <!-- absolute path -->
-
-        <property name="java.part.test"       value="com/jogamp/** jogamp/**"/>
-        <property name="java.dir.test"        value="com/jogamp/opengl/test"/>
-        <property name="java.dir.junit"       value="${java.dir.test}/junit"/>
-        <property name="java.dir.bugs"        value="${java.dir.test}/bugs"/>
-
-        <property name="test.archive.name"    value="${archive.name}-test-results-${build.node.name}"/>
-        <condition property="jvmarg.mainthrd" value="-XstartOnFirstThread"><isset property="isOSX"/></condition>
-        <condition property="jvmarg.mainthrd" value="-Ddummy"><not><isset property="isOSX"/></not></condition>
-        <condition property="jvmarg.headless" value="-XstartOnFirstThread -Djava.awt.headless=true"><isset property="isOSX"/></condition>
-        <condition property="jvmarg.headless" value="-Djava.awt.headless=true"><not><isset property="isOSX"/></not></condition>
-
-        <property name="batchtest.timeout"    value="1800000"/> <!-- 30 min -->
-    </target>
-    
-    <!-- ================================================================== -->
-    <!--
-       - Clean up all that is built.
-      -->
-    <target name="clean" description="Remove all build products" depends="declare.common">
-        <delete includeEmptyDirs="true" quiet="true">
-            <fileset dir="${build.test}" />
-            <fileset dir="." includes="*.tga" />
-            <fileset file="${jogl.test.jar}" />
-        </delete>
-    </target>
-
-    <!-- ================================================================== -->
-    <!--
-       - Build/run tests/junit.
-      -->
-    <target name="test.compile.check" depends="declare.common">
-      <!-- Create the required output directories. -->
-      <mkdir dir="${obj.test}" />
-      <mkdir dir="${classes}" />
-
-      <!-- Clean the results -->
-      <delete quiet="true">
-        <fileset dir="${results.test}" includes="**"/>
-        <fileset file="${build}/${test.archive.name}.7z"/>
-        <fileset dir="." includes="*.tga" />
-      </delete>
-      <mkdir dir="${results.test}" />
-
-      <property name="jogl.test.jar.path" location="${jogl.test.jar}"/> <!-- absolute path -->
-      <echo message="jogl.test.jar ${jogl.test.jar.path}"/>
-      <uptodate property="test.compile.skip">
-        <srcfiles dir= "."                 includes="*.xml"/>
-        <srcfiles dir= "${src.test}"       includes="**"/>
-        <srcfiles                          file="${gluegen.jar}" />
-        <srcfiles                          dir="${src}/nativewindow" />
-        <srcfiles                          dir="${src}/jogl" />
-        <srcfiles                          dir="${src}/newt" />
-        <mapper type="merge" to="${jogl.test.jar.path}"/>
-      </uptodate>
-    </target>
-
-    <target name="test.compile" depends="test.compile.check" unless="test.compile.skip">
-        <!-- Perform the junit pass Java compile -->
-        <javac destdir="${classes}"
-               source="${host.sourcelevel}"
-               fork="yes"
-               memoryMaximumSize="${javac.memorymax}"
-               includeAntRuntime="false"
-               debug="${javacdebug}" debuglevel="${javacdebuglevel}">
-            <classpath refid="junit_jogl_newt_android.compile.classpath"/>
-            <src path="${src.test}" />
-        </javac>
-        <!-- include any resource files that tests may require -->
-        <copy todir="${classes}">
-            <fileset dir="${src.test}">
-                <exclude name="**/*.java"/>
-            </fileset>
-        </copy>
-        <jar destfile="${jogl.test.jar}" filesonly="true">
-            <!-- get all class files, but skip any resource files that external tools
-                 might have copied into the class directory (otherwise, it's possible
-                 to get the same resource file twice in the jar) -->
-            <fileset dir="${classes}"
-                includes="${java.part.test}"/>
-        </jar>
-    </target>
-
-    <target name="test.manual.run" depends="test.compile">
-        <for param="test.class.path.m" keepgoing="true">
-            <!-- results in absolute path -->
-            <fileset dir="${classes}">
-                <include name="${java.dir.bugs}/**/*Test*"/>
-                <exclude name="**/*$$*"/>
-            </fileset>
-          <sequential>
-            <var name="test.class.path" unset="true"/>
-            <property name="test.class.path" basedir="${classes}" relative="true" location="@{test.class.path.m}"/>
-            <var name="test.class.fqn" unset="true"/>
-            <pathconvert property="test.class.fqn">
-              <fileset file="${classes}${file.separator}${test.class.path}"/>
-              <chainedmapper>
-                  <globmapper    from="${classes.path}${file.separator}*" to="*"/> <!-- rel. -->
-                  <packagemapper from="*.class"           to="*"/> <!-- FQCN -->
-              </chainedmapper>
-            </pathconvert>
-            <var name="test.class.result.file" value="${results.test}/TEST-${test.class.fqn}.log"/>
-            <echo message="Testing ${test.class.fqn} -- ${test.class.result.file}"/>
-            <apply dir="." executable="${java.home}/bin/java" 
-                 parallel="false" 
-                 timeout="${batchtest.timeout}"
-                 vmlauncher="false"
-                 relative="true"
-                 failonerror="false"
-                 output="${test.class.result.file}">
-                <env key="${system.env.library.path}" path="${obj.all.paths}"/>
-                <env key="CLASSPATH" value="${junit_jogl_awt.run.jars}"/>
-                <arg value="-Djava.library.path=${obj.all.paths}"/>
-                <!--
-                <arg line="-Dnewt.debug.EDT"/>
-                -->
-                <srcfile/>
-                <mappedresources>
-                    <fileset dir="${classes}" includes="${test.class.path}"/>
-                    <packagemapper from="*.class" to="*"/>
-                </mappedresources>
-            </apply>
-          </sequential>
-        </for>
-        <antcall target="test-zip-archive" inheritRefs="true" inheritAll="true"/>
-    </target>
-
-    <target name="junit.run.noui" depends="test.compile">
-        <!-- Test*NOUI* -->
-        <junit forkmode="perTest" showoutput="true" fork="true" haltonerror="off" timeout="${batchtest.timeout}">
-            <env key="${system.env.library.path}" path="${obj.all.paths}"/>
-            <jvmarg value="-Djava.library.path=${obj.all.paths}"/>
-
-            <!--
-            <jvmarg value="-Djogl.debug=all"/>
-            <jvmarg value="-Dgluegen.debug.NativeLibrary=true"/>
-            <jvmarg value="-Dgluegen.debug.ProcAddressHelper=true"/>
-            <jvmarg value="-Djogl.debug.GLSLState"/>
-            <jvmarg value="-Dnativewindow.debug=all"/>
-            <jvmarg value="-verbose:jni"/> 
-            <jvmarg value="-client"/>
-            <jvmarg value="-d32"/>
-            -->
-
-            <formatter usefile="false" type="plain"/>
-            <formatter usefile="true" type="xml"/>
-            <classpath refid="junit_jogl_awt.run.classpath"/>
-
-            <batchtest todir="${results.test}">
-              <fileset dir="${classes}">
-                  <include name="${java.dir.junit}/**/Test*NOUI*"/>
-                  <exclude name="**/*$$*"/>
-              </fileset>
-              <formatter usefile="false" type="brief"/>
-              <formatter usefile="true" type="xml"/>
-            </batchtest>
-        </junit>
-    </target>
-
-    <target name="junit.run.newt.headless" depends="test.compile">
-        <!-- Test*NEWT* 
-
-             Emulation of junit task,
-             due to the fact that we have to place invoke our MainThread class first (-> MacOSX).
-
-             Utilizing Ant-1.8.0 and ant-contrib-1.0b3 (loops, mutable properties).
-          --> 
-        <for param="test.class.path.m" keepgoing="true">
-            <!-- results in absolute path -->
-            <fileset dir="${classes}">
-                <include name="${java.dir.junit}/**/Test*NEWT*"/>
-                <exclude name="**/*$$*"/>
-            </fileset>
-          <sequential>
-            <var name="test.class.path" unset="true"/>
-            <property name="test.class.path" basedir="${classes}" relative="true" location="@{test.class.path.m}"/>
-            <var name="test.class.fqn" unset="true"/>
-            <pathconvert property="test.class.fqn">
-              <fileset file="${classes}${file.separator}${test.class.path}"/>
-              <chainedmapper>
-                  <globmapper    from="${classes.path}${file.separator}*" to="*"/> <!-- rel. -->
-                  <packagemapper from="*.class"           to="*"/> <!-- FQCN -->
-              </chainedmapper>
-            </pathconvert>
-            <var name="test.class.result.file" value="${results.test}/TEST-${test.class.fqn}.xml"/>
-            <echo message="Testing ${test.class.fqn} -- ${test.class.result.file}"/>
-            <apply dir="." executable="${java.home}/bin/java" 
-                 parallel="false" 
-                 timeout="${batchtest.timeout}"
-                 vmlauncher="false"
-                 relative="true"
-                 failonerror="false">
-                <env key="${system.env.library.path}" path="${obj.all.paths}"/>
-                <env key="CLASSPATH" value="${junit_jogl_noawt.run.jars}"/>
-                <arg value="-Djava.library.path=${obj.all.paths}"/>
-                <arg line="${jvmarg.headless}"/>
-                <!--
-                <arg line="-Dnewt.debug.EDT"/>
-                -->
-                <arg line="com.jogamp.newt.util.MainThread"/>
-                <arg line="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner"/>
-                <srcfile/>
-                <arg line="filtertrace=true"/>
-                <arg line="haltOnError=false"/>
-                <arg line="haltOnFailure=false"/>
-                <arg line="showoutput=true"/>
-                <arg line="outputtoformatters=true"/>
-                <arg line="logfailedtests=true"/>
-                <arg line="logtestlistenerevents=true"/>
-                <arg line="formatter=org.apache.tools.ant.taskdefs.optional.junit.PlainJUnitResultFormatter"/>
-                <arg line="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.class.result.file}"/>
-                <mappedresources>
-                    <fileset dir="${classes}" includes="${test.class.path}"/>
-                    <packagemapper from="*.class" to="*"/>
-                </mappedresources>
-            </apply>
-          </sequential>
-        </for>
-    </target>
-
-    <!-- junit.run.newt is covered by junit.run.newt.headless, disable it for now, but may be checked manually.
-         This test target would also overwrite the test result XML files, we would also need a solution here for hudson,
-         if run in parallel.
-         NEWT is currently not supported on OSX 
-      -->
-    <target name="junit.run.newt" depends="test.compile">
-        <!-- Test*NEWT* -->
-        <junit forkmode="perTest" showoutput="true" fork="true" haltonerror="off" timeout="${batchtest.timeout}">
-            <env key="${system.env.library.path}" path="${obj.all.paths}"/>
-            <jvmarg value="-Djava.library.path=${obj.all.paths}"/>
-
-            <!--
-            <jvmarg value="-Dnewt.debug.EDT"/>
-            <jvmarg value="-Djogl.debug=all"/>
-            <jvmarg value="-Dgluegen.debug.NativeLibrary=true"/>
-            <jvmarg value="-Dgluegen.debug.ProcAddressHelper=true"/>
-            <jvmarg value="-Djogl.debug.GLSLState"/>
-            <jvmarg value="-Dnativewindow.debug=all"/>
-            <jvmarg value="-Dnewt.debug=all"/>
-            <jvmarg value="-verbose:jni"/> 
-            <jvmarg value="-client"/>
-            <jvmarg value="-d32"/>
-            -->
-
-            <formatter usefile="false" type="plain"/>
-            <formatter usefile="true" type="xml"/>
-            <classpath refid="junit_jogl_noawt.run.classpath"/>
-
-            <batchtest todir="${results.test}">
-              <fileset dir="${classes}">
-                  <include name="${java.dir.junit}/**/Test*NEWT*"/>
-                  <exclude name="**/*$$*"/>
-              </fileset>
-              <formatter usefile="false" type="brief"/>
-              <formatter usefile="true" type="xml"/>
-            </batchtest>
-        </junit>
-    </target>
-
-    <target name="junit.run.awt" depends="test.compile">
-        <!-- Test*AWT* -->
-        <junit forkmode="perTest" showoutput="true" fork="true" haltonerror="off" timeout="${batchtest.timeout}">
-            <env key="${system.env.library.path}" path="${obj.all.paths}"/>
-            <jvmarg value="-Djava.library.path=${obj.all.paths}"/>
-
-            <!--
-            <jvmarg value="-Djogl.debug=all"/>
-            <jvmarg value="-Dgluegen.debug.NativeLibrary=true"/>
-            <jvmarg value="-Dgluegen.debug.ProcAddressHelper=true"/>
-            <jvmarg value="-Djogl.debug.GLSLState"/>
-            <jvmarg value="-Dnativewindow.debug=all"/>
-            <jvmarg value="-verbose:jni"/> 
-            <jvmarg value="-client"/>
-            <jvmarg value="-d32"/>
-            -->
-
-            <formatter usefile="false" type="plain"/>
-            <formatter usefile="true" type="xml"/>
-            <classpath refid="junit_jogl_awt.run.classpath"/>
-
-            <batchtest todir="${results.test}">
-              <fileset dir="${classes}">
-                  <include name="${java.dir.junit}/**/Test*AWT*"/>
-                  <exclude name="**/*$$*"/>
-                  <exclude name="**/*SWT*"/>
-                  <exclude name="**/newt/**"/>
-              </fileset>
-              <formatter usefile="false" type="brief"/>
-              <formatter usefile="true" type="xml"/>
-            </batchtest>
-        </junit>
-    </target>
-
-    <target name="junit.run.awt.singletest" depends="test.compile">
-        <!-- Test*AWT* -->
-        <junit forkmode="perTest" showoutput="true" fork="true" haltonerror="off" timeout="${batchtest.timeout}">
-            <env key="${system.env.library.path}" path="${obj.all.paths}"/>
-            <jvmarg value="-Djava.library.path=${obj.all.paths}"/>
-
-            <!--
-            <jvmarg value="-Djogl.debug=all"/>
-            <jvmarg value="-Dgluegen.debug.NativeLibrary=true"/>
-            <jvmarg value="-Dgluegen.debug.ProcAddressHelper=true"/>
-            <jvmarg value="-Djogl.debug.GLSLState"/>
-            <jvmarg value="-Dnativewindow.debug=all"/>
-            <jvmarg value="-verbose:jni"/> 
-            <jvmarg value="-client"/>
-            <jvmarg value="-d32"/>
-            -->
-
-            <formatter usefile="false" type="plain"/>
-            <formatter usefile="true" type="xml"/>
-            <classpath refid="junit_jogl_awt.run.classpath"/>
-
-            <test name="${testclass}"/>
-        </junit>
-    </target>
-
-    <target name="junit.run.swt.headless" depends="test.compile" description="Runs all pure SWT tests.">
-        <!-- Test*SWT* 
-
-             Emulation of junit task,
-             due to the fact that we have to place invoke our MainThread class first (-> MacOSX).
-
-             Utilizing Ant-1.8.0 and ant-contrib-1.0b3 (loops, mutable properties).
-          --> 
-        <for param="test.class.path.m" keepgoing="true">
-            <!-- results in absolute path -->
-            <fileset dir="${classes}">
-                <include name="${java.dir.junit}/**/Test*SWT*"/>
-                <exclude name="**/*$$*"/>
-                <exclude name="**/*AWT*"/>
-                <exclude name="**/newt/**"/>
-            </fileset>
-          <sequential>
-            <var name="test.class.path" unset="true"/>
-            <property name="test.class.path" basedir="${classes}" relative="true" location="@{test.class.path.m}"/>
-            <var name="test.class.fqn" unset="true"/>
-            <pathconvert property="test.class.fqn">
-              <fileset file="${classes}${file.separator}${test.class.path}"/>
-              <chainedmapper>
-                  <globmapper    from="${classes.path}${file.separator}*" to="*"/> <!-- rel. -->
-                  <packagemapper from="*.class"           to="*"/> <!-- FQCN -->
-              </chainedmapper>
-            </pathconvert>
-            <var name="test.class.result.file" value="${results.test}/TEST-${test.class.fqn}.xml"/>
-            <echo message="Testing ${test.class.fqn} -- ${test.class.result.file}"/>
-            <apply dir="." executable="${java.home}/bin/java" 
-                 parallel="false" 
-                 timeout="${batchtest.timeout}"
-                 vmlauncher="false"
-                 relative="true"
-                 failonerror="false">
-                <env key="${system.env.library.path}" path="${obj.all.paths}"/>
-                <env key="CLASSPATH" value="${junit_jogl_swt.run.jars}"/>
-                <arg value="-Djava.library.path=${obj.all.paths}"/>
-                <arg line="${jvmarg.headless}"/>
-                <!--
-                <arg line="-Dnewt.debug.EDT"/>
-                -->
-                <arg line="com.jogamp.newt.util.MainThread"/>
-                <arg line="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner"/>
-                <srcfile/>
-                <arg line="filtertrace=true"/>
-                <arg line="haltOnError=false"/>
-                <arg line="haltOnFailure=false"/>
-                <arg line="showoutput=true"/>
-                <arg line="outputtoformatters=true"/>
-                <arg line="logfailedtests=true"/>
-                <arg line="logtestlistenerevents=true"/>
-                <arg line="formatter=org.apache.tools.ant.taskdefs.optional.junit.PlainJUnitResultFormatter"/>
-                <arg line="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.class.result.file}"/>
-                <mappedresources>
-                    <fileset dir="${classes}" includes="${test.class.path}"/>
-                    <packagemapper from="*.class" to="*"/>
-                </mappedresources>
-            </apply>
-          </sequential>
-        </for>
-    </target>
-
-    <target name="junit.run.swt.awt" depends="test.compile" description="Runs all SWT_AWT tests.">
-      <!-- Test*SWT* -->
-      <junit forkmode="perTest" showoutput="true" fork="true" haltonerror="off" timeout="${batchtest.timeout}">
-          <env key="${system.env.library.path}" path="${obj.all.paths}"/>
-          <jvmarg value="-Djava.library.path=${obj.all.paths}"/>
-          <jvmarg value="${jvmarg.mainthrd}"/>
-
-          <!--
-          <jvmarg value="-Djogl.debug=all"/>
-          <jvmarg value="-Dgluegen.debug.NativeLibrary=true"/>
-          <jvmarg value="-Dgluegen.debug.ProcAddressHelper=true"/>
-          <jvmarg value="-Djogl.debug.GLSLState"/>
-          <jvmarg value="-Dnativewindow.debug=all"/>
-          <jvmarg value="-verbose:jni"/> 
-          <jvmarg value="-client"/>
-          <jvmarg value="-d32"/>
-          -->
-
-          <formatter usefile="false" type="plain"/>
-          <formatter usefile="true" type="xml"/>
-          <classpath refid="junit_jogl_swt.run.classpath"/>
-
-          <batchtest todir="${results.test}">
-            <fileset dir="${classes}">
-                <include name="${java.dir.junit}/**/Test*SWT*AWT*"/>
-                <exclude name="**/*$$*"/>
-                <exclude name="**/newt/**"/>
-            </fileset>
-            <formatter usefile="false" type="brief"/>
-            <formatter usefile="true" type="xml"/>
-          </batchtest>
-      </junit>
-    </target>
-
-    <!-- NEWT is currently not supported on OSX -->
-    <target name="junit.run.newt.awt" depends="test.compile">
-        <!-- Test*AWT* -->
-        <junit forkmode="perTest" showoutput="true" fork="true" haltonerror="off" timeout="${batchtest.timeout}">
-            <env key="${system.env.library.path}" path="${obj.all.paths}"/>
-            <jvmarg value="-Djava.library.path=${obj.all.paths}"/>
-
-            <!--
-            <jvmarg value="-Dnewt.debug.EDT"/>
-            <jvmarg value="-Djogl.debug=all"/>
-            <jvmarg value="-Dgluegen.debug.NativeLibrary=true"/>
-            <jvmarg value="-Dgluegen.debug.ProcAddressHelper=true"/>
-            <jvmarg value="-Djogl.debug.GLSLState"/>
-            <jvmarg value="-Dnativewindow.debug=all"/>
-            <jvmarg value="-Dnewt.debug=all"/>
-            <jvmarg value="-verbose:jni"/> 
-            <jvmarg value="-client"/>
-            <jvmarg value="-d32"/>
-            -->
-
-            <formatter usefile="false" type="plain"/>
-            <formatter usefile="true" type="xml"/>
-            <classpath refid="junit_jogl_awt.run.classpath"/>
-
-            <batchtest todir="${results.test}">
-              <fileset dir="${classes}">
-                  <include name="${java.dir.junit}/**/newt/**/Test*AWT*"/>
-                  <exclude name="**/*$$*"/>
-              </fileset>
-              <formatter usefile="false" type="brief"/>
-              <formatter usefile="true" type="xml"/>
-            </batchtest>
-        </junit>
-    </target>
-
-    <target name="test.auto.run" depends="junit.run"/>
-    <target name="junit.run" depends="junit.run.noui,junit.run.newt.headless,junit.run.awt,junit.run.newt.awt,junit.run.swt.headless,junit.run.swt.awt">
-        <antcall target="test-zip-archive" inheritRefs="true" inheritAll="true"/>
-    </target>
-
-    <!-- updates / create the test results zip file -->
-    <target name="test-zip-archive" depends="declare.common">
-        <move todir="${results.test}">
-            <fileset dir="." includes="*.tga" />
-        </move>
-        <mkdir dir="${results.test}" />
-        <archive.7z destfile="${build}/${test.archive.name}.7z"
-                    basedir="${results.test}" 
-                    includes="**" />
-    </target>
-
-    <!-- ================================================================== -->
-    <!--
-       - Build everything.
-      -->
-    <target name="all" description="Build JOGL JUNIT tests" depends="test.compile" />
-
-</project>

=== removed directory '.pc/disable_android_2.diff'
=== removed directory '.pc/disable_android_2.diff/make'
=== removed file '.pc/disable_android_2.diff/make/build-common.xml'
--- .pc/disable_android_2.diff/make/build-common.xml	2011-10-09 19:26:30 +0000
+++ .pc/disable_android_2.diff/make/build-common.xml	1970-01-01 00:00:00 +0000
@@ -1,486 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="JOGLCommonStuff" basedir="." default="common.init">
-
-    <description>Common JOGL Stuff</description>
-
-    <fail message="Please build using Ant 1.8.0 or higher.">
-        <condition>
-            <not>
-                <antversion atleast="1.8.0"/>
-            </not>
-        </condition>
-    </fail>
-
-    <!-- Pull in GlueGen cpptasks build file -->
-    <property name="gluegen.root" value="/usr/share/gluegen2/" />
-    <import file="${gluegen.root}/make/gluegen-cpptasks.xml" />
-    <import file="${gluegen.root}/make/jogamp-archivetasks.xml" />
-    <import file="${gluegen.root}/make/jogamp-androidtasks.xml" />
-    <import file="${gluegen.root}/make/jogamp-env.xml" />
-
-    <property name="ant-contrib.jar"  value="/usr/share/java/ant-contrib.jar" />
-
-    <condition property="rootrel.build" value="build">
-      <not>
-          <isset property="rootrel.build"/>
-      </not>
-    </condition>
-
-    <import file="versions.xml" />
-
-    <!-- ================================================================== -->
-    <!-- 
-       - Base initialization of properties and detection of operating system.
-      -->
-    <target name="set.debug">
-        <property name="c.compiler.debug" value="true" /> 
-        <property name="javacdebug"       value="true" /> 
-        <property name="javacdebuglevel"  value="source,lines,vars" /> 
-    </target>
-    <target name="common.init.debug" depends="set.debug, common.init"/>
-
-    <target name="common.init" depends="jogamp.env.init, gluegen.cpptasks.detect.os" unless="common.init.done">
-        <property name="common.init.done" value="true" />
-
-        <!-- Set the project root directory to be up one directory. -->
-        <property name="project.root"               value=".." />
-        <property name="build"                      value="${project.root}/${rootrel.build}" />
-        <property name="tempdir"                    value="${project.root}/build-temp" />
-        <property name="src"                        value="${project.root}/src" />
-        <property name="lib"                        value="${build}/lib" />
-        <property name="jar"                        value="${build}/jar" />
-
-        <property name="all.srcj.path" value="${src}/nativewindow/classes;${src}/jogl/classes;${src}/newt/classes" />
-        <!-- No generated classes for Newt at the present time -->
-        <property name="all.genj.path" value="${build}/nativewindow/gensrc/classes;${build}/jogl/gensrc/classes" />
-
-        <!-- Set the configuration and build files to this directory. -->
-        <property name="make"                       value="." />
-        <property name="config"                     value="${make}/config" />
-        <property name="stub.includes"              value="stub_includes" /> <!-- NOTE:  this MUST be relative for FileSet -->
-
-        <property name="stub.includes.gluegen.gg"  value="${gluegen.root}/make/stub_includes/gluegen" />
-        <property name="stub.includes.gluegen.cc"  value="${gluegen.root}/make/stub_includes/platform" />
-
-        <tstamp>
-             <format property="version.timestamp" pattern="yyyyMMdd"/>
-        </tstamp>
-
-        <property name="jogl.build.number" value="manual"/>
-        <property name="jogl.build.id"     value="${version.timestamp}"/>
-        <mkdir dir="${tempdir}" />
-        <property name="jogl.build.branch" value="manual"/> <!-- fallback -->
-        <property name="jogl.build.commit" value="manual"/> <!-- fallback -->
-
-        <property name="nativewindow.version" value="${nativewindow_base_version}-b${jogl.build.number}-${version.timestamp}" />
-        <property name="jogl.version"         value="${jogl_base_version}-b${jogl.build.number}-${version.timestamp}" />
-        <property name="newt.version"         value="${newt_base_version}-b${jogl.build.number}-${version.timestamp}" />
-        <property name="jogl.version.plus"    value="${jogl_base_version}-${jogl.build.branch}-b${jogl.build.number}-${jogl.build.commit}-${version.timestamp}" />
-
-        <property name="archive.name"         value="jogl-${jogl.version}-${os.and.arch}" />
-        <property name="archive"              value="${build}/${archive.name}" />
-
-        <condition property="setup.noNativeAWT">
-            <or>
-                <isset property="setup.noAWT"/> 
-                <isset property="isAndroid"/> 
-            </or>
-        </condition>
-
-        <condition property="setup.noNativeDesktop">
-            <or>
-                <isset property="isAndroid"/> 
-            </or>
-        </condition>
-
-        <echo message="setup.noAWT: ${setup.noAWT}" />
-        <echo message="setup.noNativeAWT: ${setup.noNativeAWT}" />
-        <echo message="setup.noNativeDesktop: ${setup.noNativeDesktop}" />
-
-        <!-- 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}/jogl.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." />
-        <echo message="antlr.jar=${antlr.jar}" />
-        <echo message="junit.jar=${junit.jar}" />
-        <echo message="android.jar=${android.jar}" />
-
-        <!-- Set swt.jar to the correct file for this platform. We point to the debug JARs to allow
-             stepping into SWT calls using the accompanying source code zip archives. -->
-        <condition property="swt.jar" value="${project.root}/make/lib/swt/win32-win32-x86_64/swt-debug.jar">
-          <istrue value="${isWindowsAMD64}" />
-        </condition>
-        <condition property="swt.jar" value="${project.root}/make/lib/swt/win32-win32-x86/swt-debug.jar">
-          <istrue value="${isWindowsX86}" />
-        </condition>
-        <condition property="swt.jar" value="/usr/share/java/swt.jar">
-          <istrue value="${isLinux}" />
-        </condition>
-        <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-linux-x86/swt-debug.jar">
-          <istrue value="${isAndroid}" /> <!-- FIXME JAU .. hack -->
-        </condition>
-        <condition property="swt.jar" value="${project.root}/make/lib/swt/cocoa-macosx-x86_64/swt-debug.jar">
-          <and>
-            <istrue value="${isOSX}" />
-            <or>
-              <os arch="AMD64" />
-              <os arch="x86_64" />
-            </or>                
-          </and>
-        </condition>
-        <condition property="swt.jar" value="${project.root}/make/lib/swt/cocoa-macosx/swt-debug.jar">
-          <and>
-            <istrue value="${isOSX}" />
-            <or>
-              <os arch="i386" />
-              <os arch="x86" />
-            </or>
-          </and>
-        </condition>
-        <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-solaris-x86/swt-debug.jar">
-          <istrue value="${isSolarisX86}" />
-        </condition>
-        <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-solaris-x86/swt-debug.jar">
-          <istrue value="${isSolarisAMD64}" />
-        </condition>
-        <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-solaris-sparc/swt-debug.jar">
-          <istrue value="${isSolarisSparc}" />
-        </condition>
-		<condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-solaris-sparc/swt-debug.jar">
-          <istrue value="${isSolarisSparcv9}" />
-        </condition>
-        <echo message="swt.jar=${swt.jar}" />
-
-        <property name="target.sourcelevel" value="1.5" />
-        <property name="host.sourcelevel"   value="1.5" />
-
-        <!-- property name="javadoc.link" value="http://java.sun.com/j2se/1.4.2/docs/api/" /-->
-        <property name="javadoc.link" value="http://download.oracle.com/javase/1.5.0/docs/api/" />
-
-        <!-- 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" /> 
-        <!--property name="javacdebuglevel"  value="source,lines,vars" /--> 
-        <!-- property name="javac.memorymax"  value="128m" /-->  <!-- I ran out of memory with these .. linux x86_64 6u14 -->
-        <property name="javac.memorymax"  value="512m" /> 
-
-        <!-- 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 "/". -->
-
-        <!-- NOTE that these require a checked-out GlueGen, etc workspace as a -->
-        <!-- sibling of the JOGL workspace. -->
-        <property name="gluegen.make"               value="${gluegen.root}/make" />
-        <property name="gluegen.build.xml"          value="${gluegen.make}/build.xml" />
-        <property name="build.gluegen"              value="${gluegen.root}/${rootrel.build}" />
-        <property name="obj.gluegen"                value="${build.gluegen}/obj"/>
-        <property name="gluegen.jar"                value="/usr/share/java/gluegen2.jar" />
-        <property name="ant.jar"                    value="${ant.home}/lib/ant.jar" />
-        <property name="ant-junit.jar"              value="${ant.home}/lib/ant-junit.jar" />
-
-        <property name="nativewindow.make"          value="." />
-        <property name="nativewindow.build.xml"     value="${nativewindow.make}/build-nativewindow.xml" />
-        <property name="build.nativewindow"         value="${build}/nativewindow" />
-        <property name="obj.nativewindow"           value="${build.nativewindow}/obj"/>
-
-        <property name="jogl.make"                  value="." />
-        <property name="jogl.build.xml"             value="${jogl.make}/build-jogl.xml" />
-        <property name="build.jogl"                 value="${build}/jogl" />
-        <property name="obj.jogl"                   value="${build.jogl}/obj"/>
-
-        <property name="newt.make"                  value="." />
-        <property name="newt.build.xml"             value="${newt.make}/build-newt.xml" />
-        <property name="build.newt"                 value="${build}/newt" />
-        <property name="obj.newt"                   value="${build.newt}/obj"/>
-
-        <property name="results.test"              value="${build}/test/results" />
-        <property name="build.test"                value="${build}/test/build" />
-        <property name="obj.test"                  value="${build.test}/obj"/>
-
-        <condition property="obj.custom" value="${custom.libdir}${path.separator}" else="">
-          <isset property="custom.libdir"/>
-        </condition>
-
-        <property name="obj.all.paths"              value="${obj.custom}${obj.gluegen}${path.separator}${obj.nativewindow}${path.separator}${obj.jogl}${path.separator}${obj.newt}${path.separator}${obj.test}" />
-
-        <path id="gluegen.classpath">
-          <pathelement location="${gluegen.jar}" />
-          <pathelement location="${antlr.jar}" />
-        </path>
-
-        <property name="gluegen-gl.jar"             value="${build.jogl}/gluegen-gl.jar" />
-
-        <path id="gluegen-gl.classpath">
-          <pathelement location="${gluegen.jar}" />
-          <pathelement location="${gluegen-gl.jar}" />
-        </path>
-
-        <!-- Atomic JavaSE JARS -->
-
-        <property name="nativewindow.core.jar"         value="${build.nativewindow}/nativewindow.core.jar" />
-        <property name="nativewindow.awt.jar"          value="${build.nativewindow}/nativewindow.awt.jar"  />
-        <property name="nativewindow.os.x11.jar"       value="${build.nativewindow}/nativewindow.os.x11.jar"  />
-        <property name="nativewindow.os.win.jar"       value="${build.nativewindow}/nativewindow.os.win.jar"  />
-        <property name="nativewindow.os.macosx.jar"    value="${build.nativewindow}/nativewindow.os.macosx.jar"  />
-
-        <path id="nativewindow_all_atoms.classpath">
-            <pathelement location="${nativewindow.core.jar}" />
-            <pathelement location="${nativewindow.awt.jar}" />
-            <pathelement location="${nativewindow.os.x11.jar}" />
-            <pathelement location="${nativewindow.os.win.jar}" />
-            <pathelement location="${nativewindow.os.macosx.jar}" />
-        </path>
-        <path id="nativewindow_all-noawt_atoms.classpath">
-            <pathelement location="${nativewindow.core.jar}" />
-            <pathelement location="${nativewindow.os.x11.jar}" />
-            <pathelement location="${nativewindow.os.win.jar}" />
-            <pathelement location="${nativewindow.os.macosx.jar}" />
-        </path>
-        <path id="nativewindow_core_atoms.classpath">
-            <pathelement location="${nativewindow.core.jar}" />
-        </path>
-        
-        <property name="jogl.core.jar"                  value="${build.jogl}/jogl.core.jar" />
-        <property name="jogl.sdk.jar"                   value="${build.jogl}/jogl.sdk.jar" />
-        <property name="jogl.glmobile.jar"              value="${build.jogl}/jogl.glmobile.jar" />
-        <property name="jogl.glmobile.dbg.jar"          value="${build.jogl}/jogl.glmobile.dbg.jar" />
-        <property name="jogl.util.jar"                  value="${build.jogl}/jogl.util.jar" />
-        <property name="jogl.glutess.jar"               value="${build.jogl}/jogl.glu.tess.jar" />
-        <property name="jogl.glumipmap.jar"             value="${build.jogl}/jogl.glu.mipmap.jar" />
-        <property name="jogl.util.fixedfuncemu.jar"     value="${build.jogl}/jogl.util.fixedfuncemu.jar" />
-        <property name="jogl.awt.jar"                   value="${build.jogl}/jogl.awt.jar" />
-        <property name="jogl.util.awt.jar"              value="${build.jogl}/jogl.util.awt.jar" />
-        <property name="jogl.os.x11.jar"                value="${build.jogl}/jogl.os.x11.jar" />
-        <property name="jogl.os.win.jar"                value="${build.jogl}/jogl.os.win.jar" />
-        <property name="jogl.os.osx.jar"                value="${build.jogl}/jogl.os.osx.jar" />
-        <property name="jogl.gldesktop.jar"             value="${build.jogl}/jogl.gldesktop.jar" />
-        <property name="jogl.gldesktop.dbg.jar"         value="${build.jogl}/jogl.gldesktop.dbg.jar" />
-        <property name="jogl.glugldesktop.jar"          value="${build.jogl}/jogl.glu.gldesktop.jar" />
-        <property name="jogl.util.gldesktop.jar"        value="${build.jogl}/jogl.util.gldesktop.jar" />
-        <property name="jogl.omx.jar"                   value="${build.jogl}/jogl.omx.jar" />
-        <property name="jogl.cg.jar"                    value="${build.jogl}/jogl.cg.jar" />
-
-        <path id="jogl_all_atoms.classpath">
-            <pathelement location="${jogl.core.jar}" />
-            <pathelement location="${jogl.sdk.jar}" />
-            <pathelement location="${jogl.glmobile.jar}" />
-            <pathelement location="${jogl.glmobile.dbg.jar}" />
-            <pathelement location="${jogl.util.jar}" />
-            <pathelement location="${jogl.glutess.jar}" />
-            <pathelement location="${jogl.glumipmap.jar}" />
-            <pathelement location="${jogl.util.fixedfuncemu.jar}" />
-            <pathelement location="${jogl.awt.jar}" />
-            <pathelement location="${jogl.util.awt.jar}" />
-            <pathelement location="${jogl.os.x11.jar}" />
-            <pathelement location="${jogl.os.win.jar}" />
-            <pathelement location="${jogl.os.osx.jar}" />
-            <pathelement location="${jogl.gldesktop.jar}" />
-            <pathelement location="${jogl.gldesktop.dbg.jar}" />
-            <pathelement location="${jogl.glugldesktop.jar}" />
-            <pathelement location="${jogl.util.gldesktop.jar}" />
-            <pathelement location="${jogl.omx.jar}" />
-        </path>
-        <path id="jogl_all-noawt_atoms.classpath">
-            <pathelement location="${jogl.core.jar}" />
-            <pathelement location="${jogl.sdk.jar}" />
-            <pathelement location="${jogl.glmobile.jar}" />
-            <pathelement location="${jogl.glmobile.dbg.jar}" />
-            <pathelement location="${jogl.util.jar}" />
-            <pathelement location="${jogl.glutess.jar}" />
-            <pathelement location="${jogl.glumipmap.jar}" />
-            <pathelement location="${jogl.util.fixedfuncemu.jar}" />
-            <pathelement location="${jogl.os.x11.jar}" />
-            <pathelement location="${jogl.os.win.jar}" />
-            <pathelement location="${jogl.os.osx.jar}" />
-            <pathelement location="${jogl.gldesktop.jar}" />
-            <pathelement location="${jogl.gldesktop.dbg.jar}" />
-            <pathelement location="${jogl.glugldesktop.jar}" />
-            <pathelement location="${jogl.util.gldesktop.jar}" />
-            <pathelement location="${jogl.omx.jar}" />
-        </path>
-        <path id="jogl_all-mobile_atoms.classpath">
-            <pathelement location="${jogl.core.jar}" />
-            <pathelement location="${jogl.glmobile.jar}" />
-            <pathelement location="${jogl.glmobile.dbg.jar}" />
-            <pathelement location="${jogl.util.jar}" />
-            <pathelement location="${jogl.glutess.jar}" />
-            <pathelement location="${jogl.glumipmap.jar}" />
-            <pathelement location="${jogl.util.fixedfuncemu.jar}" />
-            <pathelement location="${jogl.omx.jar}" />
-        </path>
-        <!-- 
-            ${jogl.core.jar} ${jogl.glutess.jar} ${jogl.glumipmap.jar} ${jogl.glugldesktop.jar} ${jogl.os.x11.jar} ${jogl.os.win.jar} ${jogl.os.osx.jar} ${jogl.gldesktop.jar} ${jogl.gldesktop.dbg.jar} ${jogl.glmobile.jar} ${jogl.glmobile.dbg.jar} ${jogl.omx.jar} ${jogl.util.jar} ${jogl.util.gldesktop.jar} ${jogl.util.awt.jar} ${jogl.util.fixedfuncemu.jar} ${jogl.sdk.jar} -->
-
-        <property name="newt.core.jar"                  value="${build.newt}/newt.core.jar" />
-        <property name="newt.ogl.jar"                   value="${build.newt}/newt.ogl.jar" />
-        <property name="newt.awt.jar"                   value="${build.newt}/newt.awt.jar" />
-        <property name="newt.driver.x11.jar"            value="${build.newt}/newt.driver.x11.jar" />
-        <property name="newt.driver.win.jar"            value="${build.newt}/newt.driver.win.jar" />
-        <property name="newt.driver.macosx.jar"         value="${build.newt}/newt.driver.macosx.jar" />
-        <property name="newt.driver.android.jar"        value="${build.newt}/newt.driver.android.jar" />     <!-- excluded from all -->
-        <property name="newt.driver.kd.jar"             value="${build.newt}/newt.driver.kd.jar" />          <!-- excluded from all -->
-        <property name="newt.driver.intelgdl.jar"       value="${build.newt}/newt.driver.intelgdl.jar" />    <!-- excluded from all -->
-        <property name="newt.driver.broadcomegl.jar"    value="${build.newt}/newt.driver.broadcomegl.jar" /> <!-- excluded from all -->
-        <path id="newt_all_atoms.classpath">
-            <pathelement location="${newt.core.jar}" />
-            <pathelement location="${newt.ogl.jar}" />
-            <pathelement location="${newt.awt.jar}" />
-            <pathelement location="${newt.driver.x11.jar}" />
-            <pathelement location="${newt.driver.win.jar}" />
-            <pathelement location="${newt.driver.macosx.jar}" />
-        </path>
-        <path id="newt_all-noawt_atoms.classpath">
-            <pathelement location="${newt.core.jar}" />
-            <pathelement location="${newt.ogl.jar}" />
-            <pathelement location="${newt.driver.x11.jar}" />
-            <pathelement location="${newt.driver.win.jar}" />
-            <pathelement location="${newt.driver.macosx.jar}" />
-        </path>
-        <path id="newt_all-mobile_atoms.classpath">
-            <pathelement location="${newt.core.jar}" />
-            <pathelement location="${newt.ogl.jar}" />
-            <pathelement location="${newt.driver.x11.jar}" />
-            <pathelement location="${newt.driver.win.jar}" />
-        </path>
-        <path id="newt_all-android_atoms.classpath">
-            <pathelement location="${newt.core.jar}" />
-            <pathelement location="${newt.ogl.jar}" />
-            <pathelement location="${newt.driver.android.jar}" />
-        </path>
-
-        <!-- JavaSE combinations -->
-        <property name="gluegen-rt.jar"                 value="/usr/share/java/gluegen2-rt.jar" />
-        <property name="jogl.test.jar"                  value="${jar}/jogl.test.jar"/>
-
-        <!-- JavaSE combinations . AWT -->
-        <property name="jogl.all.jar"                   value="${jar}/jogl.all.jar" />
-        <property name="newt.event.jar"                 value="${jar}/newt.event.jar" />
-
-        <!-- JavaSE combinations . NO.AWT -->
-        <property name="jogl.all-noawt.jar"             value="${jar}/jogl.all-noawt.jar" />
-        <property name="jogl.all-mobile.jar"            value="${jar}/jogl.all-mobile.jar" />
-        <property name="jogl.all-android.jar"           value="${jar}/jogl.all-android.jar" />
-
-        <path id="swt_gluegen.classpath">
-            <pathelement location="${gluegen-rt.jar}" />
-            <pathelement location="${swt.jar}" />
-        </path>
-
-        <!-- JOGL Compilation .. -->
-        <path id="nativewindow_gluegen.classpath">
-            <pathelement location="${gluegen-rt.jar}" />
-            <pathelement location="${swt.jar}" />
-            <path refid="nativewindow_all_atoms.classpath" />
-        </path>
-
-        <!-- NEWT Compilation .. -->
-        <path id="jogl_nativewindow_gluegen.classpath">
-            <pathelement location="${android.jar}" />
-            <pathelement location="${gluegen-rt.jar}" />
-            <pathelement location="${swt.jar}" />
-            <path refid="nativewindow_all_atoms.classpath" />
-            <path refid="jogl_all_atoms.classpath" />
-        </path>
-
-        <!-- Test Compilation .. -->
-        <path id="junit_jogl_newt_android.compile.classpath">
-            <pathelement location="${android.jar}" />
-            <pathelement location="${junit.jar}" />
-            <pathelement location="${ant.jar}" />
-            <pathelement location="${ant-junit.jar}" />
-            <pathelement location="${gluegen-rt.jar}" />
-            <pathelement location="${swt.jar}" />
-            <path refid="nativewindow_all_atoms.classpath" />
-            <path refid="jogl_all_atoms.classpath" />
-            <path refid="newt_all_atoms.classpath" />
-            <pathelement location="${newt.driver.android.jar}" />
-        </path>
-
-        <!-- Postbuild: javadoc .. -->
-        <path id="jogl_all.classpath">
-            <pathelement location="${android.jar}" />
-            <pathelement location="${gluegen-rt.jar}" />
-            <pathelement location="${swt.jar}" />
-            <pathelement location="${jogl.all.jar}" />
-        </path>
-
-        <!-- Test Run w/ AWT .. -->
-        <path id="junit_jogl_awt.run.classpath">
-            <pathelement location="${junit.jar}" />
-            <pathelement location="${ant.jar}" />
-            <pathelement location="${ant-junit.jar}" />
-            <pathelement location="${gluegen-rt.jar}" />
-            <pathelement location="${jogl.all.jar}" />
-            <pathelement location="${jogl.test.jar}" />
-        </path>
-        <property name="junit_jogl_awt.run.jars"
-                  value="${junit.jar}${path.separator}${ant.jar}${path.separator}${ant-junit.jar}${path.separator}${gluegen-rt.jar}${path.separator}${jogl.all.jar}${path.separator}${jogl.test.jar}"/>
-
-        <!-- Test Run w/o AWT .. -->
-        <path id="junit_jogl_noawt.run.classpath">
-            <pathelement location="${junit.jar}" />
-            <pathelement location="${ant.jar}" />
-            <pathelement location="${ant-junit.jar}" />
-            <pathelement location="${gluegen-rt.jar}" />
-            <pathelement location="${jogl.all-noawt.jar}" />
-            <pathelement location="${jogl.test.jar}" />
-        </path>
-        <property name="junit_jogl_noawt.run.jars"
-                  value="${junit.jar}${path.separator}${ant.jar}${path.separator}${ant-junit.jar}${path.separator}${gluegen-rt.jar}${path.separator}${jogl.all-noawt.jar}${path.separator}${jogl.test.jar}"/>
-
-        <!-- Test Run w/ SWT .. -->
-        <path id="junit_jogl_swt.run.classpath">
-          <pathelement location="${junit.jar}" />
-          <pathelement location="${ant.jar}" />
-          <pathelement location="${ant-junit.jar}" />
-          <pathelement location="${gluegen-rt.jar}" />
-          <pathelement location="${swt.jar}" />
-          <pathelement location="${jogl.all.jar}" />
-          <pathelement location="${jogl.test.jar}" />
-        </path>
-        <property name="junit_jogl_swt.run.jars"
-                  value="${junit.jar}${path.separator}${ant.jar}${path.separator}${ant-junit.jar}${path.separator}${gluegen-rt.jar}${path.separator}${swt.jar}${path.separator}${jogl.all.jar}${path.separator}${jogl.test.jar}"/>
-
-        <!-- Test Run w/ Android [w/o AWT] .. -->
-        <path id="junit_jogl_android.run.classpath">
-            <pathelement location="${junit.jar}" />
-            <pathelement location="${ant.jar}" />
-            <pathelement location="${ant-junit.jar}" />
-            <pathelement location="${android.jar}" />
-            <pathelement location="${gluegen-rt.jar}" />
-            <pathelement location="${jogl.all-android.jar}" />
-            <pathelement location="${jogl.test.jar}" />
-        </path>
-        <property name="junit_jogl_android.run.jars"
-                  value="${junit.jar}${path.separator}${ant.jar}${path.separator}${ant-junit.jar}${path.separator}${gluegen-rt.jar}${path.separator}${jogl.all-android.jar}${path.separator}${jogl.test.jar}"/>
-
-
-        <!-- 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" />
-    </target>
-
-    <!-- ================================================================== -->
-    <!-- GlueGen and BuildStaticGLInfo creation, task setup and Java file generation -->
-    <!--
-       - Build GlueGen
-      -->
-    <target name="common.gluegen.build" depends="common.init" unless="common.gluegen.build.done">
-        <property name="common.gluegen.build.done" value="true" />
-
-        <!-- Run the GlueGen build to ensure that the GlueGen ANT task
-           - has been built. -->
-        <ant antfile="${gluegen.build.xml}" dir="${gluegen.make}" target="base.compile" inheritAll="false">
-          <property name="build" value="${basedir}/../"/>
-          <property name="test.dir" value="${basedir}/../test"/>
-        </ant>
-    </target>
-
-
-</project>

=== removed directory '.pc/disable_git_call.diff'
=== removed directory '.pc/disable_git_call.diff/make'
=== removed file '.pc/disable_git_call.diff/make/build-common.xml'
--- .pc/disable_git_call.diff/make/build-common.xml	2011-10-08 11:39:42 +0000
+++ .pc/disable_git_call.diff/make/build-common.xml	1970-01-01 00:00:00 +0000
@@ -1,498 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="JOGLCommonStuff" basedir="." default="common.init">
-
-    <description>Common JOGL Stuff</description>
-
-    <fail message="Please build using Ant 1.8.0 or higher.">
-        <condition>
-            <not>
-                <antversion atleast="1.8.0"/>
-            </not>
-        </condition>
-    </fail>
-
-    <!-- Pull in GlueGen cpptasks build file -->
-    <property name="gluegen.root" value="/usr/share/gluegen2/" />
-    <import file="${gluegen.root}/make/gluegen-cpptasks.xml" />
-    <import file="${gluegen.root}/make/jogamp-archivetasks.xml" />
-    <import file="${gluegen.root}/make/jogamp-androidtasks.xml" />
-    <import file="${gluegen.root}/make/jogamp-env.xml" />
-
-    <property name="ant-contrib.jar"  value="/usr/share/java/ant-contrib.jar" />
-
-    <condition property="rootrel.build" value="build">
-      <not>
-          <isset property="rootrel.build"/>
-      </not>
-    </condition>
-
-    <import file="versions.xml" />
-
-    <!-- ================================================================== -->
-    <!-- 
-       - Base initialization of properties and detection of operating system.
-      -->
-    <target name="set.debug">
-        <property name="c.compiler.debug" value="true" /> 
-        <property name="javacdebug"       value="true" /> 
-        <property name="javacdebuglevel"  value="source,lines,vars" /> 
-    </target>
-    <target name="common.init.debug" depends="set.debug, common.init"/>
-
-    <target name="common.init" depends="jogamp.env.init, gluegen.cpptasks.detect.os" unless="common.init.done">
-        <property name="common.init.done" value="true" />
-
-        <!-- Set the project root directory to be up one directory. -->
-        <property name="project.root"               value=".." />
-        <property name="build"                      value="${project.root}/${rootrel.build}" />
-        <property name="tempdir"                    value="${project.root}/build-temp" />
-        <property name="src"                        value="${project.root}/src" />
-        <property name="lib"                        value="${build}/lib" />
-        <property name="jar"                        value="${build}/jar" />
-
-        <property name="all.srcj.path" value="${src}/nativewindow/classes;${src}/jogl/classes;${src}/newt/classes" />
-        <!-- No generated classes for Newt at the present time -->
-        <property name="all.genj.path" value="${build}/nativewindow/gensrc/classes;${build}/jogl/gensrc/classes" />
-
-        <!-- Set the configuration and build files to this directory. -->
-        <property name="make"                       value="." />
-        <property name="config"                     value="${make}/config" />
-        <property name="stub.includes"              value="stub_includes" /> <!-- NOTE:  this MUST be relative for FileSet -->
-
-        <property name="stub.includes.gluegen.gg"  value="${gluegen.root}/make/stub_includes/gluegen" />
-        <property name="stub.includes.gluegen.cc"  value="${gluegen.root}/make/stub_includes/platform" />
-
-        <tstamp>
-             <format property="version.timestamp" pattern="yyyyMMdd"/>
-        </tstamp>
-
-        <property name="jogl.build.number" value="manual"/>
-        <property name="jogl.build.id"     value="${version.timestamp}"/>
-        <mkdir dir="${tempdir}" />
-        <exec dir="." executable="git" logError="true" failonerror="false" failifexecutionfails="false"
-                  output="${tempdir}/localbranch.raw">
-            <arg line="branch --no-color"/>
-        </exec>
-        <exec dir="." executable="sed" logError="true" failonerror="false" failifexecutionfails="false"
-                  outputproperty="jogl.build.branch">
-            <arg line="-e '/^[^*]/d' -e 's/* \(.*\)/\1/' ${tempdir}/localbranch.raw"/>
-        </exec>
-        <property name="jogl.build.branch" value="manual"/> <!-- fallback -->
-        <exec dir="${project.root}" executable="git" logError="true" failonerror="false" failifexecutionfails="false"
-                  outputproperty="jogl.build.commit">
-            <arg line="rev-parse HEAD"/>
-        </exec>
-        <property name="jogl.build.commit" value="manual"/> <!-- fallback -->
-
-        <property name="nativewindow.version" value="${nativewindow_base_version}-b${jogl.build.number}-${version.timestamp}" />
-        <property name="jogl.version"         value="${jogl_base_version}-b${jogl.build.number}-${version.timestamp}" />
-        <property name="newt.version"         value="${newt_base_version}-b${jogl.build.number}-${version.timestamp}" />
-        <property name="jogl.version.plus"    value="${jogl_base_version}-${jogl.build.branch}-b${jogl.build.number}-${jogl.build.commit}-${version.timestamp}" />
-
-        <property name="archive.name"         value="jogl-${jogl.version}-${os.and.arch}" />
-        <property name="archive"              value="${build}/${archive.name}" />
-
-        <condition property="setup.noNativeAWT">
-            <or>
-                <isset property="setup.noAWT"/> 
-                <isset property="isAndroid"/> 
-            </or>
-        </condition>
-
-        <condition property="setup.noNativeDesktop">
-            <or>
-                <isset property="isAndroid"/> 
-            </or>
-        </condition>
-
-        <echo message="setup.noAWT: ${setup.noAWT}" />
-        <echo message="setup.noNativeAWT: ${setup.noNativeAWT}" />
-        <echo message="setup.noNativeDesktop: ${setup.noNativeDesktop}" />
-
-        <!-- 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}/jogl.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." />
-        <echo message="antlr.jar=${antlr.jar}" />
-        <echo message="junit.jar=${junit.jar}" />
-        <echo message="android.jar=${android.jar}" />
-
-        <!-- Set swt.jar to the correct file for this platform. We point to the debug JARs to allow
-             stepping into SWT calls using the accompanying source code zip archives. -->
-        <condition property="swt.jar" value="${project.root}/make/lib/swt/win32-win32-x86_64/swt-debug.jar">
-          <istrue value="${isWindowsAMD64}" />
-        </condition>
-        <condition property="swt.jar" value="${project.root}/make/lib/swt/win32-win32-x86/swt-debug.jar">
-          <istrue value="${isWindowsX86}" />
-        </condition>
-        <condition property="swt.jar" value="/usr/share/java/swt.jar">
-          <istrue value="${isLinux}" />
-        </condition>
-        <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-linux-x86/swt-debug.jar">
-          <istrue value="${isAndroid}" /> <!-- FIXME JAU .. hack -->
-        </condition>
-        <condition property="swt.jar" value="${project.root}/make/lib/swt/cocoa-macosx-x86_64/swt-debug.jar">
-          <and>
-            <istrue value="${isOSX}" />
-            <or>
-              <os arch="AMD64" />
-              <os arch="x86_64" />
-            </or>                
-          </and>
-        </condition>
-        <condition property="swt.jar" value="${project.root}/make/lib/swt/cocoa-macosx/swt-debug.jar">
-          <and>
-            <istrue value="${isOSX}" />
-            <or>
-              <os arch="i386" />
-              <os arch="x86" />
-            </or>
-          </and>
-        </condition>
-        <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-solaris-x86/swt-debug.jar">
-          <istrue value="${isSolarisX86}" />
-        </condition>
-        <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-solaris-x86/swt-debug.jar">
-          <istrue value="${isSolarisAMD64}" />
-        </condition>
-        <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-solaris-sparc/swt-debug.jar">
-          <istrue value="${isSolarisSparc}" />
-        </condition>
-		<condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-solaris-sparc/swt-debug.jar">
-          <istrue value="${isSolarisSparcv9}" />
-        </condition>
-        <echo message="swt.jar=${swt.jar}" />
-
-        <property name="target.sourcelevel" value="1.5" />
-        <property name="host.sourcelevel"   value="1.5" />
-
-        <!-- property name="javadoc.link" value="http://java.sun.com/j2se/1.4.2/docs/api/" /-->
-        <property name="javadoc.link" value="http://download.oracle.com/javase/1.5.0/docs/api/" />
-
-        <!-- 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" /> 
-        <!--property name="javacdebuglevel"  value="source,lines,vars" /--> 
-        <!-- property name="javac.memorymax"  value="128m" /-->  <!-- I ran out of memory with these .. linux x86_64 6u14 -->
-        <property name="javac.memorymax"  value="512m" /> 
-
-        <!-- 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 "/". -->
-
-        <!-- NOTE that these require a checked-out GlueGen, etc workspace as a -->
-        <!-- sibling of the JOGL workspace. -->
-        <property name="gluegen.make"               value="${gluegen.root}/make" />
-        <property name="gluegen.build.xml"          value="${gluegen.make}/build.xml" />
-        <property name="build.gluegen"              value="${gluegen.root}/${rootrel.build}" />
-        <property name="obj.gluegen"                value="${build.gluegen}/obj"/>
-        <property name="gluegen.jar"                value="/usr/share/java/gluegen2.jar" />
-        <property name="ant.jar"                    value="${ant.home}/lib/ant.jar" />
-        <property name="ant-junit.jar"              value="${ant.home}/lib/ant-junit.jar" />
-
-        <property name="nativewindow.make"          value="." />
-        <property name="nativewindow.build.xml"     value="${nativewindow.make}/build-nativewindow.xml" />
-        <property name="build.nativewindow"         value="${build}/nativewindow" />
-        <property name="obj.nativewindow"           value="${build.nativewindow}/obj"/>
-
-        <property name="jogl.make"                  value="." />
-        <property name="jogl.build.xml"             value="${jogl.make}/build-jogl.xml" />
-        <property name="build.jogl"                 value="${build}/jogl" />
-        <property name="obj.jogl"                   value="${build.jogl}/obj"/>
-
-        <property name="newt.make"                  value="." />
-        <property name="newt.build.xml"             value="${newt.make}/build-newt.xml" />
-        <property name="build.newt"                 value="${build}/newt" />
-        <property name="obj.newt"                   value="${build.newt}/obj"/>
-
-        <property name="results.test"              value="${build}/test/results" />
-        <property name="build.test"                value="${build}/test/build" />
-        <property name="obj.test"                  value="${build.test}/obj"/>
-
-        <condition property="obj.custom" value="${custom.libdir}${path.separator}" else="">
-          <isset property="custom.libdir"/>
-        </condition>
-
-        <property name="obj.all.paths"              value="${obj.custom}${obj.gluegen}${path.separator}${obj.nativewindow}${path.separator}${obj.jogl}${path.separator}${obj.newt}${path.separator}${obj.test}" />
-
-        <path id="gluegen.classpath">
-          <pathelement location="${gluegen.jar}" />
-          <pathelement location="${antlr.jar}" />
-        </path>
-
-        <property name="gluegen-gl.jar"             value="${build.jogl}/gluegen-gl.jar" />
-
-        <path id="gluegen-gl.classpath">
-          <pathelement location="${gluegen.jar}" />
-          <pathelement location="${gluegen-gl.jar}" />
-        </path>
-
-        <!-- Atomic JavaSE JARS -->
-
-        <property name="nativewindow.core.jar"         value="${build.nativewindow}/nativewindow.core.jar" />
-        <property name="nativewindow.awt.jar"          value="${build.nativewindow}/nativewindow.awt.jar"  />
-        <property name="nativewindow.os.x11.jar"       value="${build.nativewindow}/nativewindow.os.x11.jar"  />
-        <property name="nativewindow.os.win.jar"       value="${build.nativewindow}/nativewindow.os.win.jar"  />
-        <property name="nativewindow.os.macosx.jar"    value="${build.nativewindow}/nativewindow.os.macosx.jar"  />
-
-        <path id="nativewindow_all_atoms.classpath">
-            <pathelement location="${nativewindow.core.jar}" />
-            <pathelement location="${nativewindow.awt.jar}" />
-            <pathelement location="${nativewindow.os.x11.jar}" />
-            <pathelement location="${nativewindow.os.win.jar}" />
-            <pathelement location="${nativewindow.os.macosx.jar}" />
-        </path>
-        <path id="nativewindow_all-noawt_atoms.classpath">
-            <pathelement location="${nativewindow.core.jar}" />
-            <pathelement location="${nativewindow.os.x11.jar}" />
-            <pathelement location="${nativewindow.os.win.jar}" />
-            <pathelement location="${nativewindow.os.macosx.jar}" />
-        </path>
-        <path id="nativewindow_core_atoms.classpath">
-            <pathelement location="${nativewindow.core.jar}" />
-        </path>
-        
-        <property name="jogl.core.jar"                  value="${build.jogl}/jogl.core.jar" />
-        <property name="jogl.sdk.jar"                   value="${build.jogl}/jogl.sdk.jar" />
-        <property name="jogl.glmobile.jar"              value="${build.jogl}/jogl.glmobile.jar" />
-        <property name="jogl.glmobile.dbg.jar"          value="${build.jogl}/jogl.glmobile.dbg.jar" />
-        <property name="jogl.util.jar"                  value="${build.jogl}/jogl.util.jar" />
-        <property name="jogl.glutess.jar"               value="${build.jogl}/jogl.glu.tess.jar" />
-        <property name="jogl.glumipmap.jar"             value="${build.jogl}/jogl.glu.mipmap.jar" />
-        <property name="jogl.util.fixedfuncemu.jar"     value="${build.jogl}/jogl.util.fixedfuncemu.jar" />
-        <property name="jogl.awt.jar"                   value="${build.jogl}/jogl.awt.jar" />
-        <property name="jogl.util.awt.jar"              value="${build.jogl}/jogl.util.awt.jar" />
-        <property name="jogl.os.x11.jar"                value="${build.jogl}/jogl.os.x11.jar" />
-        <property name="jogl.os.win.jar"                value="${build.jogl}/jogl.os.win.jar" />
-        <property name="jogl.os.osx.jar"                value="${build.jogl}/jogl.os.osx.jar" />
-        <property name="jogl.gldesktop.jar"             value="${build.jogl}/jogl.gldesktop.jar" />
-        <property name="jogl.gldesktop.dbg.jar"         value="${build.jogl}/jogl.gldesktop.dbg.jar" />
-        <property name="jogl.glugldesktop.jar"          value="${build.jogl}/jogl.glu.gldesktop.jar" />
-        <property name="jogl.util.gldesktop.jar"        value="${build.jogl}/jogl.util.gldesktop.jar" />
-        <property name="jogl.omx.jar"                   value="${build.jogl}/jogl.omx.jar" />
-        <property name="jogl.cg.jar"                    value="${build.jogl}/jogl.cg.jar" />
-
-        <path id="jogl_all_atoms.classpath">
-            <pathelement location="${jogl.core.jar}" />
-            <pathelement location="${jogl.sdk.jar}" />
-            <pathelement location="${jogl.glmobile.jar}" />
-            <pathelement location="${jogl.glmobile.dbg.jar}" />
-            <pathelement location="${jogl.util.jar}" />
-            <pathelement location="${jogl.glutess.jar}" />
-            <pathelement location="${jogl.glumipmap.jar}" />
-            <pathelement location="${jogl.util.fixedfuncemu.jar}" />
-            <pathelement location="${jogl.awt.jar}" />
-            <pathelement location="${jogl.util.awt.jar}" />
-            <pathelement location="${jogl.os.x11.jar}" />
-            <pathelement location="${jogl.os.win.jar}" />
-            <pathelement location="${jogl.os.osx.jar}" />
-            <pathelement location="${jogl.gldesktop.jar}" />
-            <pathelement location="${jogl.gldesktop.dbg.jar}" />
-            <pathelement location="${jogl.glugldesktop.jar}" />
-            <pathelement location="${jogl.util.gldesktop.jar}" />
-            <pathelement location="${jogl.omx.jar}" />
-        </path>
-        <path id="jogl_all-noawt_atoms.classpath">
-            <pathelement location="${jogl.core.jar}" />
-            <pathelement location="${jogl.sdk.jar}" />
-            <pathelement location="${jogl.glmobile.jar}" />
-            <pathelement location="${jogl.glmobile.dbg.jar}" />
-            <pathelement location="${jogl.util.jar}" />
-            <pathelement location="${jogl.glutess.jar}" />
-            <pathelement location="${jogl.glumipmap.jar}" />
-            <pathelement location="${jogl.util.fixedfuncemu.jar}" />
-            <pathelement location="${jogl.os.x11.jar}" />
-            <pathelement location="${jogl.os.win.jar}" />
-            <pathelement location="${jogl.os.osx.jar}" />
-            <pathelement location="${jogl.gldesktop.jar}" />
-            <pathelement location="${jogl.gldesktop.dbg.jar}" />
-            <pathelement location="${jogl.glugldesktop.jar}" />
-            <pathelement location="${jogl.util.gldesktop.jar}" />
-            <pathelement location="${jogl.omx.jar}" />
-        </path>
-        <path id="jogl_all-mobile_atoms.classpath">
-            <pathelement location="${jogl.core.jar}" />
-            <pathelement location="${jogl.glmobile.jar}" />
-            <pathelement location="${jogl.glmobile.dbg.jar}" />
-            <pathelement location="${jogl.util.jar}" />
-            <pathelement location="${jogl.glutess.jar}" />
-            <pathelement location="${jogl.glumipmap.jar}" />
-            <pathelement location="${jogl.util.fixedfuncemu.jar}" />
-            <pathelement location="${jogl.omx.jar}" />
-        </path>
-        <!-- 
-            ${jogl.core.jar} ${jogl.glutess.jar} ${jogl.glumipmap.jar} ${jogl.glugldesktop.jar} ${jogl.os.x11.jar} ${jogl.os.win.jar} ${jogl.os.osx.jar} ${jogl.gldesktop.jar} ${jogl.gldesktop.dbg.jar} ${jogl.glmobile.jar} ${jogl.glmobile.dbg.jar} ${jogl.omx.jar} ${jogl.util.jar} ${jogl.util.gldesktop.jar} ${jogl.util.awt.jar} ${jogl.util.fixedfuncemu.jar} ${jogl.sdk.jar} -->
-
-        <property name="newt.core.jar"                  value="${build.newt}/newt.core.jar" />
-        <property name="newt.ogl.jar"                   value="${build.newt}/newt.ogl.jar" />
-        <property name="newt.awt.jar"                   value="${build.newt}/newt.awt.jar" />
-        <property name="newt.driver.x11.jar"            value="${build.newt}/newt.driver.x11.jar" />
-        <property name="newt.driver.win.jar"            value="${build.newt}/newt.driver.win.jar" />
-        <property name="newt.driver.macosx.jar"         value="${build.newt}/newt.driver.macosx.jar" />
-        <property name="newt.driver.android.jar"        value="${build.newt}/newt.driver.android.jar" />     <!-- excluded from all -->
-        <property name="newt.driver.kd.jar"             value="${build.newt}/newt.driver.kd.jar" />          <!-- excluded from all -->
-        <property name="newt.driver.intelgdl.jar"       value="${build.newt}/newt.driver.intelgdl.jar" />    <!-- excluded from all -->
-        <property name="newt.driver.broadcomegl.jar"    value="${build.newt}/newt.driver.broadcomegl.jar" /> <!-- excluded from all -->
-        <path id="newt_all_atoms.classpath">
-            <pathelement location="${newt.core.jar}" />
-            <pathelement location="${newt.ogl.jar}" />
-            <pathelement location="${newt.awt.jar}" />
-            <pathelement location="${newt.driver.x11.jar}" />
-            <pathelement location="${newt.driver.win.jar}" />
-            <pathelement location="${newt.driver.macosx.jar}" />
-        </path>
-        <path id="newt_all-noawt_atoms.classpath">
-            <pathelement location="${newt.core.jar}" />
-            <pathelement location="${newt.ogl.jar}" />
-            <pathelement location="${newt.driver.x11.jar}" />
-            <pathelement location="${newt.driver.win.jar}" />
-            <pathelement location="${newt.driver.macosx.jar}" />
-        </path>
-        <path id="newt_all-mobile_atoms.classpath">
-            <pathelement location="${newt.core.jar}" />
-            <pathelement location="${newt.ogl.jar}" />
-            <pathelement location="${newt.driver.x11.jar}" />
-            <pathelement location="${newt.driver.win.jar}" />
-        </path>
-        <path id="newt_all-android_atoms.classpath">
-            <pathelement location="${newt.core.jar}" />
-            <pathelement location="${newt.ogl.jar}" />
-            <pathelement location="${newt.driver.android.jar}" />
-        </path>
-
-        <!-- JavaSE combinations -->
-        <property name="gluegen-rt.jar"                 value="/usr/share/java/gluegen2-rt.jar" />
-        <property name="jogl.test.jar"                  value="${jar}/jogl.test.jar"/>
-
-        <!-- JavaSE combinations . AWT -->
-        <property name="jogl.all.jar"                   value="${jar}/jogl.all.jar" />
-        <property name="newt.event.jar"                 value="${jar}/newt.event.jar" />
-
-        <!-- JavaSE combinations . NO.AWT -->
-        <property name="jogl.all-noawt.jar"             value="${jar}/jogl.all-noawt.jar" />
-        <property name="jogl.all-mobile.jar"            value="${jar}/jogl.all-mobile.jar" />
-        <property name="jogl.all-android.jar"           value="${jar}/jogl.all-android.jar" />
-
-        <path id="swt_gluegen.classpath">
-            <pathelement location="${gluegen-rt.jar}" />
-            <pathelement location="${swt.jar}" />
-        </path>
-
-        <!-- JOGL Compilation .. -->
-        <path id="nativewindow_gluegen.classpath">
-            <pathelement location="${gluegen-rt.jar}" />
-            <pathelement location="${swt.jar}" />
-            <path refid="nativewindow_all_atoms.classpath" />
-        </path>
-
-        <!-- NEWT Compilation .. -->
-        <path id="jogl_nativewindow_gluegen.classpath">
-            <pathelement location="${android.jar}" />
-            <pathelement location="${gluegen-rt.jar}" />
-            <pathelement location="${swt.jar}" />
-            <path refid="nativewindow_all_atoms.classpath" />
-            <path refid="jogl_all_atoms.classpath" />
-        </path>
-
-        <!-- Test Compilation .. -->
-        <path id="junit_jogl_newt_android.compile.classpath">
-            <pathelement location="${android.jar}" />
-            <pathelement location="${junit.jar}" />
-            <pathelement location="${ant.jar}" />
-            <pathelement location="${ant-junit.jar}" />
-            <pathelement location="${gluegen-rt.jar}" />
-            <pathelement location="${swt.jar}" />
-            <path refid="nativewindow_all_atoms.classpath" />
-            <path refid="jogl_all_atoms.classpath" />
-            <path refid="newt_all_atoms.classpath" />
-            <pathelement location="${newt.driver.android.jar}" />
-        </path>
-
-        <!-- Postbuild: javadoc .. -->
-        <path id="jogl_all.classpath">
-            <pathelement location="${android.jar}" />
-            <pathelement location="${gluegen-rt.jar}" />
-            <pathelement location="${swt.jar}" />
-            <pathelement location="${jogl.all.jar}" />
-        </path>
-
-        <!-- Test Run w/ AWT .. -->
-        <path id="junit_jogl_awt.run.classpath">
-            <pathelement location="${junit.jar}" />
-            <pathelement location="${ant.jar}" />
-            <pathelement location="${ant-junit.jar}" />
-            <pathelement location="${gluegen-rt.jar}" />
-            <pathelement location="${jogl.all.jar}" />
-            <pathelement location="${jogl.test.jar}" />
-        </path>
-        <property name="junit_jogl_awt.run.jars"
-                  value="${junit.jar}${path.separator}${ant.jar}${path.separator}${ant-junit.jar}${path.separator}${gluegen-rt.jar}${path.separator}${jogl.all.jar}${path.separator}${jogl.test.jar}"/>
-
-        <!-- Test Run w/o AWT .. -->
-        <path id="junit_jogl_noawt.run.classpath">
-            <pathelement location="${junit.jar}" />
-            <pathelement location="${ant.jar}" />
-            <pathelement location="${ant-junit.jar}" />
-            <pathelement location="${gluegen-rt.jar}" />
-            <pathelement location="${jogl.all-noawt.jar}" />
-            <pathelement location="${jogl.test.jar}" />
-        </path>
-        <property name="junit_jogl_noawt.run.jars"
-                  value="${junit.jar}${path.separator}${ant.jar}${path.separator}${ant-junit.jar}${path.separator}${gluegen-rt.jar}${path.separator}${jogl.all-noawt.jar}${path.separator}${jogl.test.jar}"/>
-
-        <!-- Test Run w/ SWT .. -->
-        <path id="junit_jogl_swt.run.classpath">
-          <pathelement location="${junit.jar}" />
-          <pathelement location="${ant.jar}" />
-          <pathelement location="${ant-junit.jar}" />
-          <pathelement location="${gluegen-rt.jar}" />
-          <pathelement location="${swt.jar}" />
-          <pathelement location="${jogl.all.jar}" />
-          <pathelement location="${jogl.test.jar}" />
-        </path>
-        <property name="junit_jogl_swt.run.jars"
-                  value="${junit.jar}${path.separator}${ant.jar}${path.separator}${ant-junit.jar}${path.separator}${gluegen-rt.jar}${path.separator}${swt.jar}${path.separator}${jogl.all.jar}${path.separator}${jogl.test.jar}"/>
-
-        <!-- Test Run w/ Android [w/o AWT] .. -->
-        <path id="junit_jogl_android.run.classpath">
-            <pathelement location="${junit.jar}" />
-            <pathelement location="${ant.jar}" />
-            <pathelement location="${ant-junit.jar}" />
-            <pathelement location="${android.jar}" />
-            <pathelement location="${gluegen-rt.jar}" />
-            <pathelement location="${jogl.all-android.jar}" />
-            <pathelement location="${jogl.test.jar}" />
-        </path>
-        <property name="junit_jogl_android.run.jars"
-                  value="${junit.jar}${path.separator}${ant.jar}${path.separator}${ant-junit.jar}${path.separator}${gluegen-rt.jar}${path.separator}${jogl.all-android.jar}${path.separator}${jogl.test.jar}"/>
-
-
-        <!-- 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" />
-    </target>
-
-    <!-- ================================================================== -->
-    <!-- GlueGen and BuildStaticGLInfo creation, task setup and Java file generation -->
-    <!--
-       - Build GlueGen
-      -->
-    <target name="common.gluegen.build" depends="common.init" unless="common.gluegen.build.done">
-        <property name="common.gluegen.build.done" value="true" />
-
-        <!-- Run the GlueGen build to ensure that the GlueGen ANT task
-           - has been built. -->
-        <ant antfile="${gluegen.build.xml}" dir="${gluegen.make}" target="base.compile" inheritAll="false">
-          <property name="build" value="${basedir}/../"/>
-          <property name="test.dir" value="${basedir}/../test"/>
-        </ant>
-    </target>
-
-
-</project>

=== removed directory '.pc/linker.cfg.id.os.diff'
=== removed directory '.pc/linker.cfg.id.os.diff/make'
=== removed file '.pc/linker.cfg.id.os.diff/make/build-jogl.xml'
--- .pc/linker.cfg.id.os.diff/make/build-jogl.xml	2011-10-10 12:13:14 +0000
+++ .pc/linker.cfg.id.os.diff/make/build-jogl.xml	1970-01-01 00:00:00 +0000
@@ -1,1655 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   - Ant build for JOGL.  This build has been tested with ANT 1.7.0.  The
-   - optional.jar that contains the optional ANT tasks must be in the ANT
-   - classpath (typically the ant/lib directory).
-   -
-   - A clean download of JOGL is required for this build.
-   -
-   - This build has no dependence on environment variables; the needed
-   - ones (e.g. java.home, ANT_HOME) are all set by the Ant wrapper shell
-   - script, by the virtual machine, or elsewhere. However, on all platforms,
-   - the C compiler and linker should be in the path. All other paths that
-   - need to be set are in host.properties.
-   -
-   - NOTE:  because the GlueGen config files have their own relative paths
-   -        which cannot be overridden by GlueGen, GlueGen MUST be run from
-   -        the "make" directory. This also means that this build-jogl.xml MUST
-   -        be run from the "make" directory.
-   -
-   - Public targets:
-   -   all: (default; autodetects OS and chooses C compiler from gluegen.properties)
-   -   clean:        clean all built
-   -   javadoc:      create the standard developer Javadoc (recommended)
-   -                 (Note: should build all first - may be dependence in the future)
-   -   javadoc.spec:   create the standard developer Javadoc but exclude com.jogamp.* classes
-   -   javadoc.dev.all: create the internal developer Javadoc.  This includes the
-   -                       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 gluegen.properties
-   - is required to select the appropriate C compiler. See the example
-   - gluegen.properties in this directory for valid values. On Mac OS X
-   - universal binaries may also be built by setting the "macosxfat"
-   - property in gluegen.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
-   - the building of the jar file. Thanks to Alex Radeski for the bulk of the
-   - port to the ant-contrib CPPTask framework. Thanks to Athomas Goldberg for
-   - the original OS detection code.
-   -
-   - Some environment defs affecting native compilation (only)
-       setup.noNativeDesktop     - drop native desktop bindings (glx, wgl, ..)
-
-       setup.addNativeOpenMAX    - add experimental binding to Khrono's OpenMAX
-
-       setup.addNativeNVidiaCG   - add experimental binding to NVidia's Cg language 
-                                   (enabled for windows, osx and X11 per default)
-
-   - Internal settings, may not be necessary to set them manually,
-     since all JAR archives are orthogonal.
-       setup.noAWT
-
-   - Skip gluegen: java.generate.skip
-   -->
-<project name="JOGL" basedir="." default="all">
-
-    <import file="build-common.xml"/>
-
-    <!-- needed for outofdate task -->
-    <taskdef resource="net/sf/antcontrib/antlib.xml">
-      <classpath> <pathelement location="${ant-contrib.jar}"/> </classpath>
-    </taskdef>
-
-    <condition property="setup.addNativeNVidiaCG">
-        <or>
-            <isset property="${isWindows}" />
-            <isset property="${isOSX}" />
-            <isset property="${isX11}" />
-        </or>
-    </condition>
-
-    <!-- ================================================================== -->
-    <!-- 
-       - Base initialization and detection of operating system.
-      -->
-    <target name="partitioning.setup" depends="common.init">
-        <property name="java.part.gluegen-gl" 
-                  value="com/jogamp/gluegen/opengl/** com/jogamp/gluegen/runtime/opengl/*"/>
-
-        <property name="java.part.core" 
-                  value="javax/media/opengl/* javax/media/opengl/fixedfunc/* javax/media/opengl/glu/* javax/media/opengl/glu/gl2es1/* com/jogamp/gluegen/runtime/opengl/* com/jogamp/opengl/* jogamp/opengl/* jogamp/opengl/glu/* jogamp/opengl/glu/error/*"/>
-        <property name="java.part.core.exclude" value="javax/media/opengl/Debug* javax/media/opengl/Trace*"/>
-
-        <property name="java.part.nv-cg"
-                  value="com/jogamp/opengl/cg com/jogamp/opengl/cg/* jogamp/opengl/cg/*"/>
-
-        <property name="java.part.egl"
-                  value="jogamp/opengl/egl/*"/>
-
-        <property name="java.part.glutess"
-                  value="jogamp/opengl/glu/tessellator/**"/>
-
-        <property name="java.part.glumipmap"
-                  value="jogamp/opengl/glu/mipmap/**"/>
-
-        <property name="java.part.glugldesktop"
-                  value="jogamp/opengl/glu/gl2/** jogamp/opengl/glu/nurbs/** jogamp/opengl/glu/registry/** javax/media/opengl/glu/gl2/**"/>
-
-        <property name="java.part.openmax"
-                  value="com/jogamp/openmax/** jogamp/openmax/**"/>
-
-        <property name="java.part.sdk"
-                  value="com/jogamp/opengl/util/glsl/sdk/**"/>
-
-        <property name="java.part.glx"
-                  value="jogamp/opengl/x11/glx/*"/>
-
-        <property name="java.part.wgl"
-                  value="jogamp/opengl/windows/wgl/*"/>
-
-        <property name="java.part.cgl"
-                  value="jogamp/opengl/macosx/cgl/*"/>
-
-        <property name="java.part.gldesktop"
-                  value="jogamp/opengl/**/gl2/** jogamp/opengl/**/gl3/** jogamp/opengl/**/gl4/**"/>
-
-        <property name="java.part.gldesktop.dbg"
-                  value="javax/media/opengl/TraceGL2.* javax/media/opengl/DebugGL2.* javax/media/opengl/TraceGL2GL3.* javax/media/opengl/DebugGL2GL3.* javax/media/opengl/TraceGL3.* javax/media/opengl/DebugGL3.* javax/media/opengl/TraceGL3bc.* javax/media/opengl/DebugGL3bc.* javax/media/opengl/TraceGL4.* javax/media/opengl/DebugGL4.* javax/media/opengl/TraceGL4bc.* javax/media/opengl/DebugGL4bc.*"/>
-
-        <property name="java.part.es1"
-                  value="javax/media/opengl/**/es1/** com/jogamp/opengl/**/es1/** jogamp/opengl/**/es1/**"/>
-
-        <property name="java.part.es1.dbg"
-                  value="javax/media/opengl/TraceGLES1.* javax/media/opengl/DebugGLES1.* javax/media/opengl/TraceGL2ES1.* javax/media/opengl/DebugGL2ES1.*"/>
-
-        <property name="java.part.es2"
-                  value="javax/media/opengl/**/es2/** com/jogamp/opengl/**/es2/** jogamp/opengl/**/es2/**"/>
-
-        <property name="java.part.es2.dbg"
-                  value="javax/media/opengl/TraceGLES2.* javax/media/opengl/DebugGLES2.* javax/media/opengl/TraceGL2ES2.* javax/media/opengl/DebugGL2ES2.*"/>
-
-        <property name="java.part.awt"
-                  value="javax/media/opengl/awt/** jogamp/opengl/**/awt/**"/>
-
-        <property name="java.part.util"
-                  value="com/jogamp/opengl/util/* com/jogamp/opengl/util/texture/** com/jogamp/opengl/util/packrect/** jogamp/opengl/util/*"/>
-
-        <property name="java.part.util.awt"
-                  value="com/jogamp/opengl/util/**/awt/** com/jogamp/opengl/util/AWTAnimatorImpl*"/>
-
-        <property name="java.part.util.gldesktop"
-                  value="com/jogamp/opengl/util/**/gl2/**"/>
-
-        <property name="java.part.util.glsl"
-                  value="com/jogamp/opengl/util/glsl/* com/jogamp/opengl/util/glsl/fixedfunc/* jogamp/opengl/util/glsl/*"/>
-
-        <property name="java.part.util.graph"
-                  value="com/jogamp/graph/** jogamp/graph/**"/>
-
-        <property name="java.part.util.graph.fonts"
-                  value="jogamp/graph/font/fonts/**"/>
-
-        <property name="java.part.util.graph.shadercode"
-                  value="jogamp/graph/curve/opengl/shader/* jogamp/graph/curve/opengl/shader/bin/**"/>
-
-        <property name="java.part.util.fixedfuncemu"
-                  value="jogamp/opengl/util/glsl/fixedfunc/**"/>
-
-        <property name="java.part.util.fixedfuncemu.shadercode"
-                  value="jogamp/opengl/util/glsl/fixedfunc/shaders/* jogamp/opengl/util/glsl/fixedfunc/shaders/bin/**"/>
-
-        <property name="java.part.nonjava" 
-                  value="${java.part.util.fixedfuncemu.shadercode} ${java.part.util.graph.shadercode} ${java.part.util.graph.fonts}"/>
-
-        <property name="java.part.all-desktop" 
-                  value="${java.part.sdk} ${java.part.glx} ${java.part.wgl} ${java.part.cgl} ${java.part.gldesktop} ${java.part.glugldesktop} ${java.part.util.gldesktop}"/>
-
-        <!-- condition excludes -->
-
-        <condition property="java.excludes.awt"
-                   value="${java.part.awt} ${java.part.util.awt}">
-           <isset property="setup.noAWT"/> 
-        </condition>
-
-        <property name="java.excludes.javadoc.packagenames"
-                  value="jogamp.opengl.gl2.fixme.*,com.jogamp.audio.windows.waveout.TestSpatialization"/>
-
-        <property name="java.excludes.fixme" 
-                  value="jogamp/opengl/gl2/fixme/** com/jogamp/audio/windows/waveout/TestSpatialization.java" />
-
-        <property name="java.excludes.all" value="${java.excludes.fixme} ${java.excludes.awt}" />
-        <echo message="java.excludes.all: ${java.excludes.all}" />
-    </target>
-
-    <!-- ================================================================== -->
-    <!-- 
-       - Declare all paths and user defined variables.
-      -->
-    <target name="declare.common" description="Declare properties" depends="partitioning.setup">
-        <property name="config.jogl"              value="${config}/jogl" />
-
-        <property name="rootrel.src.java"         value="src/jogl/classes" />
-        <property name="rootrel.src.c"            value="src/jogl/native" />
-        <property name="rootrel.src.c.openmax"    value="src/jogl/native/openmax" />
-
-        <property name="rootrel.src.generated"    value="${rootrel.build}/jogl/gensrc" />
-        <property name="rootrel.generated.c.jogl" value="${rootrel.src.generated}/native/jogl" />
-        <property name="rootrel.generated.c.cg"   value="${rootrel.src.generated}/native/jogl_cg" />
-
-        <!-- The source directories. -->
-        <property name="src.java" value="${project.root}/${rootrel.src.java}" />
-        <property name="src.c"    value="${project.root}/${rootrel.src.c}" />
-        
-        <!-- The generated source directories. -->
-        <property name="src.generated" value="${build.jogl}/gensrc" />
-        <property name="src.generated.java" value="${src.generated}/classes" />
-        <property name="src.generated.java.cg" value="${src.generated.java}/com/jogamp/opengl/cg" />
-        <property name="src.generated.c" value="${src.generated}/native/jogl" />
-        <property name="src.generated.c.openmax" value="${src.generated}/native/openmax" />
-        <property name="src.generated.c.cg" value="${src.generated}/native/jogl_cg" />
-        
-        <!-- The compiler output directories. -->
-        <property name="classes"                    value="${build.jogl}/classes" />
-        <property name="obj.joglsub"                value="${obj.jogl}/jogl" />
-        <property name="obj.cgsub"                  value="${obj.jogl}/cg" />
-
-        <property name="javah.classpath" value="${gluegen-rt.jar}:${build.nativewindow}/classes:${classes}" />
-
-        <!-- The GL headers from which Java files are generated -->
-        <property name="stub.includes.opengl"       value="${stub.includes}/opengl" />
-
-        <dirset id="stub.includes.fileset.all.gldesktop" dir=".">
-            <include name="${stub.includes}/opengl/**" />
-            <include name="${stub.includes}/macosx/**" />
-            <include name="${stub.includes}/win32/**" />
-            <include name="${stub.includes}/x11/**" />
-            <include name="${stub.includes}/khr/**" />
-            <include name="${stub.includes}/jni/**" />
-        </dirset>
-
-        <fileset id="stub.includes.dependencies.fileset.1" dir="${stub.includes}">
-            <include name="opengl/**" />
-            <include name="macosx/**" />
-            <include name="win32/**" />
-            <include name="x11/**" />
-            <include name="common/**" />
-            <include name="jni/**" />
-        </fileset>
-        <fileset id="stub.includes.dependencies.fileset.2" file="${gluegen.jar}" />
-        <fileset id="stub.includes.dependencies.fileset.3" dir="${config.jogl}">
-            <include name="*.cfg" />
-            <include name="gl*.java" />
-            <include name="*.c" />
-            <exclude name="cg-common.cfg" />
-        </fileset>
-        <dirset id="stub.includes.cg.fileset.all" dir=".">
-            <include name="${stub.includes}/opengl/**" />
-            <include name="${stub.includes}/cg/**" />
-            <include name="${stub.includes}/macosx/**" />
-            <include name="${stub.includes}/win32/**" />
-            <include name="${stub.includes}/x11/**" />
-            <include name="${stub.includes}/khr/**" />
-            <include name="${stub.includes}/jni/**" />
-        </dirset>
-        <fileset id="stub.includes.cg.dependencies.fileset" dir=".">
-            <include name="${stub.includes}/cg/**" />
-            <include name="${config.jogl}/cg-common.cfg" />
-            <include name="${config.jogl}/cg-common-CustomJavaCode.java" />
-        </fileset>
-
-        <!-- Create the classpath that includes GlueGen and
-           - the current classes for building the composable pipelines.
-           -->
-        <path id="pipeline.classpath">
-          <pathelement location="${gluegen.jar}" />
-          <pathelement location="${classes}" />
-        </path>
-
-        <!-- The javadoc dirs. -->
-        <property name="javadoc" value="${project.root}/javadoc_jogl_public" />
-        <property name="javadoc.spec" value="${project.root}/javadoc_jogl_spec" />
-        <property name="javadoc.dev" value="${project.root}/javadoc_jogl_dev" />
-        <property name="javadoc.windowtitle" value="JOGL API -- JSR-231 ${jogl_base_version} Specification" />
-        <property name="javadoc.overview" value="doc/jogl/spec-overview.html" />
-        <property name="javadoc.spec.packagenames" value="javax.media.opengl.*" />
-
-        <property name="javadoc.packagenames" value="${javadoc.spec.packagenames},com.jogamp.opengl.util.*" />
-
-        <property name="javadoc.dev.packagenames" value="${javadoc.packagenames},jogamp.opengl.*,com.jogamp.gluegen,com.jogamp.gluegen.runtime" />
-    <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>
-    
-    <target name="declare.gl.gles1">
-        <property name="gles1.headers" value="${stub.includes}/opengl/GLES/*.h" /> <!-- NOTE:  this MUST be relative for FileSet --> <!-- CHECK:  this may need to be pruned for each platform -->
-    </target>
-
-    <target name="declare.gl.gles2">
-        <property name="gles2.headers" value="${stub.includes}/opengl/GLES2/*.h" /> <!-- NOTE:  this MUST be relative for FileSet --> <!-- CHECK:  this may need to be pruned for each platform -->
-    </target>
-
-    <target name="declare.gl.gles" depends="declare.gl.gles1, declare.gl.gles2">
-        <!-- Prepare to build the EGL interface -->
-        <property name="window.es.cfg"                             value="${config.jogl}/egl.cfg" />
-        <property name="window.es.ext.cfg"                         value="${config.jogl}/eglext.cfg" />
-        <property name="window.es.system"                          value="egl"/>
-    </target>
-
-    <target name="declare.gl.gl2">
-        <property name="gl2.headers" value="${stub.includes}/opengl/GL/*.h" /> <!-- NOTE:  this MUST be relative for FileSet --> <!-- CHECK:  this may need to be pruned for each platform -->
-    </target>
-
-    <!-- ================================================================== -->
-    <!-- 
-       - Initialize all parameters required for the build and create any
-       - required directories.
-      -->
-    <target name="init" depends="declare.common, declare.gl.gles, declare.gl.gl2">
-        <!-- Create the required output directories. -->
-        <mkdir dir="${src.generated.java}" />
-        <mkdir dir="${src.generated.c}" />
-        <mkdir dir="${src.generated.c}/MacOSX" />
-        <mkdir dir="${src.generated.c}/Windows" />
-        <mkdir dir="${src.generated.c}/X11" />
-        <mkdir dir="${src.generated.c.openmax}" />
-        <mkdir dir="${classes}" />
-        <mkdir dir="${obj.jogl}" />
-        <mkdir dir="${obj.joglsub}" />
-        <mkdir dir="${obj.cgsub}" />
-    </target>
-
-    <!--
-       - Check to see whether we need to rebuild the generated sources.
-      -->
-    <target name="java.generate.check">
-        <!-- Blow away all target files if any dependencies are violated
-             (the uptodate task doesn't allow arbitrary source and target filesets but should) -->
-             <!--
-        <dependset>
-            <srcfileset refid="stub.includes.dependencies.fileset.1" />
-            <srcfileset refid="stub.includes.dependencies.fileset.2" />
-            <srcfileset refid="stub.includes.dependencies.fileset.3" />
-            <targetfileset dir="${src.generated}">
-                <include name="**/*.java" />
-                <include name="**/*.c" />
-            </targetfileset>
-        </dependset>
-        -->
-
-        <!-- Now check for the presence of one well-known file -->
-        <uptodate property="java.generate.skip.es1"
-                  targetfile="${src.generated.java}/javax/media/opengl/GLES1.java">
-            <srcfiles refid="stub.includes.dependencies.fileset.1" />
-            <srcfiles refid="stub.includes.dependencies.fileset.2" />
-            <srcfiles refid="stub.includes.dependencies.fileset.3" />
-        </uptodate>
-        <uptodate property="java.generate.skip.es2"
-                  targetfile="${src.generated.java}/javax/media/opengl/GLES2.java">
-            <srcfiles refid="stub.includes.dependencies.fileset.1" />
-            <srcfiles refid="stub.includes.dependencies.fileset.2" />
-            <srcfiles refid="stub.includes.dependencies.fileset.3" />
-        </uptodate>
-        <uptodate property="java.generate.skip.gl2"
-                  targetfile="${src.generated.java}/javax/media/opengl/GL2.java">
-            <srcfiles refid="stub.includes.dependencies.fileset.1" />
-            <srcfiles refid="stub.includes.dependencies.fileset.2" />
-            <srcfiles refid="stub.includes.dependencies.fileset.3" />
-        </uptodate>
-        <uptodate property="java.generate.skip.glu"
-                  targetfile="${src.generated.java}/javax/media/opengl/glu/GLU.java">
-            <srcfiles refid="stub.includes.dependencies.fileset.1" />
-            <srcfiles refid="stub.includes.dependencies.fileset.2" />
-            <srcfiles refid="stub.includes.dependencies.fileset.3" />
-        </uptodate>
-
-        <condition property="java.generate.skip">
-          <and>
-              <isset property="java.generate.skip.es1"/>
-              <isset property="java.generate.skip.es2"/>
-              <isset property="java.generate.skip.gl2"/>
-              <isset property="java.generate.skip.glu"/>
-          </and>
-        </condition>
-
-        <!--property name="java.generate.skip" value="true"/-->
-    </target>
-
-    <target name="java.generate.cleantemp">
-        <delete includeEmptyDirs="true" quiet="true">
-            <fileset dir="${tempdir}/gensrc" />
-        </delete>
-    </target>
-
-    <target name="java.generate.copy2temp">
-        <copy todir="${tempdir}">
-            <fileset dir="${build.jogl}"
-                     includes="gensrc/classes/**" />
-        </copy>
-    </target>
-
-    <target name="java.generate.gl_if">
-        <echo message="Generating GL interface" />
-        <antcall target="java.generate.copy2temp" inheritRefs="true" />
-        <gluegen src="${stub.includes.opengl}/gles2.c"
-                 outputRootDir="${build.jogl}"
-                 config="${config.jogl}/gl-if-gl.cfg"
-                 includeRefid="stub.includes.fileset.all.gldesktop" 
-                 literalInclude="${stub.includes.gluegen.gg}"
-                 emitter="com.jogamp.gluegen.opengl.GLEmitter"
-                 debug="false">
-            <classpath refid="gluegen-gl.classpath" />
-        </gluegen>
-    </target>
-
-    <target name="java.generate.gl2_es1_if">
-        <echo message="Generating GL2_ES1 interface" />
-        <antcall target="java.generate.copy2temp" inheritRefs="true" />
-        <gluegen src="${stub.includes.opengl}/gles1.c"
-                 outputRootDir="${build.jogl}"
-                 config="${config.jogl}/gl-if-gl2_es1.cfg" 
-                 includeRefid="stub.includes.fileset.all.gldesktop"
-                 literalInclude="${stub.includes.gluegen.gg}"
-                 emitter="com.jogamp.gluegen.opengl.GLEmitter">
-            <classpath refid="gluegen-gl.classpath" />
-        </gluegen>
-    </target>
-
-    <target name="java.generate.gl2_es2_if">
-        <echo message="Generating GL2_ES2 interface" />
-        <antcall target="java.generate.copy2temp" inheritRefs="true" />
-        <gluegen src="${stub.includes.opengl}/gles2.c"
-                 outputRootDir="${build.jogl}"
-                 config="${config.jogl}/gl-if-gl2_es2.cfg" 
-                 includeRefid="stub.includes.fileset.all.gldesktop"
-                 literalInclude="${stub.includes.gluegen.gg}"
-                 emitter="com.jogamp.gluegen.opengl.GLEmitter">
-            <classpath refid="gluegen-gl.classpath" />
-        </gluegen>
-    </target>
-
-    <target name="java.generate.gl2_gl3_if">
-        <echo message="Generating GL2_GL3 interface" />
-        <antcall target="java.generate.copy2temp" inheritRefs="true" />
-        <gluegen src="${stub.includes.opengl}/gl3.c" 
-                 outputRootDir="${build.jogl}"
-                 config="${config.jogl}/gl-if-gl3-subset.cfg"
-                 includeRefid="stub.includes.fileset.all.gldesktop"
-                 literalInclude="${stub.includes.gluegen.gg}"
-                 emitter="com.jogamp.gluegen.opengl.GLEmitter"
-                 debug="false">
-            <classpath refid="gluegen-gl.classpath" />
-        </gluegen>
-        <gluegen src="${stub.includes.opengl}/gl2.c" 
-                 outputRootDir="${build.jogl}"
-                 config="${config.jogl}/gl-if-gl2_gl3.cfg"
-                 includeRefid="stub.includes.fileset.all.gldesktop"
-                 literalInclude="${stub.includes.gluegen.gg}"
-                 emitter="com.jogamp.gluegen.opengl.GLEmitter">
-            <classpath refid="gluegen-gl.classpath" />
-        </gluegen>
-    </target>
-
-    <target name="java.generate.gl2">
-        <echo message="Generating GL2 interface and implementation" />
-        <antcall target="java.generate.copy2temp" inheritRefs="true" />
-        <gluegen src="${stub.includes.opengl}/gl2.c" 
-                 outputRootDir="${build.jogl}"
-                 config="${config.jogl}/gl-if-gl2.cfg"
-                 includeRefid="stub.includes.fileset.all.gldesktop"
-                 literalInclude="${stub.includes.gluegen.gg}"
-                 emitter="com.jogamp.gluegen.opengl.GLEmitter">
-            <classpath refid="gluegen-gl.classpath" />
-        </gluegen>
-    </target>
-
-    <target name="java.generate.gl3">
-        <echo message="Generating GL3 interface and implementation" />
-        <antcall target="java.generate.copy2temp" inheritRefs="true" />
-        <gluegen src="${stub.includes.opengl}/gl3.c" 
-                 outputRootDir="${build.jogl}"
-                 config="${config.jogl}/gl-if-gl3.cfg"
-                 includeRefid="stub.includes.fileset.all.gldesktop"
-                 literalInclude="${stub.includes.gluegen.gg}"
-                 emitter="com.jogamp.gluegen.opengl.GLEmitter">
-            <classpath refid="gluegen-gl.classpath" />
-        </gluegen>
-    </target>
-
-    <target name="java.generate.gl3bc">
-        <echo message="Generating GL3bc implementation" />
-        <antcall target="java.generate.copy2temp" inheritRefs="true" />
-        <gluegen src="${stub.includes.opengl}/gl3bc.c" 
-                 outputRootDir="${build.jogl}"
-                 config="${config.jogl}/gl-if-gl3bc.cfg"
-                 includeRefid="stub.includes.fileset.all.gldesktop"
-                 literalInclude="${stub.includes.gluegen.gg}"
-                 emitter="com.jogamp.gluegen.opengl.GLEmitter">
-            <classpath refid="gluegen-gl.classpath" />
-        </gluegen>
-    </target>
-
-    <target name="java.generate.gl4">
-        <echo message="Generating GL4 interface and implementation" />
-        <antcall target="java.generate.copy2temp" inheritRefs="true" />
-        <gluegen src="${stub.includes.opengl}/gl4.c" 
-                 outputRootDir="${build.jogl}"
-                 config="${config.jogl}/gl-if-gl4.cfg"
-                 includeRefid="stub.includes.fileset.all.gldesktop"
-                 literalInclude="${stub.includes.gluegen.gg}"
-                 emitter="com.jogamp.gluegen.opengl.GLEmitter">
-            <classpath refid="gluegen-gl.classpath" />
-        </gluegen>
-    </target>
-
-    <target name="java.generate.gl4bc">
-        <echo message="Generating GL4bc implementation" />
-        <antcall target="java.generate.copy2temp" inheritRefs="true" />
-        <gluegen src="${stub.includes.opengl}/gl4bc.c" 
-                 outputRootDir="${build.jogl}"
-                 config="${config.jogl}/gl-gl4bc.cfg"
-                 includeRefid="stub.includes.fileset.all.gldesktop"
-                 literalInclude="${stub.includes.gluegen.gg}"
-                 emitter="com.jogamp.gluegen.opengl.GLEmitter"
-                 debug="false">
-            <classpath refid="gluegen-gl.classpath" />
-        </gluegen>
-    </target>
-
-    <target name="java.generate.gles1">
-        <echo message="Generating GLES1 interface and implementation" />
-        <antcall target="java.generate.copy2temp" inheritRefs="true" />
-        <gluegen src="${stub.includes.opengl}/gles1.c" 
-                 outputRootDir="${build.jogl}"
-                 config="${config.jogl}/gl-es1.cfg"
-                 includeRefid="stub.includes.fileset.all.gldesktop"
-                 literalInclude="${stub.includes.gluegen.gg}"
-                 emitter="com.jogamp.gluegen.opengl.GLEmitter"
-                 debug="false">
-            <classpath refid="gluegen-gl.classpath" />
-        </gluegen>
-    </target>
-
-    <target name="java.generate.gles2">
-        <echo message="Generating GLES2 interface and implementation" />
-        <antcall target="java.generate.copy2temp" inheritRefs="true" />
-        <gluegen src="${stub.includes.opengl}/gles2.c" 
-                 outputRootDir="${build.jogl}"
-                 config="${config.jogl}/gl-es2.cfg"
-                 includeRefid="stub.includes.fileset.all.gldesktop"
-                 literalInclude="${stub.includes.gluegen.gg}"
-                 emitter="com.jogamp.gluegen.opengl.GLEmitter">
-            <classpath refid="gluegen-gl.classpath" />
-        </gluegen>
-    </target>
-
-    <target name="java.generate.gl.all" depends="java.generate.gl_if, java.generate.gl2_es1_if, java.generate.gl2_es2_if, java.generate.gl2_gl3_if, java.generate.gl2, java.generate.gl3, java.generate.gl3bc, java.generate.gl4, java.generate.gl4bc, java.generate.gles1, java.generate.gles2"/>
-
-    <!-- target name="java.generate.gl.nsig" if="gluegen.nsig">
-        <echo message="Generating GL interface and implementation" />
-        <gluegen src="${gl.c}" 
-                 config="${gl.cfg.nsig}"
-                 includeRefid="stub.includes.fileset.all.gldesktop"
-                 literalInclude="${stub.includes.gluegen.gg}"
-                 emitter="com.jogamp.gluegen.nativesig.NativeSignatureEmitter">
-            <classpath refid="gluegen-gl.classpath" />
-        </gluegen>
-    </target> -->
-
-    <target name="java.generate.glu.base">
-        <echo message="Generating GLU class" />
-        <antcall target="java.generate.copy2temp" inheritRefs="true" />
-        <gluegen src="${stub.includes.opengl}/glu.c" 
-                 outputRootDir="${build.jogl}"
-                 config="${config.jogl}/glu-base.cfg"
-                 includeRefid="stub.includes.fileset.all.gldesktop"
-                 literalInclude="${stub.includes.gluegen.gg}"
-                 emitter="com.jogamp.gluegen.opengl.GLEmitter">
-            <classpath refid="gluegen-gl.classpath" />
-        </gluegen>
-    </target>
-
-    <target name="java.generate.glu.GL2ES1">
-        <echo message="Generating GLU class" />
-        <antcall target="java.generate.copy2temp" inheritRefs="true" />
-        <gluegen src="${stub.includes.opengl}/glu.c" 
-                 outputRootDir="${build.jogl}"
-                 config="${config.jogl}/glu-gl2es1.cfg"
-                 includeRefid="stub.includes.fileset.all.gldesktop"
-                 literalInclude="${stub.includes.gluegen.gg}"
-                 emitter="com.jogamp.gluegen.opengl.GLEmitter">
-            <classpath refid="gluegen-gl.classpath" />
-        </gluegen>
-    </target>
-
-    <target name="java.generate.glu.GL2">
-        <echo message="Generating GLU class" />
-        <antcall target="java.generate.copy2temp" inheritRefs="true" />
-        <gluegen src="${stub.includes.opengl}/glu.c" 
-                 outputRootDir="${build.jogl}"
-                 config="${config.jogl}/glu-gl2.cfg"
-                 includeRefid="stub.includes.fileset.all.gldesktop"
-                 literalInclude="${stub.includes.gluegen.gg}"
-                 emitter="com.jogamp.gluegen.opengl.GLEmitter">
-            <classpath refid="gluegen-gl.classpath" />
-        </gluegen>
-    </target>
-
-    <target name="java.generate.platform.glext">
-        <echo message="Generating platform-specific OpenGL extension class: ${window.os.system}" />
-        <antcall target="java.generate.copy2temp" inheritRefs="true" />
-        <gluegen src="${glext.platform.header}" 
-                 outputRootDir="${build.jogl}"
-                 config="${glext.platform.cfg}"
-                 includeRefid="stub.includes.fileset.all.gldesktop"
-                 literalInclude="${stub.includes.gluegen.gg}"
-                 emitter="com.jogamp.gluegen.opengl.GLEmitter">
-            <classpath refid="gluegen-gl.classpath" />
-        </gluegen>
-    </target>
-
-    <target name="java.generate.window.system.es" if="window.es.cfg">
-        <echo message="Generating EGL implementation class" />
-        <antcall target="java.generate.copy2temp" inheritRefs="true" />
-        <dirset id="stub.includes.fileset.platform" dir="." includes="${stub.includes}/${window.es.system}/** ${stub.includes}/gluegen/** ${stub.includes}/khr/**" />
-        <gluegen src="${stub.includes}/${window.es.system}/window-system1.c"
-                 outputRootDir="${build.jogl}"
-                 config="${window.es.cfg}"
-                 includeRefid="stub.includes.fileset.platform"
-                 literalInclude="${stub.includes.gluegen.gg}"
-                 emitter="com.jogamp.gluegen.opengl.GLEmitter"
-                 debug="false">
-            <classpath refid="gluegen-gl.classpath" />
-        </gluegen>
-    </target>
-
-    <target name="java.generate.window.system.es.ext" if="window.es.ext.cfg">
-        <echo message="Generating EGLExt implementation class" />
-        <antcall target="java.generate.copy2temp" inheritRefs="true" />
-        <dirset id="stub.includes.fileset.platform" dir="." includes="${stub.includes}/${window.es.system}/** ${stub.includes}/gluegen/** ${stub.includes}/khr/**" />
-        <gluegen src="${stub.includes}/${window.es.system}/window-system-ext.c"
-                 outputRootDir="${build.jogl}"
-                 config="${window.es.ext.cfg}"
-                 includeRefid="stub.includes.fileset.platform"
-                 literalInclude="${stub.includes.gluegen.gg}"
-                 emitter="com.jogamp.gluegen.opengl.GLEmitter"
-                 debug="false">
-            <classpath refid="gluegen-gl.classpath" />
-        </gluegen>
-    </target>
-
-    <target name="java.generate.window.system.os0" if="window.os0.cfg">
-        <echo message="Generating window system glue impl: ${window.os.system}" />
-        <antcall target="java.generate.copy2temp" inheritRefs="true" />
-        <gluegen src="${stub.includes}/${window.os.system}/window-system0.c"
-                 outputRootDir="${build.jogl}"
-                 config="${window.os0.cfg}"
-                 includeRefid="stub.includes.fileset.platform"
-                 literalInclude="${stub.includes.gluegen.gg}"
-                 emitter="com.jogamp.gluegen.opengl.GLEmitter">
-            <classpath refid="gluegen-gl.classpath" />
-        </gluegen>
-    </target>
-
-    <target name="java.generate.window.system.os1" if="window.os1.cfg">
-        <echo message="Generating window system glue impl: ${window.os.system}" />
-        <antcall target="java.generate.copy2temp" inheritRefs="true" />
-        <gluegen src="${stub.includes}/${window.os.system}/window-system1.c"
-                 outputRootDir="${build.jogl}"
-                 config="${window.os1.cfg}"
-                 includeRefid="stub.includes.fileset.platform"
-                 literalInclude="${stub.includes.gluegen.gg}"
-                 emitter="com.jogamp.gluegen.opengl.GLEmitter">
-            <classpath refid="gluegen-gl.classpath" />
-        </gluegen>
-    </target>
-
-    <target name="java.generate.gl.platforms" >
-        <dirset id="stub.includes.fileset.platform" dir="." includes="${stub.includes}/${window.os.system}/** ${stub.includes}/${window.es.system}/** ${stub.includes}/gluegen/** ${stub.includes}/khr/** ${stub.includes}/opengl/**" />
-
-        <antcall target="java.generate.window.system.os0" inheritRefs="true" />
-        <antcall target="java.generate.window.system.os1" inheritRefs="true" />
-        <antcall target="java.generate.platform.glext" inheritRefs="true" />
-    </target>
-
-    <!--
-       - Setup the generating ANT tasks and use it to generate the Java files 
-       - from the C GL headers.  This involves setting the taskdef and creating
-       - the classpath reference id then running the task on each header.
-      -->
-    <target name="build.gluegen-gl.jar" depends="init, common.gluegen.build, setup-manifestfile">
-        <javac destdir="${classes}"
-               includes="${java.part.gluegen-gl}"
-               fork="yes"
-               memoryMaximumSize="${javac.memorymax}"
-               includeAntRuntime="true"
-               source="${target.sourcelevel}" debug="${javacdebug}" debuglevel="${javacdebuglevel}">
-            <classpath refid="gluegen-gl.classpath"/>
-            <src path="${src.java}" />
-        </javac>
-
-        <jar manifest="${build.jogl}/manifest.mf" destfile="${gluegen-gl.jar}" filesonly="true">
-            <fileset dir="${classes}"
-                     includes="${java.part.gluegen-gl}"/>
-        </jar>
-    </target>
-
-    <target name="java.generate" depends="build.gluegen-gl.jar, java.generate.check" unless="java.generate.skip">
-
-        <!-- Add the GlueGen and BuildStaticGLInfo tasks to ANT -->
-        <taskdef name="gluegen" classname="com.jogamp.gluegen.ant.GlueGenTask"
-                 classpathref="gluegen.classpath" />
-        <taskdef name="staticglgen" classname="com.jogamp.gluegen.opengl.ant.StaticGLGenTask"
-                 classpathref="gluegen-gl.classpath" />
-                 
-        <!-- Use the GlueGen and BuildStaticGLInfo tasks to generate the Java files -->
-
-        <!-- Just to have a fast test of single interfaces .. 
-            <antcall target="java.generate.gl_if"      inheritRefs="true" />
-            <antcall target="java.generate.gl2_es1_if" inheritRefs="true" />
-            <antcall target="java.generate.gl2_es2_if" inheritRefs="true" />
-            <antcall target="java.generate.gl2_gl3_if" inheritRefs="true" />
-            <antcall target="java.generate.gles1" inheritRefs="true"/>
-            <antcall target="java.generate.window.system.es" inheritRefs="true" />
-            <antcall target="java.generate.window.system.es.ext" inheritRefs="true" />
-            <antcall target="java.generate.gl4bc" inheritRefs="true"/>
-            <fail/>  -->
-
-        <echo message="Generating GL interface and implementation" />
-        <antcall target="java.generate.gl.all"      inheritRefs="true" />
-        <!--antcall target="java.generate.gl.nsig" inheritRefs="true" /-->
-
-        <antcall target="java.generate.window.system.es"     inheritRefs="true" />
-        <antcall target="java.generate.window.system.es.ext" inheritRefs="true" />
-
-        <antcall target="java.generate.gl.platforms" inheritRefs="true">
-            <param name="window.os.system"                       value="x11"/>
-            <param name="window.os1.cfg"                         value="${config.jogl}/glx-x11.cfg" />
-            <param name="glext.platform.cfg"                     value="${config.jogl}/glxext.cfg" />
-            <param name="glext.platform.header"                  value="${stub.includes}/x11/glxext.c" />
-        </antcall>
-
-        <antcall target="java.generate.gl.platforms" inheritRefs="true">
-            <param name="window.os.system"                       value="win32"/>
-            <param name="window.os1.cfg"                         value="${config.jogl}/wgl-win32.cfg" />
-            <param name="glext.platform.cfg"                     value="${config.jogl}/wglext.cfg" />
-            <param name="glext.platform.header"                  value="${stub.includes}/win32/wglext.c" />
-        </antcall>          
-
-        <antcall target="java.generate.gl.platforms" inheritRefs="true">
-          <param name="window.os.system"                     value="macosx"/>
-          <param name="window.os1.cfg"                       value="${config.jogl}/cgl-macosx.cfg" />
-          <param name="glext.platform.cfg"                   value="${config.jogl}/cglext.cfg" />
-          <param name="glext.platform.header"                value="${stub.includes}/macosx/cglext.c" />
-        </antcall>
-    
-        <!-- Generate GLU class -->
-        <antcall target="java.generate.glu.base"   inheritrefs="true" />
-        <antcall target="java.generate.glu.GL2ES1" inheritrefs="true" />
-        <antcall target="java.generate.glu.GL2"    inheritrefs="true" />
-
-        <!-- Inform the user that the generators have successfully created 
-           - the necessary Java files -->
-        <echo message="" />
-        <echo message="GlueGen and BuildStaticGLInfo have successfully generated files." />
-    
-    </target>      
-
-    <target name="java.generate.cg.check">
-        <!-- Blow away all target files if any dependencies are violated
-             (the uptodate task doesn't allow arbitrary source and target filesets but should) -->
-        <dependset>
-            <srcfileset refid="stub.includes.cg.dependencies.fileset" />
-            <targetfileset dir=".">
-                <include name="${src.generated.java.cg}/**/*.java" />
-                <include name="${src.generated.c.cg}/**/*.c" />
-            </targetfileset>
-        </dependset>
-
-        <!-- Now check for the presence of one well-known file -->
-        <uptodate property="java.generate.cg.skip">
-            <srcfiles refid="stub.includes.cg.dependencies.fileset" />
-            <mapper type="merge" to="${src.generated.java}/com/jogamp/opengl/cg/CgGL.java" />
-        </uptodate>
-    </target>
-
-    <!--
-       - Setup the generating ANT tasks and use it to generate the Java files 
-       - from the C GL headers.  This involves setting the taskdef and creating
-       - the classpath reference id then running the task on each header.
-      -->
-    <target name="java.generate.cg" depends="build.gluegen-gl.jar,java.generate.cg.check" unless="java.generate.cg.skip">
-        <!-- Add the GlueGen and BuildStaticGLInfo tasks to ANT -->
-        <taskdef name="gluegen" classname="com.jogamp.gluegen.ant.GlueGenTask"
-                 classpathref="gluegen.classpath" />
-        <taskdef name="staticglgen" classname="com.jogamp.gluegen.opengl.ant.StaticGLGenTask"
-                 classpathref="gluegen-gl.classpath" />
-
-        <!-- Generate CgGL interface class -->
-        <gluegen src="${stub.includes.opengl}/cg.c" 
-                 outputRootDir="${build.jogl}"
-                 config="${config.jogl}/cg-common.cfg"
-                 includeRefid="stub.includes.cg.fileset.all"
-                 literalInclude="${stub.includes.gluegen.gg}"
-                 emitter="com.jogamp.gluegen.procaddress.ProcAddressEmitter">
-            <classpath refid="gluegen-gl.classpath" />
-        </gluegen>
-    </target>
-
-    <!-- ================================================================== -->
-    <!-- 
-       - Build and dependency rules for the composable pipeline
-      -->
-    <target name="java.generate.composable.pipeline.check.es1">
-        <!-- Blow away the DebugGL*.java and TraceGL*.java sources if GL*.class has changed
-             (the uptodate element doesn't support arbitrary source and destination files) -->
-        <dependset>
-            <srcfilelist dir="${classes}/javax/media/opengl" files="GLES1.class" />
-            <targetfileset dir="${src.generated.java}/javax/media/opengl"
-                           includes="DebugGLES1.java,TraceGLES1.java" />
-        </dependset>
-                           
-        <!-- Now choose one of the two to test to see if we have to regenerate -->
-        <uptodate property="java.generate.composable.pipeline.skip.es1"
-                  srcfile="${classes}/javax/media/opengl/GLES1.class"
-                  targetfile="${src.generated.java}/javax/media/opengl/DebugGLES1.java" />
-
-    </target>        
-
-    <target name="java.generate.composable.pipeline.check.es2">
-        <!-- Blow away the DebugGL*.java and TraceGL*.java sources if GL*.class has changed
-             (the uptodate element doesn't support arbitrary source and destination files) -->
-        <dependset>
-            <srcfilelist dir="${classes}/javax/media/opengl" files="GLES2.class" />
-            <targetfileset dir="${src.generated.java}/javax/media/opengl"
-                           includes="DebugGLES2.java,TraceGLES2.java" />
-        </dependset>
-                           
-        <!-- Now choose one of the two to test to see if we have to regenerate -->
-        <uptodate property="java.generate.composable.pipeline.skip.es2"
-                  srcfile="${classes}/javax/media/opengl/GLES2.class"
-                  targetfile="${src.generated.java}/javax/media/opengl/DebugGLES2.java" />
-
-    </target>        
-
-    <target name="java.generate.composable.pipeline.check.gl2">
-        <!-- Blow away the DebugGL*.java and TraceGL*.java sources if GL*.class has changed
-             (the uptodate element doesn't support arbitrary source and destination files) -->
-        <dependset>
-            <srcfilelist dir="${classes}/javax/media/opengl" files="GL2.class" />
-            <targetfileset dir="${src.generated.java}/javax/media/opengl"
-                           includes="DebugGL2.java,TraceGL2.java" />
-        </dependset>
-
-        <!-- Now choose one of the two to test to see if we have to regenerate -->
-        <uptodate property="java.generate.composable.pipeline.skip.gl2"
-                  srcfile="${classes}/javax/media/opengl/GL2.class"
-                  targetfile="${src.generated.java}/javax/media/opengl/DebugGL2.java" />
-    </target>        
-
-    <target name="java.generate.composable.pipeline.check.gl3">
-        <!-- Blow away the DebugGL*.java and TraceGL*.java sources if GL*.class has changed
-             (the uptodate element doesn't support arbitrary source and destination files) -->
-        <dependset>
-            <srcfilelist dir="${classes}/javax/media/opengl" files="GL3.class" />
-            <targetfileset dir="${src.generated.java}/javax/media/opengl"
-                           includes="DebugGL3.java,TraceGL3.java,DebugGL3bc.java,TraceGL3bc.java" />
-        </dependset>
-                           
-        <!-- Now choose one of the two to test to see if we have to regenerate -->
-        <uptodate property="java.generate.composable.pipeline.skip.gl3"
-                  srcfile="${classes}/javax/media/opengl/GL3.class"
-                  targetfile="${src.generated.java}/javax/media/opengl/DebugGL3.java" />
-    </target>        
-
-    <target name="java.generate.composable.pipeline.check.gl4">
-        <!-- Blow away the DebugGL*.java and TraceGL*.java sources if GL*.class has changed
-             (the uptodate element doesn't support arbitrary source and destination files) -->
-        <dependset>
-            <srcfilelist dir="${classes}/javax/media/opengl" files="GL4.class" />
-            <targetfileset dir="${src.generated.java}/javax/media/opengl"
-                           includes="DebugGL4.java,TraceGL4.java,DebugGL4bc.java,TraceGL4bc.java" />
-        </dependset>
-                           
-        <!-- Now choose one of the two to test to see if we have to regenerate -->
-        <uptodate property="java.generate.composable.pipeline.skip.gl4"
-                  srcfile="${classes}/javax/media/opengl/GL4.class"
-                  targetfile="${src.generated.java}/javax/media/opengl/DebugGL4.java" />
-    </target>        
-
-    <target name="java.generate.composable.pipeline.es1" depends="java.generate.composable.pipeline.check.es1" unless="java.generate.composable.pipeline.skip.es1">
-        <java classname="com.jogamp.gluegen.opengl.BuildComposablePipeline" fork="yes" failonerror="true">
-            <arg value="javax.media.opengl.GLES1" />
-            <arg value="${src.generated.java}/javax/media/opengl" />
-            <classpath refid="pipeline.classpath" />
-        </java>
-        <java classname="com.jogamp.gluegen.opengl.BuildComposablePipeline" fork="yes" failonerror="true">
-            <arg value="javax.media.opengl.GL2ES1" />
-            <arg value="${src.generated.java}/javax/media/opengl" />
-            <classpath refid="pipeline.classpath" />
-        </java>
-    </target>          
-
-    <target name="java.generate.composable.pipeline.es2" depends="java.generate.composable.pipeline.check.es2" unless="java.generate.composable.pipeline.skip.es2">
-        <java classname="com.jogamp.gluegen.opengl.BuildComposablePipeline" fork="yes" failonerror="true">
-            <arg value="javax.media.opengl.GLES2" />
-            <arg value="${src.generated.java}/javax/media/opengl" />
-            <classpath refid="pipeline.classpath" />
-        </java>
-        <java classname="com.jogamp.gluegen.opengl.BuildComposablePipeline" fork="yes" failonerror="true">
-            <arg value="javax.media.opengl.GL2ES2" />
-            <arg value="${src.generated.java}/javax/media/opengl" />
-            <classpath refid="pipeline.classpath" />
-        </java>
-    </target>          
-
-    <target name="java.generate.composable.pipeline.gl2" depends="java.generate.composable.pipeline.check.gl2" unless="java.generate.composable.pipeline.skip.gl2">
-        <java classname="com.jogamp.gluegen.opengl.BuildComposablePipeline" fork="yes" failonerror="true">
-            <arg value="javax.media.opengl.GL2" />
-            <arg value="${src.generated.java}/javax/media/opengl" />
-            <classpath refid="pipeline.classpath" />
-        </java>
-        <java classname="com.jogamp.gluegen.opengl.BuildComposablePipeline" fork="yes" failonerror="true">
-            <arg value="javax.media.opengl.GL2GL3" />
-            <arg value="${src.generated.java}/javax/media/opengl" />
-            <classpath refid="pipeline.classpath" />
-        </java>
-    </target>          
-
-    <target name="java.generate.composable.pipeline.gl3" depends="java.generate.composable.pipeline.check.gl3" unless="java.generate.composable.pipeline.skip.gl3">
-        <java classname="com.jogamp.gluegen.opengl.BuildComposablePipeline" fork="yes" failonerror="true">
-            <arg value="javax.media.opengl.GL3" />
-            <arg value="${src.generated.java}/javax/media/opengl" />
-            <classpath refid="pipeline.classpath" />
-        </java>
-
-        <java classname="com.jogamp.gluegen.opengl.BuildComposablePipeline" fork="yes" failonerror="true">
-            <arg value="javax.media.opengl.GL3bc" />
-            <arg value="${src.generated.java}/javax/media/opengl" />
-            <classpath refid="pipeline.classpath" />
-        </java>
-    </target>          
-
-    <target name="java.generate.composable.pipeline.gl4" depends="java.generate.composable.pipeline.check.gl4" unless="java.generate.composable.pipeline.skip.gl4">
-        <java classname="com.jogamp.gluegen.opengl.BuildComposablePipeline" fork="yes" failonerror="true">
-            <arg value="javax.media.opengl.GL4" />
-            <arg value="${src.generated.java}/javax/media/opengl" />
-            <classpath refid="pipeline.classpath" />
-        </java>
-
-        <java classname="com.jogamp.gluegen.opengl.BuildComposablePipeline" fork="yes" failonerror="true">
-            <arg value="javax.media.opengl.GL4bc" />
-            <arg value="${src.generated.java}/javax/media/opengl" />
-            <classpath refid="pipeline.classpath" />
-        </java>
-    </target>          
-
-    <target name="java.generate.composable.pipeline" depends="java.generate.composable.pipeline.es1, java.generate.composable.pipeline.es2, java.generate.composable.pipeline.gl2, java.generate.composable.pipeline.gl3, java.generate.composable.pipeline.gl4">
-    </target>
-
-    <target name="java.generate.composable.pipeline.custom.check.glfixfunc">
-        <!-- Blow away the DebugGL*.java and TraceGL*.java sources if GL*.class has changed
-             (the uptodate element doesn't support arbitrary source and destination files) -->
-        <dependset>
-            <srcfilelist dir="${classes}/jogamp/opengl/util/glsl/fixedfunc" files="FixedFuncHook.class" />
-            <srcfilelist dir="${classes}/javax/media/opengl" files="GL2ES1.class" />
-            <srcfilelist dir="${classes}/javax/media/opengl" files="GL2ES2.class" />
-            <targetfileset dir="${src.generated.java}/jogamp/opengl/util/glsl/fixedfunc"
-                           includes="FixedFuncImpl.java" />
-        </dependset>
-                           
-        <!-- Now choose one of the two to test to see if we have to regenerate -->
-        <uptodate property="java.generate.composable.pipeline.custom.skip.glfixfunc"
-                  srcfile="${classes}/javax/media/opengl/GL2ES1.class"
-                  targetfile="${src.generated.java}/jogamp/opengl/util/glsl/fixedfunc/FixedFuncImpl.java" />
-    </target>        
-    <target name="java.generate.composable.pipeline.custom.glfixfunc" depends="java.generate.composable.pipeline.custom.check.glfixfunc" unless="java.generate.composable.pipeline.custom.skip.glfixfunc">
-        <java classname="com.jogamp.gluegen.opengl.BuildComposablePipeline" fork="yes" failonerror="true">
-            <arg value="javax.media.opengl.GL2ES1" />
-            <arg value="${src.generated.java}/jogamp/opengl/util/glsl/fixedfunc" />
-            <arg value="jogamp.opengl.util.glsl.fixedfunc.FixedFuncImpl" />
-            <arg value="jogamp.opengl.util.glsl.fixedfunc.FixedFuncHook" />
-            <arg value="javax.media.opengl.GL2ES2" />
-            <arg value="prolog_xor_downstream" />
-            <classpath refid="pipeline.classpath" />
-        </java>
-    </target>          
-    <target name="java.generate.composable.pipeline.custom" depends="init, common.gluegen.build, java.generate.composable.pipeline.custom.glfixfunc">
-    </target>
-
-    <!-- ================================================================== -->
-    <!-- 
-       - Compile the original and generated source.  The composable pipelines
-       - will be generated.
-      -->
-    <target name="java.compile.firstpass" depends="java.generate,java.generate.cg">
-        <antcall target="java.generate.cleantemp" inheritRefs="true" />
-
-        <!-- Perform the first pass Java compile. -->
-        <javac destdir="${classes}"
-               includes="javax/media/opengl/fixedfunc/** javax/media/opengl/GLDrawableFactory.java javax/media/opengl/GLDrawable.java javax/media/opengl/GLContext.java javax/media/opengl/GL.java javax/media/opengl/GL2ES1.java javax/media/opengl/GL2ES2.java javax/media/opengl/GL2GL3.java javax/media/opengl/GL2.java javax/media/opengl/GLES1.java javax/media/opengl/GLES2.java javax/media/opengl/GL3.java javax/media/opengl/GL3bc.java javax/media/opengl/GL4.java javax/media/opengl/GL4bc.java"
-               fork="yes"
-               memoryMaximumSize="${javac.memorymax}"
-               includeAntRuntime="false"
-               source="${target.sourcelevel}" debug="${javacdebug}" debuglevel="${javacdebuglevel}">
-            <classpath refid="nativewindow_gluegen.classpath"/>
-            <src path="${src.java}" />
-            <src path="${src.generated.java}" />
-        </javac>
-    </target>
-
-    <target name="java.compile.secondpass.javase">
-        <!-- Perform the second pass Java compile; everything except portion of fixed function emulation depending on generated code. -->
-        <javac destdir="${classes}"
-               excludes="com/jogamp/opengl/util/glsl/fixedfunc/FixedFuncUtil.java,${java.excludes.all}"
-               source="${target.sourcelevel}"
-               fork="yes"
-               memoryMaximumSize="${javac.memorymax}"
-               includeAntRuntime="false"
-               debug="${javacdebug}" debuglevel="${javacdebuglevel}">
-            <classpath refid="nativewindow_gluegen.classpath"/>
-            <src path="${src.java}" />
-            <src path="${src.generated.java}" />
-        </javac>
-    </target>
-
-    <target name="java.compile.secondpass" depends="java.generate.composable.pipeline, java.compile.secondpass.javase" />
-
-    <target name="java.compile.thirdpass.javase">
-        <!-- Perform the third pass Java compile; everything including fixed function emulation. -->
-        <javac destdir="${classes}"
-               excludes="${java.excludes.all}"
-               source="${target.sourcelevel}"
-               fork="yes"
-               memoryMaximumSize="${javac.memorymax}"
-               includeAntRuntime="false"
-               debug="${javacdebug}" debuglevel="${javacdebuglevel}">
-            <classpath refid="nativewindow_gluegen.classpath"/>
-            <src path="${src.java}" />
-            <src path="${src.generated.java}" />
-        </javac>
-    </target>
-
-    <target name="java.compile.thirdpass" depends="java.generate.composable.pipeline.custom, java.compile.thirdpass.javase" />
-
-    <target name="java.compile" depends="java.compile.firstpass,java.compile.secondpass,java.compile.thirdpass">
-        <!-- make shadercode and fonts available in classpath -->
-        <copy todir="${classes}">
-            <fileset dir="${src.java}"
-                     includes="${java.part.nonjava}"
-                     excludes="**/*.java"/>
-        </copy>
-    </target>
-
-    <!-- ================================================================== -->
-    <!-- 
-       - Compile the native C code for JOGL (and optionally the Cg binding).
-      -->
-
-    <target name="c.configure.1" depends="gluegen.cpptasks.detect.os,gluegen.cpptasks.setup.compiler">
-      <!-- compiler configuration -->
-      <!-- Note that we can use the base setups in the gluegen-cpptasks for most of these -->
-
-      <compiler id="compiler.cfg.freebsd.jogl" extends="compiler.cfg.freebsd">
-        <!-- Need to force X11R6 headers on to include path after stub_includes -->
-        <includepath path="stub_includes/opengl"/>
-        <includepath path="/usr/local/include" />
-      </compiler>
-
-      <compiler id="compiler.cfg.linux.armv7.jogl.x11" extends="compiler.cfg.linux.armv7">
-        <!-- Need to force /usr/include headers on to include path (after all others), due to crosscompiler usage -->
-        <compilerarg value="-idirafter" />
-        <compilerarg value="/usr/include" />
-      </compiler>
-
-      <!-- linker configuration -->
- 
-      <linker id="linker.cfg.freebsd.jogl.x11" extends="linker.cfg.freebsd">
-        <syslibset dir="/usr/local/lib" libs="X11"/>
-        <syslibset dir="/usr/local/lib" libs="Xxf86vm" />
-      </linker>
-
-      <linker id="linker.cfg.freebsd.amd64.jogl.x11" extends="linker.cfg.freebsd.amd64">
-        <syslibset dir="/usr/local/lib" libs="X11"/>
-        <syslibset dir="/usr/local/lib" libs="Xxf86vm" />
-      </linker>
-
-      <linker id="linker.cfg.linux.jogl.x11" extends="linker.cfg.linux">
-        <syslibset libs="X11"/>
-        <syslibset libs="Xxf86vm" />
-      </linker>
-
-      <linker id="linker.cfg.linux.x86.jogl.x11" extends="linker.cfg.linux.x86">
-        <syslibset libs="X11"/>
-        <syslibset libs="Xxf86vm" />
-      </linker>
-
-      <linker id="linker.cfg.linux.amd64.jogl.x11" extends="linker.cfg.linux.amd64">
-        <syslibset libs="X11"/>
-        <syslibset libs="Xxf86vm" />
-      </linker>
-
-      <linker id="linker.cfg.linux.armv7.jogl.x11" extends="linker.cfg.linux.armv7">
-        <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="X11"/>
-        <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="Xxf86vm" />
-      </linker>
-
-      <linker id="linker.cfg.android.jogl" extends="linker.cfg.android">
-      </linker>
-
-      <linker id="linker.cfg.solaris.jogl.x11" extends="linker.cfg.solaris">
-        <syslibset libs="X11"/>
-      </linker>
-
-      <linker id="linker.cfg.solaris.sparcv9.jogl.x11" extends="linker.cfg.solaris.sparcv9">
-        <linkerarg value="-xarch=v9a" />
-        <syslibset dir="/usr/lib/sparcv9" libs="X11"/>
-      </linker>
-
-      <linker id="linker.cfg.solaris.amd64.jogl.x11" extends="linker.cfg.solaris.amd64">
-        <linkerarg value="-xarch=amd64" />
-        <syslibset dir="/usr/lib/amd64" libs="X11"/>
-      </linker>
-
-      <linker id="linker.cfg.win32.mingw.jogl" extends="linker.cfg.win32.mingw">
-        <linkerarg value="-Wl,--kill-at" />        <!-- remove @ from function names -->
-        <syslibset libs="gdi32, kernel32"/>
-      </linker>
-
-      <linker id="linker.cfg.win64.mingw.jogl" extends="linker.cfg.win64.mingw">
-        <linkerarg value="-Wl,--kill-at" />        <!-- remove @ from function names -->
-        <syslibset libs="gdi32, kernel32"/>
-      </linker>
-
-      <linker id="linker.cfg.win32.msvc.jogl" extends="linker.cfg.win32.msvc">
-        <syslibset libs="user32, kernel32" />
-    <!-- This is temporary -->
-        <syslibset libs="winmm" />
-      </linker>
-
-      <linker id="linker.cfg.macosx.jogl" extends="linker.cfg.macosx">
-        <linkerarg value="-framework" />
-        <linkerarg value="Cocoa" />
-        <linkerarg value="-framework" />
-        <linkerarg value="OpenGL" />
-      </linker>
-
-      <!--linker id="linker.cfg.macosx.jogl.cg" extends="linker.cfg.macosx.jogl">
-        <linkerarg value="-framework"/>
-        <linkerarg value="Cg"/>
-      </linker-->
-
-      <linker id="linker.cfg.hpux.jogl" extends="linker.cfg.hpux">
-        <syslibset dir="/opt/graphics/OpenGL/lib" libs="GL, GLU"/>
-        <syslibset dir="/usr/lib" libs="X11"/>
-      </linker>
-    </target>
-
-    <target name="c.configure.win32.vc" if="isVCFamily">
-      <echo message="Win32.VC" />
-      <property name="compiler.cfg.id"                     value="compiler.cfg.win32.msvc" />
-      <property name="linker.cfg.id.os"                    value="linker.cfg.win32.msvc.jogl" />
-    </target>
-    
-    <target name="c.configure.win32.mingw" if="isMingW32">
-      <echo message="Win32.MingW" />
-      <property name="compiler.cfg.id"                     value="compiler.cfg.win32.mingw" />
-      <property name="linker.cfg.id.os"                    value="linker.cfg.win32.mingw.jogl" />
-    </target>
-
-    <target name="c.configure.win64.mingw" if="isMingW64">
-      <echo message="Win64.MingW" />
-      <property name="compiler.cfg.id"                     value="compiler.cfg.win64.mingw" />
-      <property name="linker.cfg.id.os"                    value="linker.cfg.win64.mingw.jogl" />
-    </target>
-
-    <target name="c.configure.linux.x86" if="isLinuxX86">
-      <echo message="Linux.x86" />
-      <property name="compiler.cfg.id"                     value="compiler.cfg.linux.x86" />
-      <property name="linker.cfg.id.os"                    value="linker.cfg.linux.x86.jogl.x11" />
-    </target>
-    
-    <target name="c.configure.linux.amd64" if="isLinuxAMD64">
-      <echo message="Linux.AMD64" />
-      <property name="compiler.cfg.id"                     value="compiler.cfg.linux.amd64" />
-      <property name="linker.cfg.id.os"                    value="linker.cfg.linux.amd64.jogl.x11" />
-    </target>
-    
-    <target name="c.configure.linux.armv7" if="isLinuxARMv7">
-      <echo message="Linux.armv7" />
-      <property name="compiler.cfg.id"                     value="compiler.cfg.linux.armv7.jogl.x11" />
-      <property name="linker.cfg.id.os"                    value="linker.cfg.linux.armv7.jogl.x11" />
-    </target>
-    
-    <target name="c.configure.linux.ia64" if="isLinuxIA64">
-      <echo message="Linux.IA64" />
-      <property name="compiler.cfg.id"                     value="compiler.cfg.linux" />
-      <property name="linker.cfg.id.os"                    value="linker.cfg.linux.jogl.x11" />
-    </target>
-
-    <target name="c.configure.linux" depends="c.configure.linux.armv7,c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.x11" if="isLinux" />
-
-    <target name="c.configure.android" if="isAndroid">
-      <echo message="Android" />
-      <property name="compiler.cfg.id"                      value="compiler.cfg.android" />
-      <property name="linker.cfg.id.os"                     value="linker.cfg.android.jogl" />
-    </target>
-    
-    <target name="c.configure.solaris32" depends="c.configure.x11" if="isSolaris32Bit">
-      <echo message="Solaris" />
-      <property name="compiler.cfg.id"                     value="compiler.cfg.solaris" />
-      <property name="linker.cfg.id.os"                    value="linker.cfg.solaris.jogl.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.os"                    value="linker.cfg.solaris.sparcv9.jogl.x11" />
-    </target>
-   
-
-    <target name="c.configure.solaris.amd64" depends="c.configure.x11" if="isSolarisAMD64">
-      <echo message="SolarisAMD64" />
-      <property name="compiler.cfg.id"                     value="compiler.cfg.solaris.amd64" />
-      <property name="linker.cfg.id.os"                    value="linker.cfg.solaris.amd64.jogl.x11" />
-    </target>
-   
-    <target name="c.configure.freebsd.x86" depends="c.configure.x11" if="isFreeBSDX86">
-      <echo message="FreeBSD" />
-      <property name="compiler.cfg.id"                     value="compiler.cfg.freebsd.jogl" />
-      <property name="linker.cfg.id.os"                    value="linker.cfg.freebsd.jogl.x11" />
-    </target>
-
-    <target name="c.configure.freebsd.amd64" depends="c.configure.x11" if="isFreeBSDAMD64">
-      <echo message="FreeBSD" />
-      <property name="compiler.cfg.id"                     value="compiler.cfg.freebsd.jogl" />
-      <property name="linker.cfg.id.os"                    value="linker.cfg.freebsd.amd64.jogl.x11" />
-    </target>
-
-    <target name="c.configure.freebsd" depends="c.configure.freebsd.x86,c.configure.freebsd.amd64,c.configure.x11" if="isFreeBSD" />
-
-    <target name="c.configure.hpux" depends="c.configure.x11" if="isHPUX">
-      <echo message="HP-UX" />
-      <property name="compiler.cfg.id"                     value="compiler.cfg.hpux" />
-      <property name="linker.cfg.id.os"                    value="linker.cfg.hpux.jogl.x11" />
-    </target>
-
-    <target name="c.configure.win32" depends="c.configure.win32.vc,c.configure.win32.mingw,c.configure.win64.mingw" if="isWindows" />
-
-    <target name="c.configure.x11" if="isX11" />
-
-    <target name="c.configure.macosx" if="isOSX">
-      <property name="compiler.cfg.id"                     value="compiler.cfg.macosx" />
-      <property name="linker.cfg.id.os"                    value="linker.cfg.macosx.jogl" />
-    </target>
-    
-    <target name="c.configure.2" depends="c.configure.win32,c.configure.linux,c.configure.android,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" />
-
-    <target name="rename.mingw.dll" if="isMingW">
-        <move file="${src}" tofile="${dest}" />
-    </target>
-
-    <target name="rename.dylib" if="isOSX">
-        <move file="${src}" tofile="${dest}" />
-    </target>
-
-    <macrodef name="c.build">
-      <attribute name="c.compiler.src.files" />
-      <attribute name="compiler.cfg.id" />
-      <attribute name="linker.cfg.id" />
-      <attribute name="output.lib.name" />
-      <attribute name="c.compiler.use-jawt" default="false"/>
-      <sequential>
-        <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" /> 
-
-        <condition property="c.compiler.use-debug"><istrue value="${c.compiler.debug}"/></condition>
-
-        <patternset id="c.src.files.jogl.desktop">
-          <include name="${rootrel.src.c}/JoglCommon.c"/>
-          <include name="${rootrel.src.c}/GLDebugMessageHandler.c"/>
-          <include name="${rootrel.src.c}/macosx/MacOSXCustomCGLCode.c" if="isOSX"/>
-          <include name="${rootrel.src.c}/macosx/MacOSXWindowSystemInterface.m" if="isOSX"/>
-          <include name="${rootrel.src.c}/macosx/ContextUpdater.m" if="isOSX"/>
-          <include name="${rootrel.src.c}/GLXGetProcAddressARB.c" if="isX11"/>
-          <!-- FIXME: the Mixer should be moved to another library -->
-          <!--include name="${rootrel.src.c}/Mixer.cpp" if="isWindows"/-->
-          <include name="${rootrel.src.c.openmax}/omx_tool.c"  if="setup.addNativeOpenMAX"/>
-          <include name="${rootrel.src.c.openmax}/com_jogamp_openmax_OMXInstance.c"  if="setup.addNativeOpenMAX"/>
-
-          <include name="${rootrel.generated.c.jogl}/gl4/GL4bcImpl_JNI.c"/>
-          <!--include name="${rootrel.generated.c.jogl}/GLU_JNI.c"/ EMPTY -->
-          <include name="${rootrel.generated.c.jogl}/gl2/GLUgl2_JNI.c"/>
-          <include name="${rootrel.generated.c.jogl}/X11/GLX*.c" if="isX11"/>
-          <include name="${rootrel.generated.c.jogl}/MacOSX/CGL*.c" if="isOSX"/>
-          <include name="${rootrel.generated.c.jogl}/Windows/GDI*.c" if="isWindows"/>
-          <include name="${rootrel.generated.c.jogl}/Windows/WGL*.c" if="isWindows"/>
-        </patternset>
-
-        <patternset id="c.src.files.jogl.mobile">
-          <include name="${rootrel.src.c}/JoglCommon.c"/>
-          <include name="${rootrel.src.c}/GLDebugMessageHandler.c"/>
-          <include name="${rootrel.src.c}/GLXGetProcAddressARB.c" if="isX11"/>
-          <include name="${rootrel.src.c.openmax}/omx_tool.c"  if="setup.addNativeOpenMAX"/>
-          <include name="${rootrel.src.c.openmax}/com_jogamp_openmax_OMXInstance.c"  if="setup.addNativeOpenMAX"/>
-
-          <include name="${rootrel.generated.c.jogl}/egl/EGL_JNI.c"/>
-          <include name="${rootrel.generated.c.jogl}/egl/EGLExtImpl_JNI.c"/>
-          <include name="${rootrel.generated.c.jogl}/es2/GLES2Impl_JNI.c"/>
-          <include name="${rootrel.generated.c.jogl}/es1/GLES1Impl_JNI.c"/>
-          <!--include name="${rootrel.generated.c.jogl}/GLU_JNI.c"/ EMPTY -->
-          <!--include name="${rootrel.generated.c.jogl}/es1/GLUes1_JNI.c" EMPTY /-->
-        </patternset>
-
-        <patternset id="c.src.files.cg">
-          <include name="${rootrel.generated.c.cg}/*.c"/>
-        </patternset>
-
-        <echo message="Compiling @{output.lib.name}" />
-
-      	<!-- have to wrap cc task with outofdate, because otherwise cc links a new library
-      	     even when no files have been compiled -->
-        <outofdate>
-          <sourcefiles>
-            <fileset dir="${project.root}"><patternset refid="@{c.compiler.src.files}"/></fileset>
-          </sourcefiles>
-          <targetfiles>
-            <fileset dir="${obj.jogl}" includes="lib@{output.lib.name}.so"/>
-            <fileset dir="${obj.jogl}" includes="@{output.lib.name}.dll"/>
-            <fileset dir="${obj.jogl}" includes="lib@{output.lib.name}.jnilib"/>
-          </targetfiles>
-          <sequential>
-            <cc outtype="shared" 
-                objdir="${obj.joglsub}" 
-                outfile="${obj.jogl}/@{output.lib.name}"
-                optimize="${c.compiler.optimise}" 
-                debug="${c.compiler.debug}"
-                multithreaded="true" 
-                exceptions="false" 
-                rtti="false">   
-      
-              <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}"/>
-                <sysincludepath path="${stub.includes.gluegen.cc}"/>
-                <includepath path="stub_includes/khr"/>
-                <includepath path="stub_includes/egl"/>
-                <includepath path="stub_includes/opengl"/>
-                <includepath path="stub_includes/openmax" if="setup.addNativeOpenMAX"/>
-                <includepath path="stub_includes/cg" if="setup.addNativeNVidiaCG"/>        
-      
-                <!-- This is for the generated headers for handwritten C code -->
-                <includepath path="${src.generated.c}" />
-                <includepath path="${src.generated.c}/X11" if="isX11"/>
-                <includepath path="${src.generated.c}/MacOSX" if="isOSX"/>
-                <includepath path="${src.generated.c}/Windows" if="isWindows"/>
-                <includepath path="${src.generated.c.openmax}" if="setup.addNativeOpenMAX"/>
-      
-                <!-- 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.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="${obj.jogl}/lib@{output.lib.name}.dylib" />
-                <param name="dest" value="${obj.jogl}/lib@{output.lib.name}.jnilib" />
-            </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="${obj.jogl}/lib@{output.lib.name}.so" />
-                <param name="dest" value="${obj.jogl}/@{output.lib.name}.dll" />
-            </antcall>
-
-            <!-- this stripping may be called more than once on the same library dir,
-                 but that should cause no harm, and doing it here inside outofdate
-                 prevents the JARs from always being rebuilt even if no source code changes -->
-            <antcall target="gluegen.cpptasks.striplibs" inheritRefs="true">
-                <param name="libdir" value="${obj.jogl}"/>
-            </antcall>
-
-          </sequential>
-        </outofdate>
-      </sequential>
-    </macrodef>  
-
-    <target name="c.build.jogl.prepare.openMAX" if="setup.addNativeOpenMAX">
-      <javah destdir="${src.generated.c.openmax}" classpath="${javah.classpath}" class="com.jogamp.openmax.OMXInstance" />
-    </target>
-
-    <target name="c.build.jogl.prepare" depends="c.build.jogl.prepare.openMAX">
-      <javah destdir="${build.jogl}/gensrc/native/jogl" classpath="${javah.classpath}" class="jogamp.opengl.GLDebugMessageHandler" />
-      <!-- Generate the waveout Mixer header -->
-      <!-- FIXME: this is temporary until we move this to another workspace -->
-      <!--javah destdir="${build.jogl}/gensrc/native/jogl" classpath="${javah.classpath}" class="com.jogamp.audio.windows.waveout.Mixer" /-->
-    </target>
-
-    <target name="c.build.jogl.desktop" unless="setup.noNativeDesktop">
-      <c.build c.compiler.src.files="c.src.files.jogl.desktop"
-               output.lib.name="jogl_desktop"
-               compiler.cfg.id="${compiler.cfg.id}"
-               linker.cfg.id="${linker.cfg.id.os}"/>
-    </target>
-
-    <target name="c.build.jogl.mobile">
-      <c.build c.compiler.src.files="c.src.files.jogl.mobile"
-               output.lib.name="jogl_mobile"
-               compiler.cfg.id="${compiler.cfg.id}"
-               linker.cfg.id="${linker.cfg.id.os}"/>
-    </target>
-
-    <target name="c.build.jogl.cg" if="setup.addNativeNVidiaCG">
-      <c.build c.compiler.src.files="c.src.files.cg"
-               output.lib.name="jogl_cg"
-               compiler.cfg.id="${compiler.cfg.id}"
-               linker.cfg.id="${linker.cfg.id.os}"/>
-    </target>
-    
-    <target name="c.manifest.cg" if="setup.addNativeNVidiaCG">
-      <msvc.manifest objdir="${obj.jogl}" dllname="jogl_cg" />
-    </target>
-
-    <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.jogl}" dllname="jogl_es1" />
-      <msvc.manifest objdir="${obj.jogl}" dllname="jogl_es2" />
-      <msvc.manifest objdir="${obj.jogl}" dllname="jogl_desktop" />
-      <antcall target="c.manifest.cg" inheritRefs="true" />
-    </target>
-
-    <target name="c.build.jogl" depends="c.configure,c.build.jogl.prepare,c.build.jogl.desktop,c.build.jogl.mobile,c.build.jogl.cg">
-      <antcall target="c.manifest" inheritRefs="true" />
-    </target>
-
-    <!-- ================================================================== -->
-    <!--
-       - Build the jogl.jar files.
-      -->
-    <target name="build-jars-dependset" depends="init,gluegen.cpptasks.detect.os" >
-        <dependset>
-            <srcfileset dir="${src.java}"
-                     includes="${java.part.nonjava}"/>
-            <targetfileset dir="."
-                     includes="${jogl.util.jar} ${jogl.util.fixedfuncemu.jar}" />
-        </dependset>
-    </target>
-    <target name="build-jars" depends="build-jars-dependset,build-jars-javase" />
-
-    <target name="setup-manifestfile" depends="common.init">
-        <property name="manifestfile" value="joglversion"/>
-        <copy file="${manifestfile}"
-            tofile="${build.jogl}/manifest.mf"
-            overwrite="true">
-            <filterset>
-                <filter token="VERSION" value="${jogl.version}"/>
-                <filter token="SCM_BRANCH" value="${jogl.build.branch}"/>
-                <filter token="SCM_COMMIT" value="${jogl.build.commit}"/>
-                <filter token="BASEVERSION" value="${jogl_base_version}"/>
-            </filterset>
-        </copy>
-    </target>
-
-    <target name="build-jars-os-desktop-javase" depends="setup-manifestfile">
-        <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.os.x11.jar}" filesonly="true">
-            <fileset dir="${classes}" includes="${java.part.glx}"/>
-        </jar>
-        <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.os.win.jar}" filesonly="true">
-            <fileset dir="${classes}" includes="${java.part.wgl}" />
-        </jar>
-        <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.os.osx.jar}" filesonly="true">
-            <fileset dir="${classes}" includes="${java.part.cgl}"/>
-        </jar>
-    </target>
-
-    <target name="build-jars-mobile-javase" depends="setup-manifestfile">
-        <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.glmobile.jar}" filesonly="true">
-            <fileset dir="${classes}"
-                     includes="${java.part.egl} ${java.part.es1} ${java.part.es2}"
-                     excludes="${java.part.awt} ${java.part.es1.dbg} ${java.part.es2.dbg}"/>
-        </jar>
-        <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.glmobile.dbg.jar}" filesonly="true">
-            <fileset dir="${classes}"
-                     includes="${java.part.es1.dbg} ${java.part.es2.dbg}"/>
-        </jar>
-    </target>
-
-    <target name="build-jars-awt-javase" depends="setup-manifestfile" unless="setup.noAWT">
-        <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.awt.jar}" filesonly="true">
-            <fileset dir="${classes}"
-                     includes="${java.part.awt}" />
-        </jar>
-        <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.util.awt.jar}" filesonly="true">
-            <fileset dir="${classes}"
-                     includes="${java.part.util.awt}"/>
-        </jar>
-    </target>
-
-    <target name="build-jars-desktop-javase" depends="setup-manifestfile,build-jars-os-desktop-javase">
-        <!--os specific gldesktop-->
-        <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.gldesktop.jar}" filesonly="true">
-            <fileset dir="${classes}"
-                     includes="${java.part.gldesktop}"
-                     excludes="${java.part.gldesktop.dbg} ${java.part.glugldesktop}"/>
-        </jar>
-
-        <!-- misc -->
-        <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.gldesktop.dbg.jar}" filesonly="true">
-            <fileset dir="${classes}"
-                     includes="${java.part.gldesktop.dbg}"/>
-        </jar>
-        <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.glugldesktop.jar}" filesonly="true">
-            <fileset dir="${classes}"
-                     includes="${java.part.glugldesktop}"/>
-        </jar>
-        <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.util.gldesktop.jar}" filesonly="true">
-            <fileset dir="${classes}"
-                     includes="${java.part.util.gldesktop}"
-                     excludes="${java.part.awt} ${java.part.util.awt}"/>
-        </jar>
-    </target>
-
-    <target name="build-jars-javase" depends="setup-manifestfile, build-jars-mobile-javase, build-jars-desktop-javase, build-jars-awt-javase">
-        <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.core.jar}" filesonly="true">
-            <fileset dir="${classes}"
-                     includes="${java.part.core}"
-                     excludes="${java.part.core.exclude}"/>
-        </jar>
-        <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.sdk.jar}" filesonly="true">
-            <fileset dir="${classes}"
-                     includes="${java.part.sdk}"/>
-        </jar>
-        <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.glutess.jar}" filesonly="true">
-            <fileset dir="${classes}"
-                     includes="${java.part.glutess}"/>
-        </jar>
-        <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.glumipmap.jar}" filesonly="true">
-            <fileset dir="${classes}"
-                     includes="${java.part.glumipmap}"/>
-        </jar>
-        <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.util.jar}" filesonly="true">
-            <fileset dir="${classes}"
-                     includes="${java.part.util} ${java.part.util.glsl} ${java.part.util.graph}"
-                     excludes="${java.part.util.awt} ${java.part.util.gldesktop} ${java.part.util.fixedfuncemu}"/>
-        </jar>
-        <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.util.fixedfuncemu.jar}" filesonly="true">
-            <fileset dir="${classes}"
-                     includes="${java.part.util.fixedfuncemu}"/>
-        </jar>
-        <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.omx.jar}" filesonly="true">
-            <fileset dir="${classes}"
-                     includes="${java.part.openmax}"/>
-        </jar>
-        <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.cg.jar}" filesonly="true">
-            <fileset dir="${classes}"
-                     includes="${java.part.nv-cg}"/>
-        </jar>
-        <jar manifest="${build.jogl}/manifest.mf" destfile="${build.jogl}/jogl-natives-${os.and.arch}.jar" filesonly="true">
-            <fileset dir="${obj.jogl}">
-              <include name="*.${native.library.suffix}" />
-              <exclude name="*jogl_cg.${native.library.suffix}" />
-            </fileset>
-        </jar>
-    </target>
-
-    <!-- ================================================================== -->
-    <!--
-       - 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 
-       -        errors, ensure that the source is built first.
-      -->
-    <!-- Same as above but with Cg directories added -->
-    <target name="javadoc" depends="init">
-        <!-- Build the general public Javadoc with CG -->
-        <javadoc packagenames="${javadoc.packagenames},com.jogamp.opengl.cg"
-                 excludepackagenames="${java.excludes.javadoc.packagenames}"
-                 sourcepath="${src.java};${src.generated.java}"        
-                 destdir="${javadoc}" windowtitle="${javadoc.windowtitle}"
-                 overview="${javadoc.overview}" 
-                 source="${target.sourcelevel}"
-                 maxmemory="512m"
-                 linkoffline="${javadoc.link} 142-packages"
-         bottom="${javadoc.bottom}" >
-          <classpath refid="nativewindow_gluegen.classpath"/>
-          <taglet name="net.highteq.nativetaglet.NativeTaglet" path="${gluegen.jar}" />
-        </javadoc>
-    </target>
-
-    <target name="javadoc.spec" depends="init">
-        <javadoc packagenames="${javadoc.spec.packagenames}"
-                 excludepackagenames="${java.excludes.javadoc.packagenames}"
-                 sourcepath="${src.java};${src.generated.java}"
-                 destdir="${javadoc.spec}" windowtitle="${javadoc.windowtitle}"
-                 overview="${javadoc.overview}"
-                 source="${target.sourcelevel}"
-                 maxmemory="512m"
-                 linkoffline="${javadoc.link} 142-packages"
-                 bottom="${javadoc.bottom}" >
-          <classpath refid="nativewindow_gluegen.classpath"/>
-          <taglet name="net.highteq.nativetaglet.NativeTaglet" path="${gluegen.jar}" />
-        </javadoc>
-    </target>
-
-    <target name="javadoc.dev.all" depends="init">
-        <javadoc packagenames="${javadoc.dev.packagenames},com.jogamp.opengl.cg"
-                 excludepackagenames="${java.excludes.javadoc.packagenames}"
-                 sourcepath="${src.java};${src.generated.java}"        
-                 destdir="${javadoc.dev}" windowtitle="${javadoc.windowtitle}"
-                 overview="${javadoc.overview}" 
-                 source="${target.sourcelevel}"
-                 maxmemory="512m"
-                 linkoffline="${javadoc.link} 142-packages"
-         bottom="${javadoc.bottom}" >
-          <classpath refid="nativewindow_gluegen.classpath"/>
-          <taglet name="net.highteq.nativetaglet.NativeTaglet" path="${gluegen.jar}" />
-        </javadoc>
-    </target>
-
-    <target name="all.doc" description="Build JOGL docs" depends="init,javadoc,javadoc.spec,javadoc.dev.all" />
-
-    <!-- ================================================================== -->
-    <!--
-       - Clean up all that is built.
-      -->
-    <target name="clean" description="Remove all build products" depends="declare.common">
-        <delete includeEmptyDirs="true" quiet="true">
-            <fileset dir="${tempdir}" />
-            <fileset dir="${build.jogl}" />
-            <fileset dir="${javadoc}" />
-            <fileset dir="${javadoc.spec}" />
-            <fileset dir="${javadoc.dev}" />
-        </delete>
-    </target>
-
-    <!-- ================================================================== -->
-    <!--
-       - Build everything.
-      -->
-    <target name="all" description="Build JOGL JAR file(s) and native libraries." depends="init,java.compile,c.build.jogl,build-jars,generate.version.txt" />
-
-    <target name="generate.version.txt" depends="init">
-        <!-- Create a version.txt file indicating which version we just built -->
-        <echo message="${jogl.version}" file="${build.jogl}/version.txt" />
-    </target>
-
-</project>

=== removed directory '.pc/otherArchsoswin.diff'
=== removed directory '.pc/otherArchsoswin.diff/make'
=== removed file '.pc/otherArchsoswin.diff/make/build-nativewindow.xml'
--- .pc/otherArchsoswin.diff/make/build-nativewindow.xml	2011-10-06 15:53:38 +0000
+++ .pc/otherArchsoswin.diff/make/build-nativewindow.xml	1970-01-01 00:00:00 +0000
@@ -1,865 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   - Ant build for the NativeWindow package.  This build has been tested with ANT 1.7.0.  The
-   - optional.jar that contains the optional ANT tasks must be in the ANT
-   - classpath (typically the ant/lib directory).
-   -
-   - A clean download of the NativeWindow sources is required for this build.
-   -
-   - This build has no dependence on environment variables; the needed
-   - ones (e.g. java.home, ANT_HOME) are all set by the Ant wrapper shell
-   - script, by the virtual machine, or elsewhere. However, on all platforms,
-   - the C compiler and linker should be in the path. All other paths that
-   - need to be set are in host.properties.
-   -
-   - NOTE:  because the GlueGen config files have their own relative paths
-   -        which cannot be overridden by GlueGen, GlueGen MUST be run from
-   -        the "make" directory. This also means that this build.xml MUST
-   -        be run from the "make" directory.
-   -
-   - Public targets:
-   -   all: (default; autodetects OS and chooses C compiler from gluegen.properties)
-   -   clean:        clean all built
-   -   javadoc:      create the standard developer Javadoc (recommended)
-   -                 (Note: should build all first - may be dependence in the future)
-   -   javadoc.spec: create the standard developer Javadoc but exclude com.jogamp.* classes
-   -   javadoc.dev:  create the internal developer Javadoc.  This includes the
-   -                       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 gluegen.properties
-   - is required to select the appropriate C compiler. See the example
-   - gluegen.properties in the gluegen workspace for valid values. On Mac OS X
-   - universal binaries may also be built by setting the "macosxfat"
-   - property in gluegen.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 tasks, the building of
-   - the Java generated sources, the first and second phase Java compiles, and
-   - the building of the jar file. Thanks to Alex Radeski for the bulk of the
-   - port to the ant-contrib CPPTask framework. Thanks to Athomas Goldberg for
-   - the original OS detection code.
-   -
-   - Some environment defs affecting native compilation
-       setup.noNativeAWT
-
-   - Internal settings, may not be necessary to set them manually,
-     since all JAR archives are orthogonal.
-       setup.noAWT
-   -->
-<project name="NativeWindow" basedir="." default="all">
-
-    <import file="build-common.xml"/>
-
-	<!-- needed for outofdate task -->
-    <taskdef resource="net/sf/antcontrib/antlib.xml">
-      <classpath> <pathelement location="${ant-contrib.jar}"/> </classpath>
-    </taskdef>
-
-	<!-- ================================================================== -->
-    <!-- 
-       - Base initialization and detection of operating system.
-      -->
-    <target name="base.init" depends="common.init">
-
-        <!-- partitioning -->
-
-        <property name="java.part.swt"
-                  value="jogamp/nativewindow/swt/**"/>
-
-        <property name="java.part.core"
-                  value="javax/media/nativewindow/* javax/media/nativewindow/util/* javax/media/nativewindow/egl/* com/jogamp/nativewindow/* jogamp/nativewindow/* jogamp/nativewindow/jvm/* ${java.part.swt}"/>
-
-        <property name="java.part.awt"
-                  value="javax/media/nativewindow/awt/* jogamp/nativewindow/jawt/** jogamp/nativewindow/**/awt/**"/>
-
-        <property name="java.part.x11"
-                  value="jogamp/nativewindow/x11/** javax/media/nativewindow/x11/*" />
-
-        <property name="java.part.windows"
-                  value="jogamp/nativewindow/windows/** javax/media/nativewindow/windows/*" />
-
-        <property name="java.part.macosx"
-                  value="jogamp/nativewindow/macosx/** javax/media/nativewindow/macosx/*" />
-
-        <!-- condition excludes -->
-
-        <condition property="java.excludes.awt"
-                   value="${java.part.awt}">
-           <isset property="setup.noAWT"/> 
-        </condition>
-
-        <property name="java.excludes.all" value="${java.excludes.awt}" />
-        <echo message="java.excludes.all: ${java.excludes.all}" />
-    </target>
-
-
-    <!-- ================================================================== -->
-    <!-- 
-       - Declare all paths and user defined variables.
-      -->
-    <target name="declare.common" description="Declare properties" depends="base.init">
-
-        <property name="config.nativewindow" value="${config}/nativewindow" />
-
-        <property name="rootrel.src" value="src/nativewindow" />
-        <property name="rootrel.src.java" value="${rootrel.src}/classes" />
-        <property name="rootrel.src.c" value="${rootrel.src}/native" />
-
-        <property name="rootrel.src.generated" value="${rootrel.build}/nativewindow/gensrc" />
-        <property name="rootrel.generated.c" value="${rootrel.src.generated}/native" />
-
-        <!-- The source directories. -->
-        <property name="src.java" value="${project.root}/${rootrel.src.java}" />
-        <property name="src.c"    value="${project.root}/${rootrel.src.c}" />
-        
-        <!-- The generated source directories. -->
-        <property name="src.generated" value="${build.nativewindow}/gensrc" />
-        <property name="src.generated.java" value="${src.generated}/classes" />
-        <property name="src.generated.c" value="${src.generated}/native" />
-        
-        <!-- The compiler output directories. -->
-        <property name="classes" value="${build.nativewindow}/classes" />
-
-        <property name="javah.classpath" value="${gluegen-rt.jar}:${classes}" />
-
-        <!-- The headers from which Java files are generated -->
-        <dirset id="stub.includes.fileset.all" dir=".">
-            <include name="${stub.includes}/macosx/**" />
-            <include name="${stub.includes}/win32/**" />
-            <include name="${stub.includes}/x11/**" />
-            <include name="${stub.includes}/gluegen/**" />
-            <include name="${stub.includes}/khr/**" />
-            <include name="${stub.includes}/jni/**" />
-        </dirset>
-        <fileset id="stub.includes.dependencies.fileset.1" dir="${stub.includes}">
-            <include name="macosx/**" />
-            <include name="win32/**" />
-            <include name="x11/**" />
-            <include name="common/**" />
-            <include name="jni/**" />
-        </fileset>