diff options
| -rw-r--r-- | make/build-common.xml | 6 | ||||
| -rwxr-xr-x | make/java-run-newt.sh | 15 | ||||
| -rwxr-xr-x | make/java-run.sh | 15 | ||||
| -rw-r--r-- | make/make.jogl.all.linux-x86.sh | 24 | ||||
| -rw-r--r-- | make/make.jogl.all.linux-x86_64.sh | 27 |
5 files changed, 84 insertions, 3 deletions
diff --git a/make/build-common.xml b/make/build-common.xml index 461e96f1f..bbc99b589 100644 --- a/make/build-common.xml +++ b/make/build-common.xml @@ -153,7 +153,11 @@ <property name="build.junit" value="${build}/test/build" /> <property name="obj.junit" value="${build.junit}/obj"/> - <property name="obj.all.paths" value="${obj.gluegen}${path.separator}${obj.nativewindow}${path.separator}${obj.jogl}${path.separator}${obj.newt}${path.separator}${obj.junit}" /> + <condition property="obj.custom" value="${custom.libdir}${path.separator}"> + <isset property="custom.libdir"/> + </condition> + + <property name="obj.all.paths" value="${obj.custom}${obj.gluegen}${path.separator}${obj.nativewindow}${path.separator}${obj.jogl}${path.separator}${obj.newt}${path.separator}${obj.junit}" /> <path id="gluegen.classpath"> <pathelement location="${gluegen.jar}" /> diff --git a/make/java-run-newt.sh b/make/java-run-newt.sh index bc9dc845c..289acdf7c 100755 --- a/make/java-run-newt.sh +++ b/make/java-run-newt.sh @@ -1,9 +1,22 @@ #! /bin/sh function print_usage() { - echo "Usage: $0 jogl-build-dir ..." + echo "Usage: $0 [-libdir pre-lib-dir] jogl-build-dir ..." } +if [ "$1" = "-libdir" ] ; then + shift + if [ -z "$1" ] ; then + echo libdir argument missing + print_usage + exit + fi + PRELIB=$1 + shift + LD_LIBRARY_PATH=$PRELIB:$LD_LIBRARY_PATH + export LD_LIBRARY_PATH +fi + if [ -z "$1" ] ; then echo JOGL BUILD DIR missing print_usage diff --git a/make/java-run.sh b/make/java-run.sh index 15bcdcd85..0246156db 100755 --- a/make/java-run.sh +++ b/make/java-run.sh @@ -1,9 +1,22 @@ #! /bin/sh function print_usage() { - echo "Usage: $0 jogl-build-dir ..." + echo "Usage: $0 [-libdir pre-lib-dir] jogl-build-dir ..." } +if [ "$1" = "-libdir" ] ; then + shift + if [ -z "$1" ] ; then + echo libdir argument missing + print_usage + exit + fi + PRELIB=$1 + shift + LD_LIBRARY_PATH=$PRELIB:$LD_LIBRARY_PATH + export LD_LIBRARY_PATH +fi + if [ -z "$1" ] ; then echo JOGL BUILD DIR missing print_usage diff --git a/make/make.jogl.all.linux-x86.sh b/make/make.jogl.all.linux-x86.sh index 32f48a80f..d73d3b7f7 100644 --- a/make/make.jogl.all.linux-x86.sh +++ b/make/make.jogl.all.linux-x86.sh @@ -4,6 +4,29 @@ if [ -e ../../setenv-build-jogl-x86.sh ] ; then . ../../setenv-build-jogl-x86.sh fi +if [ -z "$ANT_PATH" ] ; then + if [ -e /usr/share/ant/bin/ant -a -e /usr/share/ant/lib/ant.jar ] ; then + ANT_PATH=/usr/share/ant + export ANT_PATH + echo autosetting ANT_PATH to $ANT_PATH + fi +fi +if [ -z "$ANT_PATH" ] ; then + echo ANT_PATH does not exist, set it + exit +fi + +if [ "$1" = "-libdir" ] ; then + shift + if [ -z "$1" ] ; then + echo libdir argument missing + print_usage + exit + fi + CUSTOMLIBDIR="-Dcustom.libdir=$1" + shift +fi + # -Djogl.cg=1 -Dx11.cg.lib=../../lib-linux-x86_64 # -Dc.compiler.debug=true @@ -17,6 +40,7 @@ fi # -Djogl.cg=1 -Dx11.cg.lib=../../lib-linux-x86 \ ant \ + $CUSTOMLIBDIR \ -Dgluegen-cpptasks.file=`pwd`/../../gluegen/make/lib/gluegen-cpptasks-linux-32bit.xml \ -Dbuild.noarchives=true \ -Djogl.cg=1 -Dx11.cg.lib=../../lib-linux-x86 \ diff --git a/make/make.jogl.all.linux-x86_64.sh b/make/make.jogl.all.linux-x86_64.sh index b6c5e9d63..b17cd2f15 100644 --- a/make/make.jogl.all.linux-x86_64.sh +++ b/make/make.jogl.all.linux-x86_64.sh @@ -4,6 +4,29 @@ if [ -e ../../setenv-build-jogl-x86_64.sh ] ; then . ../../setenv-build-jogl-x86_64.sh fi +if [ -z "$ANT_PATH" ] ; then + if [ -e /usr/share/ant/bin/ant -a -e /usr/share/ant/lib/ant.jar ] ; then + ANT_PATH=/usr/share/ant + export ANT_PATH + echo autosetting ANT_PATH to $ANT_PATH + fi +fi +if [ -z "$ANT_PATH" ] ; then + echo ANT_PATH does not exist, set it + exit +fi + +if [ "$1" = "-libdir" ] ; then + shift + if [ -z "$1" ] ; then + echo libdir argument missing + print_usage + exit + fi + CUSTOMLIBDIR="-Dcustom.libdir=$1" + shift +fi + # -Djogl.cg=1 -Dx11.cg.lib=../../lib-linux-x86_64 # -Dc.compiler.debug=true \ # -Dbuild.noarchives=true \ @@ -15,7 +38,11 @@ fi # -DisX11=true \ # -Dbuild.noarchives=true \ +#LD_LIBRARY_PATH=/opt-linux-x86_64/mesa-7.8.1/lib64 +#export LD_LIBRARY_PATH + ant \ + $CUSTOMLIBDIR \ -Dbuild.noarchives=true \ -Djogl.cg=1 -Dx11.cg.lib=../../lib-linux-x86_64 \ -Drootrel.build=build-x86_64 \ |