Port bootclasspath/verify changes to lein-pkg and lein-sdkman.
[skip ci]
This commit is contained in:
parent
f50add4f90
commit
f24c4e1068
2 changed files with 8 additions and 6 deletions
|
@ -35,7 +35,7 @@ for f in "/etc/leinrc" "$LEIN_HOME/leinrc" ".leinrc"; do
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
export LEIN_JVM_OPTS="${LEIN_JVM_OPTS-"-XX:+TieredCompilation -XX:TieredStopAtLevel=1"}"
|
export LEIN_JVM_OPTS="${LEIN_JVM_OPTS-"-Xverify:none -XX:+TieredCompilation -XX:TieredStopAtLevel=1"}"
|
||||||
|
|
||||||
grep -E -q '^\s*:eval-in\s+:classloader\s*$' project.clj 2> /dev/null &&
|
grep -E -q '^\s*:eval-in\s+:classloader\s*$' project.clj 2> /dev/null &&
|
||||||
LEIN_JVM_OPTS="${LEIN_JVM_OPTS:-'-Xms64m -Xmx512m'}"
|
LEIN_JVM_OPTS="${LEIN_JVM_OPTS:-'-Xms64m -Xmx512m'}"
|
||||||
|
@ -50,7 +50,9 @@ if ! { [ "$1" = "compile" ] &&
|
||||||
grep -qsE 'defproject leiningen[[:space:]]+"[[:digit:].]+"' \
|
grep -qsE 'defproject leiningen[[:space:]]+"[[:digit:].]+"' \
|
||||||
project.clj ;}; then
|
project.clj ;}; then
|
||||||
CLASSPATH="$CLASSPATH":"$LEIN_JAR"
|
CLASSPATH="$CLASSPATH":"$LEIN_JAR"
|
||||||
BOOTCLASSPATH="-Xbootclasspath/a:$LEIN_JAR"
|
if [ "$LEIN_USE_BOOTCLASSPATH" != "" ]; then
|
||||||
|
LEIN_JVM_OPTS="-Xbootclasspath/a:$LEIN_JAR $LEIN_JVM_OPTS"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# apply context specific CLASSPATH entries
|
# apply context specific CLASSPATH entries
|
||||||
|
@ -117,7 +119,6 @@ if [ "$INPUT_CHECKSUM" != "" ] && [ -r "$TRAMPOLINE_FILE" ]; then
|
||||||
else
|
else
|
||||||
export TRAMPOLINE_FILE
|
export TRAMPOLINE_FILE
|
||||||
"$LEIN_JAVA_CMD" \
|
"$LEIN_JAVA_CMD" \
|
||||||
"${BOOTCLASSPATH[@]}" \
|
|
||||||
-Dfile.encoding=UTF-8 \
|
-Dfile.encoding=UTF-8 \
|
||||||
-Dmaven.wagon.http.ssl.easy=false \
|
-Dmaven.wagon.http.ssl.easy=false \
|
||||||
-Dmaven.wagon.rto=10000 \
|
-Dmaven.wagon.rto=10000 \
|
||||||
|
|
|
@ -99,7 +99,7 @@ LEIN_JAR="$(dirname "$BIN_DIR")/lib/leiningen-$LEIN_VERSION-standalone.jar"
|
||||||
## echo $LEIN_JAR
|
## echo $LEIN_JAR
|
||||||
## exit 1
|
## exit 1
|
||||||
|
|
||||||
export LEIN_JVM_OPTS="${LEIN_JVM_OPTS-"-XX:+TieredCompilation -XX:TieredStopAtLevel=1"}"
|
export LEIN_JVM_OPTS="${LEIN_JVM_OPTS-"-Xverify:none -XX:+TieredCompilation -XX:TieredStopAtLevel=1"}"
|
||||||
|
|
||||||
# When :eval-in :classloader we need more memory
|
# When :eval-in :classloader we need more memory
|
||||||
grep -E -q '^\s*:eval-in\s+:classloader\s*$' project.clj 2> /dev/null && \
|
grep -E -q '^\s*:eval-in\s+:classloader\s*$' project.clj 2> /dev/null && \
|
||||||
|
@ -107,7 +107,9 @@ grep -E -q '^\s*:eval-in\s+:classloader\s*$' project.clj 2> /dev/null && \
|
||||||
|
|
||||||
add_path CLASSPATH "$LEIN_JAR"
|
add_path CLASSPATH "$LEIN_JAR"
|
||||||
|
|
||||||
BOOTCLASSPATH="-Xbootclasspath/a:$LEIN_JAR"
|
if [ "$LEIN_USE_BOOTCLASSPATH" != "" ]; then
|
||||||
|
LEIN_JVM_OPTS="-Xbootclasspath/a:$LEIN_JAR $LEIN_JVM_OPTS"
|
||||||
|
fi
|
||||||
|
|
||||||
if [ ! -x "$JAVA_CMD" ] && ! type -f java >/dev/null
|
if [ ! -x "$JAVA_CMD" ] && ! type -f java >/dev/null
|
||||||
then
|
then
|
||||||
|
@ -193,7 +195,6 @@ if [ "$INPUT_CHECKSUM" != "" ] && [ -r "$TRAMPOLINE_FILE" ]; then
|
||||||
else
|
else
|
||||||
export TRAMPOLINE_FILE
|
export TRAMPOLINE_FILE
|
||||||
"$LEIN_JAVA_CMD" \
|
"$LEIN_JAVA_CMD" \
|
||||||
"${BOOTCLASSPATH[@]}" \
|
|
||||||
-Dfile.encoding=UTF-8 \
|
-Dfile.encoding=UTF-8 \
|
||||||
-Dmaven.wagon.http.ssl.easy=false \
|
-Dmaven.wagon.http.ssl.easy=false \
|
||||||
-Dmaven.wagon.rto=10000 \
|
-Dmaven.wagon.rto=10000 \
|
||||||
|
|
Loading…
Reference in a new issue