@@ -, +, @@
---
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
--- a/jogl.iml
+++ a/jogl.iml
@@ -7,7 +7,6 @@
-
--- a/make/build-common.xml
+++ a/make/build-common.xml
@@ -77,7 +77,6 @@
-
--- a/make/build-newt.xml
+++ a/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
--- a/make/jogl_wince6_vs9/gluegen-rt/gluegen-rt.vcproj
+++ a/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"
--- a/make/jogl_wince6_vs9/jogl_es1/jogl_es1.vcproj
+++ a/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"
--- a/make/jogl_wince6_vs9/jogl_es2/jogl_es2.vcproj
+++ a/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"
--- a/make/jogl_wince6_vs9/newt/newt.vcproj
+++ a/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"
--- a/make/scripts/lstjars.sh
+++ a/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
--- a/make/scripts/make.jogl.cdcfp.linux-x86.sh
+++ a/make/scripts/make.jogl.cdcfp.linux-x86.sh
@@ -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
-
--- a/make/scripts/make.jogl.cdcfp.macosx.sh
+++ a/make/scripts/make.jogl.cdcfp.macosx.sh
@@ -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
-
--- a/nativewindow.iml
+++ a/nativewindow.iml
@@ -3,7 +3,6 @@
-
--