From: Bill Erickson <berickxx@gmail.com>
Date: Wed, 27 Feb 2019 16:29:16 +0000 (-0500)
Subject: LP1741299 hatch.bat uses local jdk-11 bundles
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=ad3cc97afcb40fb3a5c962e43d2d616c60cd09fd;p=working%2FHatch.git

LP1741299 hatch.bat uses local jdk-11 bundles

Signed-off-by: Bill Erickson <berickxx@gmail.com>
---

diff --git a/hatch.bat b/hatch.bat
index dd76b2e151..826a2b241d 100755
--- a/hatch.bat
+++ b/hatch.bat
@@ -8,15 +8,18 @@ REM This is necessary to do sensible comparisons against it. (such as EQU) The '
 REM Also: automatic path testing only looks for 'java' - if you don't have the JDK in your path you'll need to fix that yourself.
 
 REM Assume java executables are in our path
-SET JAVA=java
-SET JAVAC=javac
-SET JAR=jar
+REM SET JAVA=java
+REM SET JAVAC=javac
+REM SET JAR=jar
 
 REM Optionally override the java path
-REM SET JAVA_HOME="C:\Program Files\Java\jdk1.8.0_111"
-REM SET JAVA=%JAVA_HOME%\bin\java
-REM SET JAVAC=%JAVA_HOME%\bin\javac
-REM SET JAR=%JAVA_HOME%\bin\jar
+SET JAVA_HOME=jdk-11
+SET JAVA=%JAVA_HOME%\bin\java
+SET JAVAC=%JAVA_HOME%\bin\javac
+SET JAR=%JAVA_HOME%\bin\jar
+SET JAVAFX_HOME=javafx-sdk-11
+SET JAVAFX_MODS=javafx.base,javafx.graphics,javafx.web
+
 
 REM Is anyone there?
 %JAVA% -version 2>nul
@@ -43,6 +46,7 @@ REM Specifically, "Files was unexpected at this time."
 IF "%~1" == "compile" (
 
     %JAVAC% -cp "lib\*" -Xdiags:verbose^
+        --module-path %JAVAFX_HOME%\lib --add-modules=%JAVAFX_MODS%^
         -d lib src\org\evergreen_ils\hatch\*.java
 
     %JAR% cf lib\hatch.jar -C lib org
@@ -54,16 +58,20 @@ IF "%~1" == "compile" (
 
         %JAVA% -cp "lib\*"^
             -Djava.util.logging.config.file=logging.properties^
+            --module-path %JAVAFX_HOME%\lib --add-modules=%JAVAFX_MODS%^
             org.evergreen_ils.hatch.TestHatch | %JAVA% -cp "lib\*"^
             -Djava.util.logging.config.file=logging.properties^
+            --module-path %JAVAFX_HOME%\lib --add-modules=%JAVAFX_MODS%^
             org.evergreen_ils.hatch.Hatch | %JAVA% -cp "lib\*"^
             -Djava.util.logging.config.file=logging.properties^
+            --module-path %JAVAFX_HOME%\lib --add-modules=%JAVAFX_MODS%^
             org.evergreen_ils.hatch.TestHatch receive
 
     ) ELSE ( REM No options means run Hatch
 
         %JAVA% -cp "lib\*"^
             -Djava.util.logging.config.file=logging.properties^
+            --module-path %JAVAFX_HOME%\lib --add-modules=%JAVAFX_MODS%^
             org.evergreen_ils.hatch.Hatch
 
     )