Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kurtakov2020-07-25 14:27:00 -0400
committerAlexander Kurtakov2020-07-26 02:53:44 -0400
commit6a160285d107e36b98fe7e020b7c69704b4a25b4 (patch)
tree24e8667aede5db07c0e45080a3ce91169223037b
parent6aba1ccf6803a3e29d5158983217e834e4443b33 (diff)
downloadeclipse.platform.swt-6a160285d107e36b98fe7e020b7c69704b4a25b4.tar.gz
eclipse.platform.swt-6a160285d107e36b98fe7e020b7c69704b4a25b4.tar.xz
eclipse.platform.swt-6a160285d107e36b98fe7e020b7c69704b4a25b4.zip
Get rid of 1.5.0 JVM configs in build scripts.
This hasn't been useful for years. Change-Id: I2cb1d1bfbd3501999b60366534aa61593c03644e Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
-rwxr-xr-xbundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh21
1 files changed, 7 insertions, 14 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh
index d048aec1ee..0490465334 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh
@@ -119,21 +119,14 @@ case $SWT_OS.$SWT_ARCH in
export CC=gcc
fi
if [ "${JAVA_HOME}" = "" ]; then
- # Validate that we set JAVA_HOME to an existing directory. If not try to look for a better one.
- BLUEBIRD_JAVA_HOME="/bluebird/teamswt/swt-builddir/JDKs/x86_64/jdk1.5.0"
- if [ -d "$BLUEBIRD_JAVA_HOME" ]; then
- func_echo_plus "JAVA_HOME not set, configured to: $BLUEBIRD_JAVA_HOME"
- export JAVA_HOME="$BLUEBIRD_JAVA_HOME"
+ # Cross-platform method of finding JAVA_HOME.
+ # Tested on Fedora 24 and Ubuntu 16
+ DYNAMIC_JAVA_HOME=`readlink -f /usr/bin/java | sed "s:jre/::" | sed "s:bin/java::"`
+ if [ -e "${DYNAMIC_JAVA_HOME}include/jni.h" ]; then
+ func_echo_plus "JAVA_HOME not set, but jni.h found, dynamically configured to $DYNAMIC_JAVA_HOME"
+ export JAVA_HOME="$DYNAMIC_JAVA_HOME"
else
- # Cross-platform method of finding JAVA_HOME.
- # Tested on Fedora 24 and Ubuntu 16
- DYNAMIC_JAVA_HOME=`readlink -f /usr/bin/java | sed "s:jre/::" | sed "s:bin/java::"`
- if [ -e "${DYNAMIC_JAVA_HOME}include/jni.h" ]; then
- func_echo_plus "JAVA_HOME not set, but jni.h found, dynamically configured to $DYNAMIC_JAVA_HOME"
- export JAVA_HOME="$DYNAMIC_JAVA_HOME"
- else
- func_echo_error "JAVA_HOME not set and jni.h could not be located. You might get a compile error about include 'jni.h'. You should install 'java-*-openjdk-devel' package or if you have it installed already, find jni.h and set JAVA_HOME manually to base of 'include' folder"
- fi
+ func_echo_error "JAVA_HOME not set and jni.h could not be located. You might get a compile error about include 'jni.h'. You should install 'java-*-openjdk-devel' package or if you have it installed already, find jni.h and set JAVA_HOME manually to base of 'include' folder"
fi
fi
if [ "${PKG_CONFIG_PATH}" = "" ]; then

Back to the top