summaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
Diffstat (limited to 'make')
-rw-r--r--make/build-common.xml29
-rw-r--r--make/build-nativewindow.xml9
-rw-r--r--make/build-test.xml10
-rw-r--r--make/build.xml12
-rwxr-xr-x[-rw-r--r--]make/scripts/cmpOld2New.sh0
-rwxr-xr-x[-rw-r--r--]make/scripts/count-lock.sh0
-rwxr-xr-x[-rw-r--r--]make/scripts/cpp-gluegen-test.sh0
-rwxr-xr-xmake/scripts/java-win32-dbg.bat4
-rwxr-xr-xmake/scripts/java-win32.bat4
-rwxr-xr-xmake/scripts/java-win64-dbg.bat4
-rwxr-xr-xmake/scripts/java-win64.bat4
-rwxr-xr-x[-rw-r--r--]make/scripts/make-runtime-properties.sh0
-rwxr-xr-xmake/scripts/make.jogl.all.linux-x86.sh3
-rwxr-xr-xmake/scripts/make.jogl.all.linux-x86_64.sh4
-rwxr-xr-xmake/scripts/make.jogl.all.macosx.sh6
-rwxr-xr-xmake/scripts/make.jogl.all.win32.bat7
-rwxr-xr-xmake/scripts/make.jogl.all.win64.bat7
-rwxr-xr-xmake/scripts/make.jogl.cdcfp.linux-x86.sh2
-rwxr-xr-xmake/scripts/make.jogl.cdcfp.macosx.sh6
-rwxr-xr-xmake/scripts/make.jogl.doc.all.x86_64.sh1
-rwxr-xr-xmake/scripts/make.jogl.doc.x86_64.sh1
-rwxr-xr-xmake/scripts/setenv-jogl.sh4
-rwxr-xr-xmake/scripts/setvc9-jogl.bat4
-rwxr-xr-x[-rw-r--r--]make/scripts/tests-javaws-x64.bat2
-rwxr-xr-x[-rw-r--r--]make/scripts/tests-javaws.sh0
-rwxr-xr-x[-rw-r--r--]make/scripts/tests-x32.bat2
-rwxr-xr-x[-rw-r--r--]make/scripts/tests-x64.bat2
-rwxr-xr-x[-rw-r--r--]make/scripts/tests.sh34
-rw-r--r--make/stub_includes/win32/windows.h3
-rw-r--r--make/stub_includes/win32/wingdi.h2
30 files changed, 93 insertions, 73 deletions
diff --git a/make/build-common.xml b/make/build-common.xml
index 29faaef20..eb1162186 100644
--- a/make/build-common.xml
+++ b/make/build-common.xml
@@ -15,6 +15,8 @@
<!-- Pull in GlueGen cpptasks build file -->
<property name="gluegen.root" value="../../gluegen" />
<import file="${gluegen.root}/make/gluegen-cpptasks.xml" />
+ <import file="${gluegen.root}/make/jogamp-archivetasks.xml" />
+ <import file="${gluegen.root}/make/jogamp-env.xml" />
<property name="ant-contrib.jar" value="${gluegen.root}/make/lib/ant-contrib-1.0b3.jar" />
@@ -30,7 +32,7 @@
<!--
- Base initialization of properties and detection of operating system.
-->
- <target name="common.init" depends="gluegen.cpptasks.detect.os" unless="common.init.done">
+ <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. -->
@@ -205,24 +207,40 @@
<property name="jogl.all-noawt.jar" value="${build.jogl}/jogl.all-noawt.jar" />
<property name="newt.all-noawt.jar" value="${build.newt}/newt.all-noawt.jar" />
+ <path id="swt_gluegen.classpath">
+ <pathelement location="${gluegen-rt.jar}" />
+ <pathelement location="${swt.jar}" />
+ </path>
+
<path id="nativewindow_gluegen.classpath">
<pathelement location="${gluegen-rt.jar}" />
+ <pathelement location="${swt.jar}" />
<pathelement location="${nativewindow.all.jar}" />
</path>
<path id="nativewindow_gluegen_jogl.classpath">
<pathelement location="${gluegen-rt.jar}" />
+ <pathelement location="${swt.jar}" />
<pathelement location="${nativewindow.all.jar}" />
<pathelement location="${jogl.all.jar}" />
</path>
<path id="jogl_newt_all.classpath">
<pathelement location="${gluegen-rt.jar}" />
+ <pathelement location="${swt.jar}" />
<pathelement location="${nativewindow.all.jar}" />
<pathelement location="${jogl.all.jar}" />
<pathelement location="${newt.all.jar}" />
</path>
+ <path id="jogl_newt_all-noawt.classpath">
+ <pathelement location="${gluegen-rt.jar}" />
+ <pathelement location="${swt.jar}" />
+ <pathelement location="${nativewindow.all-noawt.jar}" />
+ <pathelement location="${jogl.all-noawt.jar}" />
+ <pathelement location="${newt.all-noawt.jar}" />
+ </path>
+
<path id="junit_jogl_newt.compile.classpath">
<pathelement location="${junit.jar}" />
<pathelement location="${ant.jar}" />
@@ -251,11 +269,11 @@
<pathelement location="${ant.jar}" />
<pathelement location="${ant-junit.jar}" />
<pathelement location="${gluegen-rt.jar}" />
+ <pathelement location="${swt.jar}" />
<pathelement location="${nativewindow.all.jar}" />
<pathelement location="${jogl.all.jar}" />
<pathelement location="${newt.event.jar}" />
<pathelement location="${jogl.test.jar}" />
- <pathelement location="${swt.jar}" />
</path>
<path id="junit_jogl_newt.run.classpath">
@@ -285,13 +303,6 @@
value="${junit.jar}${path.separator}${ant.jar}${path.separator}${ant-junit.jar}${path.separator}${gluegen-rt.jar}${path.separator}${nativewindow.all.jar}${path.separator}${jogl.all.jar}${path.separator}${newt.all.jar}${path.separator}${jogl.test.jar}"/>
- <path id="jogl_newt_all-noawt.classpath">
- <pathelement location="${gluegen-rt.jar}" />
- <pathelement location="${nativewindow.all-noawt.jar}" />
- <pathelement location="${jogl.all-noawt.jar}" />
- <pathelement location="${newt.all-noawt.jar}" />
- </path>
-
<!-- Atomic JavaSE JARS -->
<property name="nativewindow.core.jar" value="${build.nativewindow}/nativewindow.core.jar" />
diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml
index 9c54021ef..475904b06 100644
--- a/make/build-nativewindow.xml
+++ b/make/build-nativewindow.xml
@@ -77,11 +77,14 @@
<!-- 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/*, javax/media/nativewindow/macosx/*, javax/media/nativewindow/windows/*, com/jogamp/nativewindow/*, jogamp/nativewindow/*, jogamp/nativewindow/jvm/*"/>
+ value="javax/media/nativewindow/* javax/media/nativewindow/util/* javax/media/nativewindow/egl/* javax/media/nativewindow/macosx/* javax/media/nativewindow/windows/* 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/**"/>
+ value="javax/media/nativewindow/awt/* jogamp/nativewindow/jawt/** jogamp/nativewindow/**/awt/**"/>
<property name="java.part.x11"
value="jogamp/nativewindow/x11/** javax/media/nativewindow/x11/*" />
@@ -310,11 +313,11 @@
<javac destdir="${classes}"
excludes="${java.excludes.all}"
source="${target.sourcelevel}"
- classpath="${gluegen-rt.jar}"
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>
diff --git a/make/build-test.xml b/make/build-test.xml
index 2d1813668..ac60d09eb 100644
--- a/make/build-test.xml
+++ b/make/build-test.xml
@@ -26,7 +26,7 @@
<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"/>
+ <property name="test.archive.name" value="${archive.name}-test-results-${build.node.name}"/>
<condition property="jvmarg.newt.headless" value="-XstartOnFirstThread -Djava.awt.headless=true"><isset property="isOSX"/></condition>
<condition property="jvmarg.newt.headless" value="-Djava.awt.headless=true"><not><isset property="isOSX"/></not></condition>
@@ -55,7 +55,7 @@
<!-- Clean the results -->
<delete quiet="true">
<fileset dir="${results.test}" includes="**"/>
- <fileset file="${build}/${test.archive.name}.zip"/>
+ <fileset file="${build}/${test.archive.name}.7z"/>
</delete>
<mkdir dir="${results.test}" />
@@ -382,9 +382,9 @@
<!-- updates / create the test results zip file -->
<target name="test-zip-archive" depends="declare.common">
- <zip destfile="${build}/${test.archive.name}.zip" update="true">
- <zipfileset dir="${results.test}" prefix="${archive.name}/test-results"/>
- </zip>
+ <archive.7z destfile="${build}/${test.archive.name}.7z"
+ basedir="${results.test}"
+ includes="**" />
</target>
<!-- ================================================================== -->
diff --git a/make/build.xml b/make/build.xml
index 40b001afd..c9dfca0b4 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -39,8 +39,9 @@
<target name="javadoc.spec" description="Build Specifications JOGL and Nativewindow"
depends="javadoc.init, javadoc.nw.spec, javadoc.jogl.spec" />
+ <!-- excluded javadoc.dev due to time consumption -->
<target name="javadoc.all" description="Build all NativeWindow, JOGL and NEWT docs"
- depends="javadoc.init, javadoc.nw.spec, javadoc.jogl.spec, javadoc.public, javadoc.dev"/>
+ depends="javadoc.init, javadoc.nw.spec, javadoc.jogl.spec, javadoc.public"/>
<target name="clean" depends="init">
<ant antfile="${nativewindow.build.xml}" dir="${nativewindow.make}" target="clean" inheritRefs="true" inheritAll="true"/>
@@ -117,7 +118,7 @@
- This must be called after all of the build targets complete.
-->
- <target name="developer-zip-archive" depends="init" unless="build.noarchives">
+ <target name="developer-zip-archive" depends="init" if="build.archiveon">
<delete includeEmptyDirs="true" quiet="true" dir="${archive}" failonerror="false" />
<mkdir dir="${archive}" />
<copy file="${build}/artifact.properties" todir="${archive}" />
@@ -150,8 +151,7 @@
<copy todir="${archive}/etc">
<fileset dir="${project.root}/etc" includes="*" />
</copy>
- <delete quiet="true" file="${build}/${archive.name}.zip"/>
- <zip destfile="${build}/${archive.name}.zip"
+ <archive.7z destfile="${build}/${archive.name}.7z"
basedir="${build}"
includes="${archive.name}/**" />
<!-- Clean up after ourselves -->
@@ -235,7 +235,7 @@
<property name="javadoc.windowtitle" value="JOGL, NativeWindow and NEWT APIs" />
<property name="javadoc.packagenames" value="${javadoc.nw.spec.packagenames}, ${javadoc.spec.packagenames}, com.jogamp.opengl, com.jogamp.opengl.util.*, com.jogamp.nativewindow, com.jogamp.newt, com.jogamp.newt.util.*, com.jogamp.newt.event.*, com.jogamp.newt.opengl" />
- <property name="javadoc.dev.packagenames" value="${javadoc.packagenames}, com.jogamp.opengl.*, com.jogamp.nativewindow.*, com.jogamp.newt.*, com.jogamp.gluegen.opengl.*, com.jogamp.gluegen.runtime.opengl.*" />
+ <property name="javadoc.dev.packagenames" value="${javadoc.packagenames}, com.jogamp.opengl.*, com.jogamp.nativewindow.*, com.jogamp.newt.*, com.jogamp.gluegen.opengl.*, com.jogamp.gluegen.runtime.opengl.*, jogamp.nativewindow.*, jogamp.opengl.*, jogamp.newt.*" />
<property name="java.excludes.javadoc.packagenames" value="jogamp.opengl.gl2.fixme.*,com.jogamp.audio.windows.waveout.TestSpatialization"/>
<property name="javadoc.bottom" value="Copyright 2010 JogAmp Community." />
@@ -327,7 +327,7 @@
</target>
<target name="javadoc.zip" depends="javadoc.init">
- <zip destfile="${build}/javadoc.zip"
+ <archive.7z destfile="${build}/javadoc.7z"
basedir="${javadoc.root.path}"
includes="jogl/**" />
</target>
diff --git a/make/scripts/cmpOld2New.sh b/make/scripts/cmpOld2New.sh
index 4394fe7b5..4394fe7b5 100644..100755
--- a/make/scripts/cmpOld2New.sh
+++ b/make/scripts/cmpOld2New.sh
diff --git a/make/scripts/count-lock.sh b/make/scripts/count-lock.sh
index 806235f5c..806235f5c 100644..100755
--- a/make/scripts/count-lock.sh
+++ b/make/scripts/count-lock.sh
diff --git a/make/scripts/cpp-gluegen-test.sh b/make/scripts/cpp-gluegen-test.sh
index 2baa57729..2baa57729 100644..100755
--- a/make/scripts/cpp-gluegen-test.sh
+++ b/make/scripts/cpp-gluegen-test.sh
diff --git a/make/scripts/java-win32-dbg.bat b/make/scripts/java-win32-dbg.bat
index ef117db82..2b15410ff 100755
--- a/make/scripts/java-win32-dbg.bat
+++ b/make/scripts/java-win32-dbg.bat
@@ -1,7 +1,7 @@
set BLD_SUB=build-win32
-set J2RE_HOME=c:\jre1.6.0_23_x32
-set JAVA_HOME=c:\jdk1.6.0_23_x32
+set J2RE_HOME=c:\jre1.6.0_24_x32
+set JAVA_HOME=c:\jdk1.6.0_24_x32
set ANT_PATH=C:\apache-ant-1.8.2
set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%PATH%
diff --git a/make/scripts/java-win32.bat b/make/scripts/java-win32.bat
index a7697d75c..368501cb4 100755
--- a/make/scripts/java-win32.bat
+++ b/make/scripts/java-win32.bat
@@ -1,7 +1,7 @@
set BLD_SUB=build-win32
-set J2RE_HOME=c:\jre1.6.0_23_x32
-set JAVA_HOME=c:\jdk1.6.0_23_x32
+set J2RE_HOME=c:\jre1.6.0_24_x32
+set JAVA_HOME=c:\jdk1.6.0_24_x32
set ANT_PATH=C:\apache-ant-1.8.2
set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%PATH%
diff --git a/make/scripts/java-win64-dbg.bat b/make/scripts/java-win64-dbg.bat
index 3aeee346e..34a2fdc4c 100755
--- a/make/scripts/java-win64-dbg.bat
+++ b/make/scripts/java-win64-dbg.bat
@@ -1,7 +1,7 @@
set BLD_SUB=build-win64
-set J2RE_HOME=c:\jre1.6.0_23_x64
-set JAVA_HOME=c:\jdk1.6.0_23_x64
+set J2RE_HOME=c:\jre1.6.0_24_x64
+set JAVA_HOME=c:\jdk1.6.0_24_x64
set ANT_PATH=C:\apache-ant-1.8.2
set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%PATH%
diff --git a/make/scripts/java-win64.bat b/make/scripts/java-win64.bat
index e931bb38e..320db5725 100755
--- a/make/scripts/java-win64.bat
+++ b/make/scripts/java-win64.bat
@@ -1,7 +1,7 @@
set BLD_SUB=build-win64
-set J2RE_HOME=c:\jre1.6.0_23_x64
-set JAVA_HOME=c:\jdk1.6.0_23_x64
+set J2RE_HOME=c:\jre1.6.0_24_x64
+set JAVA_HOME=c:\jdk1.6.0_24_x64
set ANT_PATH=C:\apache-ant-1.8.2
set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%PATH%
diff --git a/make/scripts/make-runtime-properties.sh b/make/scripts/make-runtime-properties.sh
index a6075dd85..a6075dd85 100644..100755
--- a/make/scripts/make-runtime-properties.sh
+++ b/make/scripts/make-runtime-properties.sh
diff --git a/make/scripts/make.jogl.all.linux-x86.sh b/make/scripts/make.jogl.all.linux-x86.sh
index 76b46a03b..03dedb99c 100755
--- a/make/scripts/make.jogl.all.linux-x86.sh
+++ b/make/scripts/make.jogl.all.linux-x86.sh
@@ -31,7 +31,6 @@ fi
# -Djogl.cg=1
# -Dc.compiler.debug=true
# -DuseOpenMAX=true \
-# -Dbuild.noarchives=true
# -Dgluegen.cpptasks.detected.os=true \
# -DisUnix=true \
# -DisLinux=true \
@@ -53,9 +52,7 @@ echo LIBGL_DEBUG: $LIBGL_DEBUG 2>&1 | tee -a $LOGF
ant \
$CUSTOMLIBDIR \
- -Dbuild.noarchives=true \
-Dgluegen-cpptasks.file=`pwd`/../../gluegen/make/lib/gluegen-cpptasks-linux-32bit.xml \
- -Dbuild.noarchives=true \
-Djogl.cg=1 \
-Drootrel.build=build-x86 \
-Dos.arch=x86 \
diff --git a/make/scripts/make.jogl.all.linux-x86_64.sh b/make/scripts/make.jogl.all.linux-x86_64.sh
index 2b63ef0ab..577caeb14 100755
--- a/make/scripts/make.jogl.all.linux-x86_64.sh
+++ b/make/scripts/make.jogl.all.linux-x86_64.sh
@@ -29,14 +29,12 @@ fi
# -Djogl.cg=1
# -Dc.compiler.debug=true \
-# -Dbuild.noarchives=true \
# -Dgluegen.cpptasks.detected.os=true \
# -DisUnix=true \
# -DisLinux=true \
# -DisLinuxAMD64=true \
# -DisX11=true \
-# -Dbuild.noarchives=true \
#LD_LIBRARY_PATH=/opt-linux-x86_64/mesa-7.8.1/lib64
#export LD_LIBRARY_PATH
@@ -50,7 +48,6 @@ echo LIBXCB_ALLOW_SLOPPY_LOCK: $LIBXCB_ALLOW_SLOPPY_LOCK 2>&1 | tee -a $LOGF
echo LIBGL_DRIVERS_PATH: $LIBGL_DRIVERS_PATH 2>&1 | tee -a $LOGF
echo LIBGL_DEBUG: $LIBGL_DEBUG 2>&1 | tee -a $LOGF
-# -Dbuild.noarchives=true \
# -Dc.compiler.debug=true \
# -Djavacdebug="true" \
# -Djavacdebuglevel="source,lines,vars" \
@@ -58,7 +55,6 @@ echo LIBGL_DEBUG: $LIBGL_DEBUG 2>&1 | tee -a $LOGF
ant \
$CUSTOMLIBDIR \
-Djavacdebuglevel="source,lines,vars" \
- -Dbuild.noarchives=true \
-Djogl.cg=1 \
-Drootrel.build=build-x86_64 \
-DuseKD=true \
diff --git a/make/scripts/make.jogl.all.macosx.sh b/make/scripts/make.jogl.all.macosx.sh
index a85f9344f..967790b6e 100755
--- a/make/scripts/make.jogl.all.macosx.sh
+++ b/make/scripts/make.jogl.all.macosx.sh
@@ -1,15 +1,13 @@
#! /bin/sh
-if [ -e /devtools/etc/profile.ant ] ; then
- . /devtools/etc/profile.ant
+if [ -e /opt-share/etc/profile.ant ] ; then
+ . /opt-share/etc/profile.ant
fi
# -Dc.compiler.debug=true
-# -Dbuild.noarchives=true
ant \
- -Dbuild.noarchives=true \
-Djogl.cg=1 \
-Drootrel.build=build-macosx \
$* 2>&1 | tee make.jogl.all.macosx.log
diff --git a/make/scripts/make.jogl.all.win32.bat b/make/scripts/make.jogl.all.win32.bat
index 6b66ff1c8..f73a332d3 100755
--- a/make/scripts/make.jogl.all.win32.bat
+++ b/make/scripts/make.jogl.all.win32.bat
@@ -1,7 +1,7 @@
set THISDIR="C:\JOGL"
-set J2RE_HOME=c:\jre1.6.0_23_x32
-set JAVA_HOME=c:\jdk1.6.0_23_x32
+set J2RE_HOME=c:\jre1.6.0_24_x32
+set JAVA_HOME=c:\jdk1.6.0_24_x32
set ANT_PATH=C:\apache-ant-1.8.2
set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%PATH%
@@ -12,6 +12,5 @@ REM -Dc.compiler.debug=true
REM -DuseOpenMAX=true
REM -DuseKD=true
REM -Djogl.cg=1
-REM -Dbuild.noarchives=true
-ant -Dbuild.noarchives=true -Drootrel.build=build-win32 -Djogl.cg=1 %1 %2 %3 %4 %5 %6 %7 %8 %9 > make.jogl.all.win32.log 2>&1
+ant -Drootrel.build=build-win32 -Djogl.cg=1 %1 %2 %3 %4 %5 %6 %7 %8 %9 > make.jogl.all.win32.log 2>&1
diff --git a/make/scripts/make.jogl.all.win64.bat b/make/scripts/make.jogl.all.win64.bat
index 8dbcd01e7..76e459ae7 100755
--- a/make/scripts/make.jogl.all.win64.bat
+++ b/make/scripts/make.jogl.all.win64.bat
@@ -1,7 +1,7 @@
set THISDIR="C:\JOGL"
-set J2RE_HOME=c:\jre1.6.0_23_x64
-set JAVA_HOME=c:\jdk1.6.0_23_x64
+set J2RE_HOME=c:\jre1.6.0_24_x64
+set JAVA_HOME=c:\jdk1.6.0_24_x64
set ANT_PATH=C:\apache-ant-1.8.2
set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw64\bin;c:\mingw\bin;%PATH%
@@ -12,6 +12,5 @@ REM -Dc.compiler.debug=true
REM -DuseOpenMAX=true
REM -DuseKD=true
REM -Djogl.cg=1
-REM -Dbuild.noarchives=true
-ant -Dc.compiler.debug=true -Dbuild.noarchives=true -Drootrel.build=build-win64 -Djogl.cg=1 %1 %2 %3 %4 %5 %6 %7 %8 %9 > make.jogl.all.win64.log 2>&1
+ant -Dc.compiler.debug=true -Drootrel.build=build-win64 -Djogl.cg=1 %1 %2 %3 %4 %5 %6 %7 %8 %9 > make.jogl.all.win64.log 2>&1
diff --git a/make/scripts/make.jogl.cdcfp.linux-x86.sh b/make/scripts/make.jogl.cdcfp.linux-x86.sh
index ad80f194d..b26926804 100755
--- a/make/scripts/make.jogl.cdcfp.linux-x86.sh
+++ b/make/scripts/make.jogl.cdcfp.linux-x86.sh
@@ -10,13 +10,11 @@ fi
# -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 \
diff --git a/make/scripts/make.jogl.cdcfp.macosx.sh b/make/scripts/make.jogl.cdcfp.macosx.sh
index d36f0bb7e..6875a4d2c 100755
--- a/make/scripts/make.jogl.cdcfp.macosx.sh
+++ b/make/scripts/make.jogl.cdcfp.macosx.sh
@@ -1,17 +1,15 @@
#! /bin/sh
-if [ -e /devtools/etc/profile.ant ] ; then
- . /devtools/etc/profile.ant
+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
diff --git a/make/scripts/make.jogl.doc.all.x86_64.sh b/make/scripts/make.jogl.doc.all.x86_64.sh
index 3711171af..5e111d50b 100755
--- a/make/scripts/make.jogl.doc.all.x86_64.sh
+++ b/make/scripts/make.jogl.doc.all.x86_64.sh
@@ -6,6 +6,5 @@ fi
ant -v \
- -Dbuild.noarchives=true \
-Drootrel.build=build-x86_64 \
javadoc.spec javadoc javadoc.dev $* 2>&1 | tee make.jogl.doc.all.x86_64.log
diff --git a/make/scripts/make.jogl.doc.x86_64.sh b/make/scripts/make.jogl.doc.x86_64.sh
index daf09ec33..677de394c 100755
--- a/make/scripts/make.jogl.doc.x86_64.sh
+++ b/make/scripts/make.jogl.doc.x86_64.sh
@@ -6,6 +6,5 @@ fi
ant -v \
- -Dbuild.noarchives=true \
-Drootrel.build=build-x86_64 \
javadoc $* 2>&1 | tee make.jogl.doc.x86_64.log
diff --git a/make/scripts/setenv-jogl.sh b/make/scripts/setenv-jogl.sh
index 964bbc5f8..586b667e3 100755
--- a/make/scripts/setenv-jogl.sh
+++ b/make/scripts/setenv-jogl.sh
@@ -10,8 +10,8 @@ if [ -z "$1" ] ; then
exit
fi
-if [ -e /devtools/etc/profile.ant ] ; then
- . /devtools/etc/profile.ant
+if [ -e /opt-share/etc/profile.ant ] ; then
+ . /opt-share/etc/profile.ant
fi
JOGL_BUILDDIR=$1
diff --git a/make/scripts/setvc9-jogl.bat b/make/scripts/setvc9-jogl.bat
index 6ff16053e..26cdf8ff4 100755
--- a/make/scripts/setvc9-jogl.bat
+++ b/make/scripts/setvc9-jogl.bat
@@ -1,7 +1,7 @@
-set PATH=C:\cygwin\devtools\share\apache-ant-1.8.2\bin;%PATH%
-set ANT_PATH=C:\cygwin\devtools\share\apache-ant-1.8.2
+set PATH=C:\apache-ant-1.8.2\bin;%PATH%
+set ANT_PATH=C:\apache-ant-1.8.2
c:
cd C:\SUN\JOGL2\jogl\make
diff --git a/make/scripts/tests-javaws-x64.bat b/make/scripts/tests-javaws-x64.bat
index 0bc8272fe..c25ccf335 100644..100755
--- a/make/scripts/tests-javaws-x64.bat
+++ b/make/scripts/tests-javaws-x64.bat
@@ -1,4 +1,4 @@
-set JRE_PATH=C:\jre1.6.0_23_x64\bin
+set JRE_PATH=C:\jre1.6.0_24_x64\bin
set LOG_PATH=%USERPROFILE%\AppData\LocalLow\Sun\Java\Deployment\log
%JRE_PATH%\javaws -uninstall
diff --git a/make/scripts/tests-javaws.sh b/make/scripts/tests-javaws.sh
index a1b1b1e2e..a1b1b1e2e 100644..100755
--- a/make/scripts/tests-javaws.sh
+++ b/make/scripts/tests-javaws.sh
diff --git a/make/scripts/tests-x32.bat b/make/scripts/tests-x32.bat
index 9b44dc178..84d7f2d9b 100644..100755
--- a/make/scripts/tests-x32.bat
+++ b/make/scripts/tests-x32.bat
@@ -33,5 +33,5 @@ REM scripts\java-win32.bat com.jogamp.opengl.test.junit.newt.TestCloseNewtAWT
REM scripts\java-win32-dbg.bat com.jogamp.opengl.test.junit.jogl.caps.TestMultisampleAWT -time 10000
REM scripts\java-win32-dbg.bat com.jogamp.opengl.test.junit.jogl.caps.TestMultisampleNEWT -time 10000
-scripts\java-win32-dbg.bat com.jogamp.opengl.test.junit.jogl.swt.TestSWT01GLn $*
+scripts\java-win32-dbg.bat com.jogamp.opengl.test.junit.jogl.swt.TestSWT01GLn %1 %2 %3 %4
REM scripts\java-win32-dbg.bat com.jogamp.opengl.test.junit.jogl.swt.TestSWTAWT01GLn $*
diff --git a/make/scripts/tests-x64.bat b/make/scripts/tests-x64.bat
index 246826fd6..43cc8ccbb 100644..100755
--- a/make/scripts/tests-x64.bat
+++ b/make/scripts/tests-x64.bat
@@ -47,7 +47,7 @@ REM scripts\java-win64.bat com.jogamp.opengl.test.junit.newt.TestWindowClosingPr
REM scripts\java-win64.bat com.jogamp.opengl.test.junit.newt.TestWindowClosingProtocol02NEWT $*
REM scripts\java-win64.bat com.jogamp.opengl.test.junit.newt.TestWindowClosingProtocol03NewtAWT $*
-scripts\java-win64-dbg.bat com.jogamp.opengl.test.junit.jogl.swt.TestSWT01GLn $*
+scripts\java-win64-dbg.bat com.jogamp.opengl.test.junit.jogl.swt.TestSWT01GLn %1 %2 %3 %4
REM scripts\java-win64-dbg.bat com.jogamp.opengl.test.junit.jogl.swt.TestSWTAWT01GLn $*
REM scripts\java-win64-dbg.bat com.jogamp.opengl.test.junit.jogl.offscreen.TestOffscreen02BitmapNEWT -time 5000
diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh
index 9a5e6fb20..682158eea 100644..100755
--- a/make/scripts/tests.sh
+++ b/make/scripts/tests.sh
@@ -1,6 +1,23 @@
#! /bin/bash
-bdir=../build-x86_64
+if [ -z "$1" -o -z "$2" ] ; then
+ echo Usage $0 java-exe build-dir
+ exit 0
+fi
+
+javaexe=$1
+shift
+bdir=$1
+shift
+
+if [ ! -x $javaexe ] ; then
+ echo java-exe $javaexe is not an executable
+ exit 1
+fi
+if [ ! -d $bdir ] ; then
+ echo build-dir $bdir is not a directory
+ exit 1
+fi
rm -f java-run.log
@@ -8,13 +25,14 @@ spath=`dirname $0`
. $spath/setenv-jogl.sh $bdir JOGL_ALL
-which java 2>&1 | tee -a java-run.log
-java -version 2>&1 | tee -a java-run.log
+which $javaexe 2>&1 | tee -a java-run.log
+$javaexe -version 2>&1 | tee -a java-run.log
echo LIBXCB_ALLOW_SLOPPY_LOCK: $LIBXCB_ALLOW_SLOPPY_LOCK 2>&1 | tee -a java-run.log
echo LIBGL_DRIVERS_PATH: $LIBGL_DRIVERS_PATH 2>&1 | tee -a java-run.log
echo LIBGL_DEBUG: $LIBGL_DEBUG 2>&1 | tee -a java-run.log
echo SWT_CLASSPATH: $SWT_CLASSPATH 2>&1 | tee -a java-run.log
-echo java $X_ARGS $D_ARGS $* 2>&1 | tee -a java-run.log
+echo $javaexe $X_ARGS $D_ARGS $* 2>&1 | tee -a java-run.log
+echo CLASSPATH $CLASSPATH 2>&1 | tee -a java-run.log
function jrun() {
awtarg=$1
@@ -50,7 +68,7 @@ function jrun() {
echo
echo "Test Start: $*"
echo
- java $awtarg $X_ARGS $D_ARGS $*
+ $javaexe $awtarg $X_ARGS $D_ARGS $*
echo
echo "Test End: $*"
echo
@@ -108,15 +126,15 @@ function testawt() {
#testawt com.jogamp.opengl.test.junit.jogl.demos.gl2.gears.TestGearsGLJPanelAWT $*
#testawt com.jogamp.opengl.test.junit.jogl.texture.TestTexture01AWT
#testawt com.jogamp.opengl.test.junit.jogl.caps.TestMultisampleAWT
-#testawt com.jogamp.opengl.test.junit.jogl.swt.TestSWT01GLn
+#testawt com.jogamp.opengl.test.junit.jogl.swt.TestSWT01GLn $*
#testawt com.jogamp.opengl.test.junit.jogl.awt.TestBug461OffscreenSupersamplingSwingAWT
-testawt com.jogamp.opengl.test.junit.jogl.texture.TestGrayTextureFromFileAWTBug417
+#testawt com.jogamp.opengl.test.junit.jogl.texture.TestGrayTextureFromFileAWTBug417
#
# newt.awt (testawt)
#
#testawt com.jogamp.opengl.test.junit.jogl.newt.TestSwingAWTRobotUsageBeforeJOGLInitBug411
-#testawt com.jogamp.opengl.test.junit.jogl.demos.gl2.gears.newt.TestGearsNewtAWTWrapper
+testawt com.jogamp.opengl.test.junit.jogl.demos.gl2.gears.newt.TestGearsNewtAWTWrapper
#testawt com.jogamp.opengl.test.junit.newt.TestEventSourceNotAWTBug
#testawt com.jogamp.opengl.test.junit.newt.TestFocus01SwingAWTRobot
#testawt com.jogamp.opengl.test.junit.newt.TestFocus02SwingAWTRobot
diff --git a/make/stub_includes/win32/windows.h b/make/stub_includes/win32/windows.h
index ddee94c06..c30f99ebd 100644
--- a/make/stub_includes/win32/windows.h
+++ b/make/stub_includes/win32/windows.h
@@ -52,3 +52,6 @@ typedef struct tagRECT {
LONG bottom;
} RECT;
+typedef RECT* PRECT;
+typedef RECT* LPRECT;
+
diff --git a/make/stub_includes/win32/wingdi.h b/make/stub_includes/win32/wingdi.h
index b169621f5..23ac428ca 100644
--- a/make/stub_includes/win32/wingdi.h
+++ b/make/stub_includes/win32/wingdi.h
@@ -191,6 +191,8 @@ WINGDIAPI HGDIOBJ WINAPI SelectObject(HDC, HGDIOBJ);
WINUSERAPI BOOL WINAPI ShowWindow(HWND hWnd, int nCmdShow);
WINUSERAPI HDC WINAPI GetDC(HWND);
WINUSERAPI int WINAPI ReleaseDC(HWND hWnd, HDC hDC);
+WINUSERAPI HWND WINAPI WindowFromDC(HDC hDC); // avail in >= Win2k
+WINUSERAPI BOOL WINAPI GetClientRect(HWND hwnd, LPRECT lpRect);
WINUSERAPI BOOL WINAPI DestroyWindow(HWND hWnd);
WINUSERAPI DWORD WINAPI GetObjectType(HGDIOBJ h);
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-15 23:42:12 +0000