diff options
| author | Sven Gothel <[email protected]> | 2011-10-18 17:13:51 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2011-10-18 17:13:51 +0200 |
| commit | 70407434fd4cd205b127ed7d73832eb0b3d01263 (patch) | |
| tree | af0ac1f9035aa63eb901f56ef32d7f6178cd5fa4 /scripts | |
| parent | e85d4df16b980993b61b7c165afdedc65ec9bda0 (diff) | |
split solaris 32bit (x86/sparc), use jvmDataModel.arg set by gluegenv2.0-rc4
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/make.jocl.all.linux-x86.sh | 6 | ||||
| -rw-r--r-- | scripts/make.jocl.all.linux-x86_64.sh | 4 | ||||
| -rw-r--r-- | scripts/make.jocl.all.solaris-x86.sh | 11 | ||||
| -rw-r--r-- | scripts/make.jocl.all.solaris-x86_64.sh | 4 |
4 files changed, 19 insertions, 6 deletions
diff --git a/scripts/make.jocl.all.linux-x86.sh b/scripts/make.jocl.all.linux-x86.sh index 9ae8b770..1f497cf0 100644 --- a/scripts/make.jocl.all.linux-x86.sh +++ b/scripts/make.jocl.all.linux-x86.sh @@ -1,7 +1,9 @@ #! /bin/sh -if [ -e ../setenv-build-jogl-x86.sh ] ; then - . ../setenv-build-jogl-x86.sh +SDIR=`dirname $0` + +if [ -e $SDIR/../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then + . $SDIR/../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh fi ant \ diff --git a/scripts/make.jocl.all.linux-x86_64.sh b/scripts/make.jocl.all.linux-x86_64.sh index c58e1ae9..680d1454 100644 --- a/scripts/make.jocl.all.linux-x86_64.sh +++ b/scripts/make.jocl.all.linux-x86_64.sh @@ -2,8 +2,8 @@ SDIR=`dirname $0` -if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then - . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh +if [ -e $SDIR/../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then + . $SDIR/../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh fi ant \ diff --git a/scripts/make.jocl.all.solaris-x86.sh b/scripts/make.jocl.all.solaris-x86.sh new file mode 100644 index 00000000..ed815144 --- /dev/null +++ b/scripts/make.jocl.all.solaris-x86.sh @@ -0,0 +1,11 @@ +#! /bin/sh + +SDIR=`dirname $0` + +if [ -e $SDIR/../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then + . $SDIR/../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh +fi + +ant \ + -Drootrel.build=build-solaris-x86_64 \ + $* 2>&1 | tee make.jocl.all.solaris-x86_64.log diff --git a/scripts/make.jocl.all.solaris-x86_64.sh b/scripts/make.jocl.all.solaris-x86_64.sh index be11b91b..ed815144 100644 --- a/scripts/make.jocl.all.solaris-x86_64.sh +++ b/scripts/make.jocl.all.solaris-x86_64.sh @@ -2,8 +2,8 @@ SDIR=`dirname $0` -if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then - . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh +if [ -e $SDIR/../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then + . $SDIR/../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh fi ant \ |