diff options
| author | Andrei Belov <defan@nginx.com> | 2020-02-06 18:25:25 +0300 |
|---|---|---|
| committer | Andrei Belov <defan@nginx.com> | 2020-02-06 18:25:25 +0300 |
| commit | 2dc01938cf02cc05b41a09e618f712129c4cdf91 (patch) | |
| tree | 556dd40a0ec8c194774d53eed9ff62ed1d25ee7c /auto/modules/java | |
| parent | 477a58e14010ab14d6ab453860b360cf806f5012 (diff) | |
| parent | 6e19090736612b39d4c5d0836d7df0722b8955e7 (diff) | |
| download | unit-2dc01938cf02cc05b41a09e618f712129c4cdf91.tar.gz unit-2dc01938cf02cc05b41a09e618f712129c4cdf91.tar.bz2 | |
Merged with the default branch.1.15.0-1
Diffstat (limited to 'auto/modules/java')
| -rw-r--r-- | auto/modules/java | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/auto/modules/java b/auto/modules/java index b0fd62f1..68b10836 100644 --- a/auto/modules/java +++ b/auto/modules/java @@ -5,7 +5,7 @@ shift NXT_JAVA_HOME=${JAVA_HOME-} -NXT_JAR_REPO=http://central.maven.org/maven2/ +NXT_JAR_REPO=https://repo1.maven.org/maven2/ NXT_JAR_LOCAL_REPO=$HOME/.m2/repository/ for nxt_option; do @@ -22,6 +22,7 @@ for nxt_option; do --lib-path=*) NXT_JAVA_LIB_PATH="$value" ;; --repo=*) NXT_JAR_REPO="$value" ;; --local-repo=*) NXT_JAR_LOCAL_REPO="$value" ;; + --sha512=*) NXT_SHA512_TOOL="$value" ;; --jars=*) NXT_JARS="$value" ;; --help) @@ -34,6 +35,7 @@ for nxt_option; do default: "$NXT_JAR_REPO" --local-repo=DIR set local repository directory default: "$NXT_JAR_LOCAL_REPO" + --sha512=SHA512 set command for SHA512 check --jars=DIR set jars install/search directory END @@ -82,11 +84,12 @@ if [ -n "${NXT_JAVA_HOME}" ]; then NXT_JAVA="${NXT_JAVA_HOME}/bin/java" else - $echo -n "checking for java executable" + $echo -n "checking for java executable ..." $echo "checking for java executable ..." >> $NXT_AUTOCONF_ERR NXT_JAVA=`which java || :` if [ -z "$NXT_JAVA" -o ! -x "$NXT_JAVA" ]; then + $echo " not found" $echo $echo $0: error: java executable not found. $echo @@ -98,11 +101,12 @@ else "$NXT_JAVA" -version - $echo -n "checking java.home" + $echo -n "checking java.home ..." $echo "checking java.home ..." >> $NXT_AUTOCONF_ERR NXT_JAVA_HOME=`$NXT_JAVA -XshowSettings 2>&1 | grep -F -e java.home | sed -e 's/^.*= //'` if [ -z "$NXT_JAVA_HOME" ]; then + $echo " not found" $echo $echo $0: error: java.home not found. $echo @@ -147,10 +151,11 @@ case "$NXT_SYSTEM" in esac if [ -z "$NXT_JAVA_LIB_PATH" ]; then - $echo -n "checking library path" + $echo -n "checking library path ..." $echo "checking library path ..." >> $NXT_AUTOCONF_ERR if [ ! -x "$NXT_JAVA" ]; then + $echo " not found" $echo $echo $0: error: java executable not found. $echo @@ -160,6 +165,7 @@ if [ -z "$NXT_JAVA_LIB_PATH" ]; then NXT_JAVA_LIB_PATH=`$NXT_JAVA -XshowSettings 2>&1 | grep -F -e sun.boot.library.path | sed -e 's/^.*= //'` if [ -z "$NXT_JAVA_LIB_PATH" ]; then + $echo " not found" $echo $echo $0: error: library path not found. $echo |