Remove reference to the deprecated option noCDC (2)

6 files changed, 2 insertions, 22 deletions

diff --git a/jogl.iml b/jogl.iml
index 419fbc916..3a65c7412 100644
--- a/jogl.iml
+++ b/jogl.iml
@@ -7,7 +7,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/jogl/junit" isTestSource="true" />
     </content>
     <content url="file://$MODULE_DIR$/build/jogl">
-      <sourceFolder url="file://$MODULE_DIR$/build/jogl/gensrc/classes-cdc" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/build/jogl/gensrc/classes" isTestSource="false" />
     </content>
     <orderEntry type="inheritedJdk" />
diff --git a/make/build-common.xml b/make/build-common.xml
index eb1162186..f34280ea0 100644
--- a/make/build-common.xml
+++ b/make/build-common.xml
@@ -79,7 +79,6 @@
 
         <echo message="setup.nodesktop: ${setup.nodesktop}" />
         <echo message="setup.noAWT: ${setup.noAWT}" />
-        <echo message="setup.noCDC: ${setup.noCDC}" />
 
         <!-- Load the user specified properties file that defines various host
            - specific paths.  The user will be notified if this is does not
diff --git a/make/build-jogl.xml b/make/build-jogl.xml
index f7e83a489..c14f66794 100644
--- a/make/build-jogl.xml
+++ b/make/build-jogl.xml
@@ -54,7 +54,6 @@
    - Internal settings, may not be necessary to set them manually,
      since all JAR archives are orthogonal.
        setup.noAWT
-       setup.noCDC
 
    - Skip gluegen: java.generate.skip
    -->
diff --git a/make/build-newt.xml b/make/build-newt.xml
index e135d2700..d062f9276 100644
--- a/make/build-newt.xml
+++ b/make/build-newt.xml
@@ -46,7 +46,6 @@
 
    - Internal settings, may not be necessary to set them manually,
      since all JAR archives are orthogonal.
-       setup.noCDC
        setup.noAWT
        setup.noOpenGL
 
diff --git a/make/scripts/lstjars.sh b/make/scripts/lstjars.sh
index a7710a280..c72a48a9b 100755
--- a/make/scripts/lstjars.sh
+++ b/make/scripts/lstjars.sh
@@ -66,18 +66,6 @@ function listdeployment() {
     report gluegen-rt.$JAR_SUFFIX nativewindow.all-noawt.$JAR_SUFFIX jogl.all-noawt.$JAR_SUFFIX newt.all-noawt.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_desktop.so.gz libnativewindow_$OSS.so.gz libnewt.so.gz
     echo
 
-    echo JOGL CDCFP DESKTOP
-    report gluegen-rt-cdc.$JAR_SUFFIX nativewindow.all.$JAR_SUFFIX jogl.all.cdc.$JAR_SUFFIX newt.all.cdc.$JAR_SUFFIX libgluegen-rt.so.gz libnativewindow_$OSS.so.gz libnewt.so.gz
-    echo
-
-    echo JOGL CDCFP ES1 MOBILE
-    report gluegen-rt-cdc.$JAR_SUFFIX jogl.core.cdc.$JAR_SUFFIX jogl.egl.cdc.$JAR_SUFFIX jogl.gles1.cdc.$JAR_SUFFIX jogl.util.cdc.$JAR_SUFFIX nativewindow.all.cdc.$JAR_SUFFIX newt.all.cdc.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_es1.so.gz libnewt.so.gz
-    echo
-
-    echo JOGL CDCFP ES2 MOBILE
-    report gluegen-rt-cdc.$JAR_SUFFIX jogl.core.cdc.$JAR_SUFFIX jogl.egl.cdc.$JAR_SUFFIX jogl.gles2.cdc.$JAR_SUFFIX jogl.util.cdc.$JAR_SUFFIX nativewindow.all.cdc.$JAR_SUFFIX newt.all.cdc.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_es2.so.gz libnewt.so.gz
-    echo
-
     echo JOGL GLU
     report jogl.glu.*$JAR_SUFFIX
     echo
@@ -96,9 +84,7 @@ cp -a $BUILDDIR/nativewindow/*.jar $STATDIR
 cp -a $BUILDDIR/jogl/*.jar $STATDIR
 cp -a $BUILDDIR/newt/*.jar $STATDIR
 cp -a $BUILDDIR_GLUEGEN/gluegen-rt.jar $STATDIR
-cp -a $BUILDDIR_GLUEGEN/gluegen-rt-cdc.jar $STATDIR
 cp -a $BUILDDIR_GLUEGEN/gluegen-rt-natives-linux-i586.jar $STATDIR
-cp -a $BUILDDIR_GLUEGEN/gluegen-rt-natives-linux-i586-cdc.jar $STATDIR
 cp -a $BUILDDIR_GLUEGEN/obj/libgluegen-rt.so $STATDIR
 
 cd $STATDIR
@@ -123,7 +109,7 @@ done
 rm -rf nope
 mkdir -p nope
 
-mv jogl.test.lst *-noawt.lst *.cdc.lst *.all*.lst nope/
+mv jogl.test.lst *-noawt.lst *.all*.lst nope/
 
 mv jogl.gl2es12.*.lst jogl.gldesktop.*.lst nope/
 echo duplicates - w/o gl2es12.* gldesktop.*
@@ -131,11 +117,10 @@ echo
 sort jogl*.lst | uniq -d
 mv nope/* .
 
-mv jogl.test.lst *.cdc.lst *.all*.lst gluegen-gl.lst nope/
+mv jogl.test.lst *.all*.lst gluegen-gl.lst nope/
 cat *.lst | sort -u > allparts.lst
 mv nope/* .
 cat *.all.lst gluegen-rt.lst   | sort -u > allall.lst
-cat jogl.all.cdc.lst newt.all.cdc.lst nativewindow.core.lst | sort -u > allcdc.lst
 
 echo all vs allparts delta
 echo
diff --git a/nativewindow.iml b/nativewindow.iml
index 8e058bffe..9c8acbcbf 100644
--- a/nativewindow.iml
+++ b/nativewindow.iml
@@ -3,7 +3,6 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$/build/nativewindow">
-      <sourceFolder url="file://$MODULE_DIR$/build/nativewindow/gensrc/classes-cdc" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/build/nativewindow/gensrc/classes" isTestSource="false" />
     </content>
     <content url="file://$MODULE_DIR$/src/nativewindow">