Remove CDC

1 files changed, 5 insertions, 97 deletions

diff --git a/make/build-newt.xml b/make/build-newt.xml
index 7ad013f6c..c91a2fda1 100644
--- a/make/build-newt.xml
+++ b/make/build-newt.xml
@@ -122,8 +122,6 @@
            <isset property="setup.noOpenGL"/>
         </condition>
 
-        <property name="java.excludes.cdcfp" value="${java.part.awt}"/>
-
         <condition property="java.excludes.desktop"
                    value="${java.part.x11} ${java.part.windows}, ${java.part.macosx}, ${java.part.awt}">
            <isset property="setup.nodesktop"/>
@@ -153,13 +151,11 @@
 
         <!-- The compiler output directories. -->
         <property name="classes" value="${build.newt}/classes" />
-        <property name="classes-cdc" value="${build.newt}/classes-cdc" />
 
         <!-- The javadoc dirs. -->
         <property name="javadoc" value="${project.root}/javadoc_newt_public" />
         <property name="javadoc.spec" value="${project.root}/javadoc_newt_spec" />
         <property name="javadoc.dev" value="${project.root}/javadoc_newt_dev" />
-        <property name="javadoc.link" value="http://java.sun.com/j2se/1.4.2/docs/api/" />
         <property name="javadoc.windowtitle" value="NEWT API -- ${newt_base_version} Specification" />
         <property name="javadoc.overview" value="spec-overview.html" />
         <property name="javadoc.spec.packagenames" value="com.jogamp.newt, com.jogamp.newt.event.*, com.jogamp.newt.opengl" />
@@ -184,7 +180,6 @@
         <mkdir dir="${src.generated.c}/IntelGDL" />
         <mkdir dir="${src.generated.c}/BroadcomEGL" />
         <mkdir dir="${classes}" />
-        <mkdir dir="${classes-cdc}" />
         <mkdir dir="${obj.newt}" />
     </target>
 
@@ -206,22 +201,7 @@
         </javac>
     </target>
 
-    <target name="java.compile.javacdc" unless="setup.noCDC">
-        <!-- Perform the first pass Java compile; everything -->
-        <javac destdir="${classes-cdc}"
-               excludes="${java.excludes.all} ${java.excludes.cdcfp}"
-               source="${target.sourcelevel}"
-               bootclasspath="${javac.bootclasspath-cdc.jar}"
-               fork="yes"
-               includeAntRuntime="false"
-               memoryMaximumSize="${javac.memorymax}"
-               debug="${javacdebug}" debuglevel="${javacdebuglevel}">
-            <classpath refid="nativewindow_gluegen_jogl.classpath-cdc"/>
-            <src path="${src.java}" />
-        </javac>
-    </target>
-
-    <target name="java.compile" depends="java.compile.javase,java.compile.javacdc" />
+    <target name="java.compile" depends="java.compile.javase" />
 
     <!-- ================================================================== -->
     <!--
@@ -428,7 +408,6 @@
 
     <target name="rename.dylib" if="isOSX">
         <move file="${src}" tofile="${dest}" />
-        <copy file="${dest}" tofile="${dest-cdc}" />
     </target>
 
     <macrodef name="c.build">
@@ -502,7 +481,6 @@
         <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" />
-            <param name="dest-cdc" value="${obj.newt}/lib@{output.lib.name}.so" />
         </antcall>
 
         <!-- FIXME: this is a hack; the cpptask should have an option to change the
@@ -569,7 +547,7 @@
     <!--
        - Build the newt.jar files.
       -->
-    <target name="build-jars" depends="gluegen.cpptasks.detect.os,build-jars-javase,build-jars-cdc" />
+    <target name="build-jars" depends="gluegen.cpptasks.detect.os,build-jars-javase" />
 
     <target name="setup-manifestfile">
         <property name="manifestfile" value="newtversion"/>
@@ -585,20 +563,6 @@
         </copy>
     </target>
 
-    <target name="setup-manifestfile-cdc">
-        <property name="manifestfile" value="newtversion-cdc"/>
-        <copy file="${manifestfile}"
-          tofile="tempversion-cdc"
-          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="tempversion" destfile="${newt.awt.jar}" filesonly="true">
             <fileset dir="${classes}"
@@ -624,24 +588,6 @@
         </jar>
     </target>
 
-    <target name="build-jars-opengl-cdc" depends="setup-manifestfile-cdc" unless="setup.noOpenGL">
-        <jar manifest="tempversion-cdc" destfile="${newt.ogl.cdc.jar}" filesonly="true">
-            <fileset dir="${classes-cdc}"
-                     includes="${java.part.opengl}"/>
-        </jar>
-        <jar manifest="tempversion-cdc" destfile="${newt.hw.broadcomegl.cdc.jar}" filesonly="true">
-            <fileset dir="${classes-cdc}"
-                     includes="${java.part.broadcomegl}"/>
-        </jar>
-    </target>
-
-    <target name="build-jars-driver-cdc" depends="setup-manifestfile-cdc">
-        <jar manifest="tempversion-cdc" destfile="${newt.hw.intelgdl.cdc.jar}" filesonly="true">
-            <fileset dir="${classes}"
-                     includes="${java.part.intelgdl}"/>
-        </jar>
-    </target>
-
     <target name="build-jars-desktop" depends="setup-manifestfile" unless="setup.nodesktop">
         <jar manifest="tempversion" destfile="${newt.os.x11.jar}" filesonly="true">
             <fileset dir="${classes}"
@@ -657,21 +603,6 @@
         </jar>
     </target>
 
-    <target name="build-jars-desktop-cdc" depends="setup-manifestfile-cdc" unless="setup.nodesktop">
-        <jar manifest="tempversion-cdc" destfile="${newt.os.x11.cdc.jar}" filesonly="true">
-            <fileset dir="${classes-cdc}"
-                     includes="${java.part.x11}"/>
-        </jar>
-        <jar manifest="tempversion-cdc" destfile="${newt.os.win.cdc.jar}" filesonly="true">
-            <fileset dir="${classes-cdc}"
-                     includes="${java.part.windows}"/>
-        </jar>
-        <jar manifest="tempversion-cdc" destfile="${newt.os.osx.cdc.jar}" filesonly="true">
-            <fileset dir="${classes-cdc}"
-                     includes="${java.part.macosx}"/>
-        </jar>
-    </target>
-
     <target name="build-jars-all-awt" depends="setup-manifestfile" unless="setup.noAWT">
         <jar manifest="tempversion" destfile="${newt.all.jar}" filesonly="true">
             <fileset dir="${classes}">
@@ -701,16 +632,6 @@
         </jar>
     </target>
 
-    <target name="build-jars-all-cdc" depends="setup-manifestfile-cdc">
-        <jar manifest="tempversion-cdc" destfile="${newt.all.cdc.jar}" filesonly="true">
-            <fileset dir="${classes-cdc}"
-                     excludes="${java.excludes.cdcfp}" >
-                <include name="com/jogamp/newt/**" />
-                <include name="jogamp/newt/**" />
-            </fileset>
-        </jar>
-    </target>
-
     <target name="build-jars-javase" depends="setup-manifestfile,build-jars-awt,build-jars-opengl,build-jars-all-noawt,build-jars-all-awt,build-jars-desktop,build-jars-driver">
         <jar manifest="tempversion" destfile="${newt.core.jar}" filesonly="true">
             <fileset dir="${classes}"
@@ -724,19 +645,6 @@
         <delete file="tempversion"/>
     </target>
 
-    <target name="build-jars-cdc" depends="setup-manifestfile-cdc,build-jars-opengl-cdc,build-jars-all-cdc,build-jars-desktop-cdc,build-jars-driver-cdc" unless="setup.noCDC">
-        <jar manifest="tempversion-cdc" destfile="${newt.core.cdc.jar}" filesonly="true">
-            <fileset dir="${classes-cdc}"
-                     includes="${java.part.core}"/>
-        </jar>
-        <jar manifest="tempversion-cdc" destfile="${build.newt}/newt-natives-${os.and.arch}-cdc.jar" filesonly="true">
-            <fileset dir="${obj.newt}">
-              <include name="*.${native.library.suffix-cdc}" />
-            </fileset>
-        </jar>
-        <delete file="tempversion-cdc"/>
-    </target>
-
     <!-- ================================================================== -->
     <!--
        - Build the Javadocs for the sources.
@@ -751,7 +659,7 @@
                  sourcepath="${src.java};${src.generated.java}"
                  destdir="${javadoc}" windowtitle="${javadoc.windowtitle}"
                  overview="${javadoc.overview}"
-                 source="1.4"
+                 source="${target.sourcelevel}"
                  linkoffline="${javadoc.link} 142-packages"
          bottom="${javadoc.bottom}" >
          <classpath refid="nativewindow_gluegen_jogl.classpath"/>
@@ -765,7 +673,7 @@
                  sourcepath="${src.java};${src.generated.java}"
                  destdir="${javadoc.spec}" windowtitle="${javadoc.windowtitle}"
                  overview="${javadoc.overview}"
-                 source="1.4"
+                 source="${target.sourcelevel}"
                  linkoffline="${javadoc.link} 142-packages"
                  bottom="${javadoc.bottom}" >
          <classpath refid="nativewindow_gluegen_jogl.classpath"/>
@@ -779,7 +687,7 @@
                  sourcepath="${src.java};${src.generated.java}"
                  destdir="${javadoc.dev}" windowtitle="${javadoc.windowtitle}"
                  overview="${javadoc.overview}"
-                 source="1.4"
+                 source="${target.sourcelevel}"
                  linkoffline="${javadoc.link} 142-packages"
          bottom="${javadoc.bottom}" >
          <classpath refid="nativewindow_gluegen_jogl.classpath"/>