Browse Source

[skip ci] fix wrong logic to determine linkable runtime image in local build scripts

Armin Schrenk 1 month ago
parent
commit
ef54b685f6
3 changed files with 3 additions and 3 deletions
  1. 1 1
      dist/linux/appimage/build.sh
  2. 1 1
      dist/mac/dmg/build.sh
  3. 1 1
      dist/win/build.ps1

+ 1 - 1
dist/linux/appimage/build.sh

@@ -54,7 +54,7 @@ fi
 # create runtime
 ## check for JEP 493
 JMOD_PATHS="openjfx-jmods"
-if $(${JAVA_HOME}/bin/jlink --help | grep -q "Linking from run-time image enabled"); then
+if ! $(${JAVA_HOME}/bin/jlink --help | grep -q "Linking from run-time image enabled"); then
     JMOD_PATHS="${JAVA_HOME}/jmods:${JMOD_PATHS}"
 fi
 ## create runtime image

+ 1 - 1
dist/mac/dmg/build.sh

@@ -78,7 +78,7 @@ cp ../../../target/${MAIN_JAR_GLOB} ../../../target/mods
 # create runtime
 ## check for JEP 493
 JMOD_PATHS="openjfx-jmods"
-if $(${JAVA_HOME}/bin/jlink --help | grep -q "Linking from run-time image enabled"); then
+if ! $(${JAVA_HOME}/bin/jlink --help | grep -q "Linking from run-time image enabled"); then
     JMOD_PATHS="${JAVA_HOME}/jmods:${JMOD_PATHS}"
 fi
 ## create custom runtime

+ 1 - 1
dist/win/build.ps1

@@ -91,7 +91,7 @@ Move-Item -Force -Path ".\resources\javafx-jmods-*" -Destination ".\resources\ja
 ## create custom runtime
 ### check for JEP 493
 $jmodPaths="$buildDir/resources/javafx-jmods";
-if ((& "$Env:JAVA_HOME\bin\jlink" --help | Select-String -Pattern "Linking from run-time image enabled" -SimpleMatch | Measure-Object).Count -gt 0 ) {
+if ((& "$Env:JAVA_HOME\bin\jlink" --help | Select-String -Pattern "Linking from run-time image enabled" -SimpleMatch | Measure-Object).Count -eq 0 ) {
 	$jmodPaths="$Env:JAVA_HOME/jmods;" + $jmodPaths;
 }
 ### create runtime