public/warp4j
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

Feature: Remove jvm-impl choice since Adoptium only offers hotspot impl #6

Merged
David merged 1 commits from feature/remove_jvm_impl_choice into develop 2024-05-12 08:51:50 +02:00
Conversation 0 Commits 1 Files Changed 1 +1 -16
1 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
warp4j
View File

@ -37,8 +37,6 @@ function print_help {
echo ' --windows create binary for Windows' echo ' --windows create binary for Windows'
echo ' if no targets are specified then binaries for' echo ' if no targets are specified then binaries for'
echo ' all targets are created' echo ' all targets are created'
echo ' --jvm-impl jvm implementation: hotspot or openj9'
echo ' (default: hotspot)'
echo ' --jvm-options <options>' echo ' --jvm-options <options>'
echo ' passed to java like this:' echo ' passed to java like this:'
echo ' "java <options> -jar <jar file>";' echo ' "java <options> -jar <jar file>";'
@ -147,10 +145,6 @@ while [[ $# -gt 0 ]]; do
TARGETS+=($WIN) TARGETS+=($WIN)
shift shift
;; ;;
--jvm-impl)
JVM_IMPL="$2"
shift 2
;;
--jvm-options) --jvm-options)
JVM_OPTIONS="$2" JVM_OPTIONS="$2"
shift 2 shift 2
@ -231,22 +225,13 @@ if [[ $JAVA_VERSION ]] && ! java_version_is_correct $JAVA_VERSION ; then
fail_with "JDK version \"$JAVA_VERSION\" is not correct" fail_with "JDK version \"$JAVA_VERSION\" is not correct"
fi fi
JVM_IMPL_HOTSPOT=hotspot JVM_IMPL=hotspot
JVM_IMPL_OPENJ9=openj9
# validate jvm implementation
if [[ $JVM_IMPL ]] &&
[[ $JVM_IMPL != $JVM_IMPL_HOTSPOT ]] &&
[[ $JVM_IMPL != $JVM_IMPL_OPENJ9 ]]; then
fail_with "jvm implementation \"$JVM_IMPL\" is not correct"
fi
LATEST_LTS=17 # latest LTS java branch LATEST_LTS=17 # latest LTS java branch
# default options # default options
test -z $JAVA_VERSION && JAVA_VERSION=$LATEST_LTS test -z $JAVA_VERSION && JAVA_VERSION=$LATEST_LTS
test -z $TARGETS && TARGETS=($LIN $MAC $WIN) test -z $TARGETS && TARGETS=($LIN $MAC $WIN)
test -z $JVM_IMPL && JVM_IMPL=$JVM_IMPL_HOTSPOT
# returns java branch version # returns java branch version
function get_base_version() { function get_base_version() {