fix building scripts

dwing4g · Jan 10, 2019 · ac2d2d8 · ac2d2d8
1 parent 7387b7f
commit ac2d2d8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/make_linux.sh b/make_linux.sh
@@ -5,7 +5,10 @@ cd `dirname $0`
 # note:
 # 1. if gcc supports c++11 (4.8+), remove "-Dconstexpr= -Doverride="
 
-if [ "$JAVA_HOME" = "" ]; then JAVA_HOME=/usr/java/default; fi
+if [ -z $JAVA_HOME ]; then JAVA_HOME=/usr/java/default; fi
+
+JAVA_VER=`$JAVA_HOME/bin/java -version 2>&1 | awk -F "[ \"]" '/version/{print $4}'`
+if [[ $JAVA_VER < 1.8 ]]; then echo 'ERROR: JDK 1.8 or later is required!'; exit 1; fi
 
 CORE_FILES="\
 db/builder.cc \

diff --git a/make_linux_jemalloc.sh b/make_linux_jemalloc.sh
@@ -6,7 +6,10 @@ cd `dirname $0`
 # 1. if gcc supports c++11 (4.8+), remove "-Dconstexpr= -Doverride="
 # 2. configure and make jemalloc, then put the result "lib/libjemalloc.a" and "lib/libjemalloc_pic.a" in this path
 
-if [ "$JAVA_HOME" = "" ]; then JAVA_HOME=/usr/java/default; fi
+if [ -z $JAVA_HOME ]; then JAVA_HOME=/usr/java/default; fi
+
+JAVA_VER=`$JAVA_HOME/bin/java -version 2>&1 | awk -F "[ \"]" '/version/{print $4}'`
+if [[ $JAVA_VER < 1.8 ]]; then echo 'ERROR: JDK 1.8 or later is required!'; exit 1; fi
 
 CORE_FILES="\
 db/builder.cc \

diff --git a/make_mac.sh b/make_mac.sh
@@ -2,6 +2,9 @@
 
 cd `dirname $0`
 
+# note:
+# 1. install JDK 8 or later and set $JAVA_INCLUDE if JDK is not in default path
+
 if [ "$JAVA_INCLUDE" = "" ]; then JAVA_INCLUDE=/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers; fi
 
 CORE_FILES="\