From b50a8c51c30df32661bb5824df6da265419e6eee Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 22 Feb 2011 17:13:21 +0100 Subject: [PATCH] Remove reference to the deprecated option noCDC --- jogl.iml | 1 - make/build-common.xml | 1 - make/build-jogl.xml | 1 - make/build-newt.xml | 1 - make/jogl_wince6_vs9/gluegen-rt/gluegen-rt.vcproj | 2 - make/jogl_wince6_vs9/jogl_es1/jogl_es1.vcproj | 2 +- make/jogl_wince6_vs9/jogl_es2/jogl_es2.vcproj | 2 +- make/jogl_wince6_vs9/newt/newt.vcproj | 4 +- make/scripts/lstjars.sh | 18 +--------- make/scripts/make.jogl.cdcfp.linux-x86.sh | 38 --------------------- make/scripts/make.jogl.cdcfp.macosx.sh | 27 --------------- nativewindow.iml | 1 - 12 files changed, 6 insertions(+), 92 deletions(-) delete mode 100755 make/scripts/make.jogl.cdcfp.linux-x86.sh delete mode 100755 make/scripts/make.jogl.cdcfp.macosx.sh diff --git a/jogl.iml b/jogl.iml index 419fbc9..3a65c74 100644 --- a/jogl.iml +++ b/jogl.iml @@ -7,7 +7,6 @@ - diff --git a/make/build-common.xml b/make/build-common.xml index 77d81fd..44e36aa 100644 --- a/make/build-common.xml +++ b/make/build-common.xml @@ -77,7 +77,6 @@ - diff --git a/make/build-newt.xml b/make/build-newt.xml index c91a2fd..eeb118f 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/jogl_wince6_vs9/gluegen-rt/gluegen-rt.vcproj b/make/jogl_wince6_vs9/gluegen-rt/gluegen-rt.vcproj index 4f459fe..5f210ae 100644 --- a/make/jogl_wince6_vs9/gluegen-rt/gluegen-rt.vcproj +++ b/make/jogl_wince6_vs9/gluegen-rt/gluegen-rt.vcproj @@ -60,7 +60,6 @@ Name="VCCLCompilerTool" ExecutionBucket="7" Optimization="0" - AdditionalIncludeDirectories="..\..\..\..\CVM\cdc\src\share\javavm\export,..\..\..\..\CVM\cdc\src\share,..\..\..\..\CVM\cdc\src\win32,..\..\..\..\CVM\cdc\src\win32-arm" PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;DEBUG;_WINDOWS;_USRDLL;GLUEGENRT_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE" MinimalRebuild="true" RuntimeLibrary="2" @@ -677,7 +676,6 @@ Name="VCCLCompilerTool" ExecutionBucket="7" Optimization="2" - AdditionalIncludeDirectories="..\..\..\..\CVM\cdc\src\share\javavm\export,..\..\..\..\CVM\cdc\src\share,..\..\..\..\CVM\cdc\src\win32,..\..\..\..\CVM\cdc\src\win32-arm" PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_WINDOWS;_USRDLL;GLUEGENRT_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE" RuntimeLibrary="2" UsePrecompiledHeader="0" diff --git a/make/jogl_wince6_vs9/jogl_es1/jogl_es1.vcproj b/make/jogl_wince6_vs9/jogl_es1/jogl_es1.vcproj index a4477d0..97bd864 100644 --- a/make/jogl_wince6_vs9/jogl_es1/jogl_es1.vcproj +++ b/make/jogl_wince6_vs9/jogl_es1/jogl_es1.vcproj @@ -59,7 +59,7 @@ Name="VCCLCompilerTool" ExecutionBucket="7" Optimization="0" - AdditionalIncludeDirectories="..\..\..\..\CVM\cdc\src\share\javavm\export,..\..\..\..\CVM\cdc\src\share,..\..\..\..\CVM\cdc\src\win32,..\..\..\..\CVM\cdc\src\win32-arm,,..\..\..\make\stub_includes\egl,..\..\..\make\stub_includes\opengl,..\..\..\build\gensrc\native\newt\Windows" + AdditionalIncludeDirectories="..\..\..\make\stub_includes\egl,..\..\..\make\stub_includes\opengl,..\..\..\build\gensrc\native\newt\Windows" PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;DEBUG;_WINDOWS;_USRDLL;JOGL_ES1_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE" MinimalRebuild="true" RuntimeLibrary="2" diff --git a/make/jogl_wince6_vs9/jogl_es2/jogl_es2.vcproj b/make/jogl_wince6_vs9/jogl_es2/jogl_es2.vcproj index 1a9ad99..964612c 100644 --- a/make/jogl_wince6_vs9/jogl_es2/jogl_es2.vcproj +++ b/make/jogl_wince6_vs9/jogl_es2/jogl_es2.vcproj @@ -59,7 +59,7 @@ Name="VCCLCompilerTool" ExecutionBucket="7" Optimization="0" - AdditionalIncludeDirectories="..\..\..\..\CVM\cdc\src\share\javavm\export,..\..\..\..\CVM\cdc\src\share,..\..\..\..\CVM\cdc\src\win32,..\..\..\..\CVM\cdc\src\win32-arm,,..\..\..\make\stub_includes\egl,..\..\..\make\stub_includes\opengl,..\..\..\build\gensrc\native\newt\Windows" + AdditionalIncludeDirectories="..\..\..\make\stub_includes\egl,..\..\..\make\stub_includes\opengl,..\..\..\build\gensrc\native\newt\Windows" PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;DEBUG;_WINDOWS;_USRDLL;JOGL_ES2_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE" MinimalRebuild="true" RuntimeLibrary="2" diff --git a/make/jogl_wince6_vs9/newt/newt.vcproj b/make/jogl_wince6_vs9/newt/newt.vcproj index dc3c635..adb8037 100644 --- a/make/jogl_wince6_vs9/newt/newt.vcproj +++ b/make/jogl_wince6_vs9/newt/newt.vcproj @@ -60,7 +60,7 @@ Name="VCCLCompilerTool" ExecutionBucket="7" Optimization="0" - AdditionalIncludeDirectories="..\..\..\..\CVM\cdc\src\share\javavm\export,..\..\..\..\CVM\cdc\src\share,..\..\..\..\CVM\cdc\src\win32,..\..\..\..\CVM\cdc\src\win32-arm,..\..\..\build\gensrc\native\newt\Windows,..\..\..\build\gensrc\native\newt\KD,..\..\..\make\stub_includes\egl" + AdditionalIncludeDirectories="..\..\..\build\gensrc\native\newt\Windows,..\..\..\build\gensrc\native\newt\KD,..\..\..\make\stub_includes\egl" PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;DEBUG;_WINDOWS;_USRDLL;NEWT_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE" MinimalRebuild="true" RuntimeLibrary="2" @@ -691,7 +691,7 @@ Name="VCCLCompilerTool" ExecutionBucket="7" Optimization="2" - AdditionalIncludeDirectories="..\..\..\..\CVM\cdc\src\share\javavm\export,..\..\..\..\CVM\cdc\src\share,..\..\..\..\CVM\cdc\src\win32,..\..\..\..\CVM\cdc\src\win32-arm,..\..\..\build\gensrc\native\newt\Windows,..\..\..\build\gensrc\native\newt\KD,..\..\..\make\stub_includes\egl" + AdditionalIncludeDirectories="..\..\..\build\gensrc\native\newt\Windows,..\..\..\build\gensrc\native\newt\KD,..\..\..\make\stub_includes\egl" PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_WINDOWS;_USRDLL;NEWT_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE" RuntimeLibrary="2" UsePrecompiledHeader="0" diff --git a/make/scripts/lstjars.sh b/make/scripts/lstjars.sh index a7710a2..b1ea50c 100755 --- a/make/scripts/lstjars.sh +++ b/make/scripts/lstjars.sh @@ -66,17 +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 @@ -96,9 +85,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 +110,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 +118,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/make/scripts/make.jogl.cdcfp.linux-x86.sh b/make/scripts/make.jogl.cdcfp.linux-x86.sh deleted file mode 100755 index ad80f19..0000000 --- a/make/scripts/make.jogl.cdcfp.linux-x86.sh +++ /dev/null @@ -1,38 +0,0 @@ -#! /bin/sh - -if [ -e ../../setenv-build-jogl-x86.sh ] ; then - . ../../setenv-build-jogl-x86.sh -fi - -# -Dc.compiler.debug=true -# -# -Djavacdebug="false" \ -# -Djavacdebuglevel="none" \ -# -# -Djava.generate.skip=true \ -# -Dbuild.noarchives=true - -BUILD_SUBDIR=build-cdcfp-x86 - -ant -v \ - -Dgluegen-cpptasks.file=`pwd`/../../gluegen/make/lib/gluegen-cpptasks-linux-32bit.xml \ - -Dbuild.noarchives=true \ - -Drootrel.build=$BUILD_SUBDIR \ - -Dsetup.cdcfp=true \ - -Dgluegen.cpptasks.detected.os=true \ - -DisUnix=true \ - -DisLinux=true \ - -DisLinuxX86=true \ - -DisX11=true \ - -DuseOpenMAX=true \ - $* 2>&1 | tee make.jogl.cdcfp.linux-x86.log - -rm -rf ../$BUILD_SUBDIR/lib -mkdir -p ../$BUILD_SUBDIR/lib -for i in `find ../$BUILD_SUBDIR/ -name \*so` ; do - cp -v $i ../$BUILD_SUBDIR/lib/$(basename $i .so).so -done -for i in `find ../../gluegen/$BUILD_SUBDIR/ -name \*so` ; do - cp -v $i ../$BUILD_SUBDIR/lib/$(basename $i .so).so -done - diff --git a/make/scripts/make.jogl.cdcfp.macosx.sh b/make/scripts/make.jogl.cdcfp.macosx.sh deleted file mode 100755 index 88ec875..0000000 --- a/make/scripts/make.jogl.cdcfp.macosx.sh +++ /dev/null @@ -1,27 +0,0 @@ -#! /bin/sh - -if [ -e /opt-share/etc/profile.ant ] ; then - . /opt-share/etc/profile.ant -fi - - -# -Dc.compiler.debug=true -# -Dbuild.noarchives=true - -BUILD_SUBDIR=build-cdcfp-macosx - -ant \ - -Dbuild.noarchives=true \ - -Dsetup.cdcfp=true \ - -Drootrel.build=$BUILD_SUBDIR \ - $* 2>&1 | tee make.jogl.cdcfp.macosx.log - -rm -rf ../$BUILD_SUBDIR/lib -mkdir -p ../$BUILD_SUBDIR/lib -for i in `find ../$BUILD_SUBDIR/ -name \*jnilib` ; do - cp -v $i ../$BUILD_SUBDIR/lib/$(basename $i .jnilib).so -done -for i in `find ../../gluegen/$BUILD_SUBDIR/ -name \*jnilib` ; do - cp -v $i ../$BUILD_SUBDIR/lib/$(basename $i .jnilib).so -done - diff --git a/nativewindow.iml b/nativewindow.iml index 8e058bf..9c8acbc 100644 --- a/nativewindow.iml +++ b/nativewindow.iml @@ -3,7 +3,6 @@ - -- 1.7.2.3