aboutsummaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
Diffstat (limited to 'make')
-rwxr-xr-xmake/build.xml16
-rwxr-xr-xmake/scripts/make.joal.all.android-aarch64-cross.sh9
-rwxr-xr-xmake/scripts/make.joal.all.android-armv6-cross.sh11
-rwxr-xr-xmake/scripts/make.joal.all.android-x86-cross.sh10
-rwxr-xr-xmake/scripts/make.joal.all.generic.sh6
-rwxr-xr-xmake/scripts/make.joal.all.linux-aarch64-cross.sh6
-rwxr-xr-xmake/scripts/make.joal.all.linux-armv6hf-cross.sh6
-rwxr-xr-xmake/scripts/make.joal.all.linux-armv6hf.sh6
-rwxr-xr-xmake/scripts/make.joal.all.linux-x86-clang.sh6
-rwxr-xr-xmake/scripts/make.joal.all.linux-x86.sh6
-rwxr-xr-xmake/scripts/make.joal.all.linux-x86_64-clang.sh6
-rwxr-xr-xmake/scripts/make.joal.all.linux-x86_64.sh6
-rwxr-xr-xmake/scripts/make.joal.all.macosx-java6.sh30
-rwxr-xr-xmake/scripts/make.joal.all.macosx.sh8
-rwxr-xr-xmake/scripts/make.joal.all.solaris-x86_64.sh6
-rwxr-xr-xmake/scripts/make.joal.all.win32.bat20
-rwxr-xr-xmake/scripts/make.joal.all.win64.bat19
17 files changed, 83 insertions, 94 deletions
diff --git a/make/build.xml b/make/build.xml
index 5137ae3..8ab752f 100755
--- a/make/build.xml
+++ b/make/build.xml
@@ -128,6 +128,9 @@
<property name="src.java" value="${project.root}/${rootrel.src.java}" />
<property name="build" value="${project.root}/${rootrel.build}" />
<property name="tempdir" value="${project.root}/build-temp" />
+ <delete includeEmptyDirs="true" failonerror="false">
+ <fileset dir="${tempdir}" />
+ </delete>
<mkdir dir="${tempdir}" />
<!-- The generated source directories. -->
@@ -363,6 +366,7 @@
debug="${javacdebug}" debuglevel="${javacdebuglevel}">
<src path="${src.java}" />
<src path="${src.generated.java}" />
+ <!-- compilerarg line="release ${target.releaselevel}"/ -->
</javac>
</target>
@@ -531,6 +535,7 @@
<copy file="lib/bsinc_inc.h" todir="${build}/openal-soft" overwrite="true"/>
<exec dir="${build}/openal-soft" executable="cmake" logError="true" failonerror="false" failifexecutionfails="false">
<env key="PATH" value="${env.PATH}"/>
+ <arg line="-G 'MinGW Makefiles'"/>
<arg value="../../openal-soft"/>
<arg value="-DCMAKE_TOOLCHAIN_FILE=../../openal-soft/cmake/toolchain.windows.cmake"/>
</exec>
@@ -874,11 +879,18 @@
<!--
- Clean up all that is built.
-->
+ <target name="clean-temp" depends="init">
+ <delete includeEmptyDirs="true" failonerror="false">
+ <fileset dir="${tempdir}" />
+ </delete>
+ </target>
+
<target name="clean" depends="init">
<delete includeEmptyDirs="true" quiet="true">
<fileset dir="${build}" />
<fileset dir="${javadoc}" />
<fileset dir="${javadoc.dev}" />
+ <fileset dir="${tempdir}" />
</delete>
<ant antfile="build-test.xml" target="clean"/>
</target>
@@ -887,7 +899,9 @@
<!--
- Build everything.
-->
- <target name="all" depends="joal.build, test.compile, tag.build, developer-zip-archive"/>
+ <target name="all" depends="joal.build, test.compile, tag.build, developer-zip-archive">
+ <antcall target="clean-temp" inheritAll="true" inheritRefs="true" />
+ </target>
<target name="joal.build" depends="init">
<!-- Generate and compile the Java sources. -->
diff --git a/make/scripts/make.joal.all.android-aarch64-cross.sh b/make/scripts/make.joal.all.android-aarch64-cross.sh
index 7a26862..b9b8bd7 100755
--- a/make/scripts/make.joal.all.android-aarch64-cross.sh
+++ b/make/scripts/make.joal.all.android-aarch64-cross.sh
@@ -26,12 +26,11 @@ export TARGET_ADB_PORT=5555
export TARGET_ROOT=/data/projects
export TARGET_ANT_HOME=/usr/share/ant
-export ANDROID_VERSION=21
-export SOURCE_LEVEL=1.6
-export TARGET_LEVEL=1.6
-export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
+export ANDROID_VERSION=24
+export SOURCE_LEVEL=1.8
+export TARGET_LEVEL=1.8
+export TARGET_RT_JAR=/opt-share/jre1.8.0_212/lib/rt.jar
-#export GCC_VERSION=4.4.3
export GCC_VERSION=4.9
export HOST_ARCH=linux-x86_64
export TARGET_TRIPLE=aarch64-linux-android
diff --git a/make/scripts/make.joal.all.android-armv6-cross.sh b/make/scripts/make.joal.all.android-armv6-cross.sh
index a7b3124..3a2e5cc 100755
--- a/make/scripts/make.joal.all.android-armv6-cross.sh
+++ b/make/scripts/make.joal.all.android-armv6-cross.sh
@@ -26,13 +26,12 @@ export TARGET_ADB_PORT=5555
export TARGET_ROOT=/data/projects
export TARGET_ANT_HOME=/usr/share/ant
-export ANDROID_VERSION=9
-export SOURCE_LEVEL=1.6
-export TARGET_LEVEL=1.6
-export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
+export ANDROID_VERSION=24
+export SOURCE_LEVEL=1.8
+export TARGET_LEVEL=1.8
+export TARGET_RT_JAR=/opt-share/jre1.8.0_212/lib/rt.jar
-#export GCC_VERSION=4.4.3
-export GCC_VERSION=4.8
+export GCC_VERSION=4.9
export HOST_ARCH=linux-x86_64
export TARGET_TRIPLE=arm-linux-androideabi
diff --git a/make/scripts/make.joal.all.android-x86-cross.sh b/make/scripts/make.joal.all.android-x86-cross.sh
index 5a57c31..f1d2924 100755
--- a/make/scripts/make.joal.all.android-x86-cross.sh
+++ b/make/scripts/make.joal.all.android-x86-cross.sh
@@ -71,13 +71,13 @@ elif [ ! -e $ANDROID_HOME ] ; then
fi
export ANDROID_HOME
-export ANDROID_VERSION=9
-export SOURCE_LEVEL=1.6
-export TARGET_LEVEL=1.6
-export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
+export ANDROID_VERSION=24
+export SOURCE_LEVEL=1.8
+export TARGET_LEVEL=1.8
+export TARGET_RT_JAR=/opt-share/jre1.8.0_212/lib/rt.jar
#export GCC_VERSION=4.4.3
-export GCC_VERSION=4.7
+export GCC_VERSION=4.9
HOST_ARCH=linux-x86
export TARGET_TRIPLE=i686-linux-android
export TOOLCHAIN_NAME=x86
diff --git a/make/scripts/make.joal.all.generic.sh b/make/scripts/make.joal.all.generic.sh
index 5e463fd..2331912 100755
--- a/make/scripts/make.joal.all.generic.sh
+++ b/make/scripts/make.joal.all.generic.sh
@@ -1,8 +1,8 @@
#! /bin/sh
-export SOURCE_LEVEL=1.6
-export TARGET_LEVEL=1.6
-export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
+export SOURCE_LEVEL=1.8
+export TARGET_LEVEL=1.8
+export TARGET_RT_JAR=/opt-share/jre1.8.0_212/lib/rt.jar
#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet"
diff --git a/make/scripts/make.joal.all.linux-aarch64-cross.sh b/make/scripts/make.joal.all.linux-aarch64-cross.sh
index 0db7a1d..124be59 100755
--- a/make/scripts/make.joal.all.linux-aarch64-cross.sh
+++ b/make/scripts/make.joal.all.linux-aarch64-cross.sh
@@ -27,9 +27,9 @@ export GLUEGEN_CPPTASKS_FILE="../../gluegen/make/lib/gluegen-cpptasks-linux-aarc
#export JUNIT_DISABLED="true"
#export JUNIT_RUN_ARG0="-Dnewt.test.Screen.disableScreenMode"
-export SOURCE_LEVEL=1.6
-export TARGET_LEVEL=1.6
-export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
+export SOURCE_LEVEL=1.8
+export TARGET_LEVEL=1.8
+export TARGET_RT_JAR=/opt-share/jre1.8.0_212/lib/rt.jar
#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet"
diff --git a/make/scripts/make.joal.all.linux-armv6hf-cross.sh b/make/scripts/make.joal.all.linux-armv6hf-cross.sh
index f420195..e5265c9 100755
--- a/make/scripts/make.joal.all.linux-armv6hf-cross.sh
+++ b/make/scripts/make.joal.all.linux-armv6hf-cross.sh
@@ -38,9 +38,9 @@ export GLUEGEN_CPPTASKS_FILE="../../gluegen/make/lib/gluegen-cpptasks-linux-armv
#export JUNIT_DISABLED="true"
#export JUNIT_RUN_ARG0="-Dnewt.test.Screen.disableScreenMode"
-export SOURCE_LEVEL=1.6
-export TARGET_LEVEL=1.6
-export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
+export SOURCE_LEVEL=1.8
+export TARGET_LEVEL=1.8
+export TARGET_RT_JAR=/opt-share/jre1.8.0_212/lib/rt.jar
#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet"
diff --git a/make/scripts/make.joal.all.linux-armv6hf.sh b/make/scripts/make.joal.all.linux-armv6hf.sh
index 7e5f18a..c9d35f0 100755
--- a/make/scripts/make.joal.all.linux-armv6hf.sh
+++ b/make/scripts/make.joal.all.linux-armv6hf.sh
@@ -23,9 +23,9 @@ fi
# -Dtarget.targetlevel=1.6 \
# -Dtarget.rt.jar=/opt-share/jre1.6.0_30/lib/rt.jar \
-export SOURCE_LEVEL=1.6
-export TARGET_LEVEL=1.6
-export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
+export SOURCE_LEVEL=1.8
+export TARGET_LEVEL=1.8
+export TARGET_RT_JAR=/opt-share/jre1.8.0_212/lib/rt.jar
#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet"
diff --git a/make/scripts/make.joal.all.linux-x86-clang.sh b/make/scripts/make.joal.all.linux-x86-clang.sh
index 1c27a52..f800a0c 100755
--- a/make/scripts/make.joal.all.linux-x86-clang.sh
+++ b/make/scripts/make.joal.all.linux-x86-clang.sh
@@ -18,9 +18,9 @@ if [ -z "$ANT_PATH" ] ; then
exit
fi
-export SOURCE_LEVEL=1.6
-export TARGET_LEVEL=1.6
-export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
+export SOURCE_LEVEL=1.8
+export TARGET_LEVEL=1.8
+export TARGET_RT_JAR=/opt-share/jre1.8.0_212/lib/rt.jar
export GLUEGEN_PROPERTIES_FILE="lib/gluegen-clang.properties"
# or -Dgcc.compat.compiler=clang
diff --git a/make/scripts/make.joal.all.linux-x86.sh b/make/scripts/make.joal.all.linux-x86.sh
index 1adf02c..86ad7b9 100755
--- a/make/scripts/make.joal.all.linux-x86.sh
+++ b/make/scripts/make.joal.all.linux-x86.sh
@@ -18,9 +18,9 @@ if [ -z "$ANT_PATH" ] ; then
exit
fi
-export SOURCE_LEVEL=1.6
-export TARGET_LEVEL=1.6
-export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
+export SOURCE_LEVEL=1.8
+export TARGET_LEVEL=1.8
+export TARGET_RT_JAR=/opt-share/jre1.8.0_212/lib/rt.jar
#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet"
diff --git a/make/scripts/make.joal.all.linux-x86_64-clang.sh b/make/scripts/make.joal.all.linux-x86_64-clang.sh
index 5501f12..c945cf9 100755
--- a/make/scripts/make.joal.all.linux-x86_64-clang.sh
+++ b/make/scripts/make.joal.all.linux-x86_64-clang.sh
@@ -18,9 +18,9 @@ if [ -z "$ANT_PATH" ] ; then
exit
fi
-export SOURCE_LEVEL=1.6
-export TARGET_LEVEL=1.6
-export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
+export SOURCE_LEVEL=1.8
+export TARGET_LEVEL=1.8
+export TARGET_RT_JAR=/opt-share/jre1.8.0_212/lib/rt.jar
export GLUEGEN_PROPERTIES_FILE="lib/gluegen-clang.properties"
# or -Dgcc.compat.compiler=clang
diff --git a/make/scripts/make.joal.all.linux-x86_64.sh b/make/scripts/make.joal.all.linux-x86_64.sh
index 6ce47d5..68bb6c8 100755
--- a/make/scripts/make.joal.all.linux-x86_64.sh
+++ b/make/scripts/make.joal.all.linux-x86_64.sh
@@ -18,9 +18,9 @@ if [ -z "$ANT_PATH" ] ; then
exit
fi
-export SOURCE_LEVEL=1.6
-export TARGET_LEVEL=1.6
-export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
+export SOURCE_LEVEL=1.8
+export TARGET_LEVEL=1.8
+export TARGET_RT_JAR=/opt-share/jre1.8.0_212/lib/rt.jar
#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet"
diff --git a/make/scripts/make.joal.all.macosx-java6.sh b/make/scripts/make.joal.all.macosx-java6.sh
deleted file mode 100755
index f30856f..0000000
--- a/make/scripts/make.joal.all.macosx-java6.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#! /bin/sh
-
-if [ -e /opt-share/etc/profile.ant ] ; then
- . /opt-share/etc/profile.ant
-fi
-
-# -Dc.compiler.debug=true
-#
-# -Dtarget.sourcelevel=1.6 \
-# -Dtarget.targetlevel=1.6 \
-# -Dtarget.rt.jar=/opt-share/jre1.6.0_30/lib/rt.jar \
-
-# Force OSX SDK 10.6, if desired
-# export SDKROOT=macosx10.6
-
-JAVA_HOME=`/usr/libexec/java_home -version 1.6`
-PATH=$JAVA_HOME/bin:$PATH
-export JAVA_HOME PATH
-
-export SOURCE_LEVEL=1.6
-export TARGET_LEVEL=1.6
-export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
-
-#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
-export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet"
-
-#BUILD_ARCHIVE=true \
-ant \
- -Drootrel.build=build-macosx-java6 \
- $* 2>&1 | tee make.joal.all.macosx-java6.log
diff --git a/make/scripts/make.joal.all.macosx.sh b/make/scripts/make.joal.all.macosx.sh
index 466bf61..7826fa8 100755
--- a/make/scripts/make.joal.all.macosx.sh
+++ b/make/scripts/make.joal.all.macosx.sh
@@ -4,15 +4,15 @@ if [ -e /opt-share/etc/profile.ant ] ; then
. /opt-share/etc/profile.ant
fi
-JAVA_HOME=`/usr/libexec/java_home -version 1.7`
+JAVA_HOME=`/usr/libexec/java_home -version 11`
PATH=$JAVA_HOME/bin:$PATH
export JAVA_HOME PATH
# -Dc.compiler.debug=true
-export SOURCE_LEVEL=1.6
-export TARGET_LEVEL=1.6
-export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
+export SOURCE_LEVEL=1.8
+export TARGET_LEVEL=1.8
+export TARGET_RT_JAR=/opt-share/jre1.8.0_212/lib/rt.jar
#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet"
diff --git a/make/scripts/make.joal.all.solaris-x86_64.sh b/make/scripts/make.joal.all.solaris-x86_64.sh
index 1548031..de2c809 100755
--- a/make/scripts/make.joal.all.solaris-x86_64.sh
+++ b/make/scripts/make.joal.all.solaris-x86_64.sh
@@ -20,9 +20,9 @@ fi
# -Drootrel.build=build-x86_64 \
-export SOURCE_LEVEL=1.6
-export TARGET_LEVEL=1.6
-export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
+export SOURCE_LEVEL=1.8
+export TARGET_LEVEL=1.8
+export TARGET_RT_JAR=/opt-share/jre1.8.0_212/lib/rt.jar
#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet"
diff --git a/make/scripts/make.joal.all.win32.bat b/make/scripts/make.joal.all.win32.bat
index 40a535a..62a7ce3 100755
--- a/make/scripts/make.joal.all.win32.bat
+++ b/make/scripts/make.joal.all.win32.bat
@@ -1,19 +1,23 @@
set THISDIR="C:\JOGL"
-set J2RE_HOME=c:\jre1.8.0_66_x32
-set JAVA_HOME=c:\jdk1.8.0_66_x32
-set ANT_PATH=C:\apache-ant-1.9.4
-set CMAKE_PATH=C:\cmake-2.8.10.2-win32-x86
+set J2RE_HOME=c:\jre-11.0.4+11_x32
+set JAVA_HOME=c:\jdk-11.0.4+11_x32
+set ANT_PATH=C:\apache-ant-1.10.5
+set GIT_PATH=C:\cygwin\bin
+set SEVENZIP=C:\Program Files\7-Zip
-set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%CMAKE_PATH%\bin;%PATH%
+set CMAKE_PATH=C:\cmake-3.15.2-win32-x86
+set CMAKE_C_COMPILER=c:\mingw32\bin\gcc
+
+set PATH=%J2RE_HOME%\bin;%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw32\bin;%CMAKE_PATH%\bin;%GIT_PATH%;%SEVENZIP%;%PATH%
set LIB_GEN=%THISDIR%\lib
set CLASSPATH=.;%THISDIR%\build-win32\classes
REM -Dc.compiler.debug=true
-set SOURCE_LEVEL=1.6
-set TARGET_LEVEL=1.6
-set TARGET_RT_JAR=c:\jre1.6.0_30\lib\rt.jar
+set SOURCE_LEVEL=1.8
+set TARGET_LEVEL=1.8
+set TARGET_RT_JAR=C:\jre1.8.0_212\lib\rt.jar
REM set JOGAMP_JAR_CODEBASE=Codebase: *.jogamp.org
set JOGAMP_JAR_CODEBASE=Codebase: *.goethel.localnet
diff --git a/make/scripts/make.joal.all.win64.bat b/make/scripts/make.joal.all.win64.bat
index eb41e54..710d199 100755
--- a/make/scripts/make.joal.all.win64.bat
+++ b/make/scripts/make.joal.all.win64.bat
@@ -1,20 +1,23 @@
set THISDIR="C:\JOGL"
-set J2RE_HOME=c:\jre1.8.0_66_x64
-set JAVA_HOME=c:\jdk1.8.0_66_x64
-set ANT_PATH=C:\apache-ant-1.9.4
-set CMAKE_PATH=C:\cmake-2.8.10.2-win32-x86
+set J2RE_HOME=c:\jre-11.0.4+11_x64
+set JAVA_HOME=c:\jdk-11.0.4+11_x64
+set ANT_PATH=C:\apache-ant-1.10.5
+set GIT_PATH=C:\cygwin\bin
+set SEVENZIP=C:\Program Files\7-Zip
+
+set CMAKE_PATH=C:\cmake-3.15.2-win64-x64
set CMAKE_C_COMPILER=c:\mingw64\bin\gcc
-set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw64\bin;c:\mingw\bin;%CMAKE_PATH%\bin;%PATH%
+set PATH=%J2RE_HOME%\bin;%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw64\bin;%CMAKE_PATH%\bin;%GIT_PATH%;%SEVENZIP%;%PATH%
set LIB_GEN=%THISDIR%\lib
set CLASSPATH=.;%THISDIR%\build-win64\classes
REM -Dc.compiler.debug=true
-set SOURCE_LEVEL=1.6
-set TARGET_LEVEL=1.6
-set TARGET_RT_JAR=c:\jre1.6.0_30\lib\rt.jar
+set SOURCE_LEVEL=1.8
+set TARGET_LEVEL=1.8
+set TARGET_RT_JAR=C:\jre1.8.0_212\lib\rt.jar
REM set JOGAMP_JAR_CODEBASE=Codebase: *.jogamp.org
set JOGAMP_JAR_CODEBASE=Codebase: *.goethel.localnet
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-28 16:46:37 +0000