Fixing headless wrapper for windows without JDK

gama-platform · May 8, 2022 · 071a2fd · 071a2fd
1 parent 583877c
commit 071a2fd
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/travis/jdk/win/gama-headless.bat b/travis/jdk/win/gama-headless.bat
@@ -47,5 +47,12 @@ FOR /F %%e in ('dir /b %FILENAME%') do (
 set "result=..\plugins\%result%"
 
 echo %result%
-::rem @echo off
-call ..\jdk\bin\java -cp !result! -Xms512m -Xmx%memory% -Djava.awt.headless=true org.eclipse.core.launcher.Main  -application msi.gama.headless.id4 -data "%workDir%" !param! 
+echo %JAVA_HOME%
+
+if exist ..\headless\ (
+	echo "JDK"
+	call ..\jdk\bin\java -cp !result! -Xms512m -Xmx%memory% -Djava.awt.headless=true org.eclipse.core.launcher.Main  -application msi.gama.headless.id4 -data "%workDir%" !param! 
+) else (
+	echo "JAVA_HOME"
+  	call "%JAVA_HOME%\java.exe" -cp !result! -Xms512m -Xmx%memory% -Djava.awt.headless=true org.eclipse.core.launcher.Main  -application msi.gama.headless.id4 -data "%workDir%" !param! 
+)
diff --git a/ummisco.gama.product/extraresources/headless/windows/gama-headless.bat b/ummisco.gama.product/extraresources/headless/windows/gama-headless.bat
@@ -47,5 +47,12 @@ FOR /F %%e in ('dir /b %FILENAME%') do (
 set "result=..\plugins\%result%"
 
 echo %result%
-::rem @echo off
-call ..\jdk\bin\java -cp !result! -Xms512m -Xmx%memory% -Djava.awt.headless=true org.eclipse.core.launcher.Main  -application msi.gama.headless.id4 -data "%workDir%" !param! 
+echo %JAVA_HOME%
+
+if exist ..\headless\ (
+	echo "JDK"
+	call ..\jdk\bin\java -cp !result! -Xms512m -Xmx%memory% -Djava.awt.headless=true org.eclipse.core.launcher.Main  -application msi.gama.headless.id4 -data "%workDir%" !param! 
+) else (
+	echo "JAVA_HOME"
+  	call "%JAVA_HOME%\java.exe" -cp !result! -Xms512m -Xmx%memory% -Djava.awt.headless=true org.eclipse.core.launcher.Main  -application msi.gama.headless.id4 -data "%workDir%" !param! 
+)