diff options
| author | Sven Gothel <[email protected]> | 2014-08-28 18:46:42 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2014-08-28 18:46:42 +0200 |
| commit | a4f7d51f5a643fcf528711ea0e1bbd19158f5f7c (patch) | |
| tree | 70af731e055b4d4516eb94504cff6593b6a181a9 | |
| parent | d7698c5690a407e8018d3c56319d406cb395bbe8 (diff) | |
scripts: setenv-build-x86*: allow using a preset jre/jdk iff JAVA_HOME and J2RE_HOME is set and path exists
| -rw-r--r-- | make/scripts/setenv-build-jogl-x86.sh | 22 | ||||
| -rw-r--r-- | make/scripts/setenv-build-jogl-x86_64.sh | 22 |
2 files changed, 32 insertions, 12 deletions
diff --git a/make/scripts/setenv-build-jogl-x86.sh b/make/scripts/setenv-build-jogl-x86.sh index 5e4e542..5c7bf65 100644 --- a/make/scripts/setenv-build-jogl-x86.sh +++ b/make/scripts/setenv-build-jogl-x86.sh @@ -19,12 +19,22 @@ if [ -z "$ANT_PATH" ] ; then exit fi -if [ -e /opt-linux-x86/jre8 -a -e /opt-linux-x86/j2se8 ] ; then - J2RE_HOME=/opt-linux-x86/jre8 - JAVA_HOME=/opt-linux-x86/j2se8 - PATH=$J2RE_HOME/bin:$JAVA_HOME/bin:$PATH - export J2RE_HOME JAVA_HOME - FOUND_JAVA=1 +if [ ! -z "$J2RE_HOME" -a ! -z "$JAVA_HOME" ] ; then + if [ -e $J2RE_HOME -a -e $JAVA_HOME ] ; then + PATH=$J2RE_HOME/bin:$JAVA_HOME/bin:$PATH + export J2RE_HOME JAVA_HOME + FOUND_JAVA=1 + fi +fi + +if [ -z "$FOUND_JAVA" ] ; then + if [ -e /opt-linux-x86/jre8 -a -e /opt-linux-x86/j2se8 ] ; then + J2RE_HOME=/opt-linux-x86/jre8 + JAVA_HOME=/opt-linux-x86/j2se8 + PATH=$J2RE_HOME/bin:$JAVA_HOME/bin:$PATH + export J2RE_HOME JAVA_HOME + FOUND_JAVA=1 + fi fi if [ -z "$FOUND_JAVA" ] ; then diff --git a/make/scripts/setenv-build-jogl-x86_64.sh b/make/scripts/setenv-build-jogl-x86_64.sh index a18bbe0..2d01d19 100644 --- a/make/scripts/setenv-build-jogl-x86_64.sh +++ b/make/scripts/setenv-build-jogl-x86_64.sh @@ -26,12 +26,22 @@ if [ -z "$ANT_PATH" ] ; then exit fi -if [ -e /opt-linux-x86_64/jre8 -a -e /opt-linux-x86_64/j2se8 ] ; then - J2RE_HOME=/opt-linux-x86_64/jre8 - JAVA_HOME=/opt-linux-x86_64/j2se8 - PATH=$J2RE_HOME/bin:$JAVA_HOME/bin:$PATH - export J2RE_HOME JAVA_HOME - FOUND_JAVA=1 +if [ ! -z "$J2RE_HOME" -a ! -z "$JAVA_HOME" ] ; then + if [ -e $J2RE_HOME -a -e $JAVA_HOME ] ; then + PATH=$J2RE_HOME/bin:$JAVA_HOME/bin:$PATH + export J2RE_HOME JAVA_HOME + FOUND_JAVA=1 + fi +fi + +if [ -z "$FOUND_JAVA" ] ; then + if [ -e /opt-linux-x86_64/jre8 -a -e /opt-linux-x86_64/j2se8 ] ; then + J2RE_HOME=/opt-linux-x86_64/jre8 + JAVA_HOME=/opt-linux-x86_64/j2se8 + PATH=$J2RE_HOME/bin:$JAVA_HOME/bin:$PATH + export J2RE_HOME JAVA_HOME + FOUND_JAVA=1 + fi fi if [ -z "$FOUND_JAVA" ] ; then |