Merge pull request #57 from CommonWealthRobotics/kh/java21

update CI to use java21

Author: madhephaestus

.github/workflows/release.yml

@@ -20,7 +20,7 @@ jobs:
 
     - name: start xvfb
       run:
-        Xvfb :99 &
+        Xvfb :0 &
 
     - name: initialize the X11 DISPLAY variable
       run:
@@ -30,16 +30,16 @@ jobs:
       run: pwd; ls -la        
 
     - name: Pull a JavaFX JDK
-      run: wget http://static.azul.com/zulu/bin/zulu8.33.0.1-ca-fx-jdk8.0.192-linux_x64.tar.gz
+      run: wget https://cdn.azul.com/zulu/bin/zulu21.46.19-ca-fx-jdk21.0.9-linux_x64.tar.gz
 
     - name: After JDK download, list directory contnts
       run: pwd; ls -la
 
     - name: Set Java
       uses: actions/setup-java@v1
       with:
-        java-version: 1.8
-        jdkFile: ./zulu8.33.0.1-ca-fx-jdk8.0.192-linux_x64.tar.gz
+        java-version: 21
+        jdkFile: zulu21.46.19-ca-fx-jdk21.0.9-linux_x64.tar.gz
     - name: Get the version
       id: get_version
       run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}   
@@ -49,7 +49,12 @@ jobs:
          echo $'app.name=BowlerScriptKernel' > src/main/resources/com/neuronrobotics/bowlerkernel/build.properties 
          echo "app.version=${{ steps.get_version.outputs.VERSION  }}" >> src/main/resources/com/neuronrobotics/bowlerkernel/build.properties
 
-                
+    - name: initialize the X11 DISPLAY variable
+      run:
+        export DISPLAY=:0
+    - name: Build/Test with Gradle 
+      run: xvfb-run -s '-screen 0 1024x768x24' ./gradlew test 
+                      
     - name: Build with Gradle 
       run: ./gradlew shadowJar
 

.github/workflows/verify.yml

@@ -34,30 +34,27 @@ jobs:
       run: |
           sudo apt update
           sudo apt install libgtk2.0-0
-    - name: initialize the X11 DISPLAY variable
-      run:
-        export DISPLAY=:0
+
           
     - name: Pull a JavaFX JDK
-      run: wget http://static.azul.com/zulu/bin/zulu8.78.0.19-ca-fx-jdk8.0.412-linux_x64.tar.gz
+      run: wget https://cdn.azul.com/zulu/bin/zulu21.46.19-ca-fx-jdk21.0.9-linux_x64.tar.gz
 
     - name: After JDK download, list directory contnts
       run: pwd; ls -la
 
     - name: Set Java
       uses: actions/setup-java@v1
       with:
-        java-version: 1.8
-        jdkFile: ./zulu8.78.0.19-ca-fx-jdk8.0.412-linux_x64.tar.gz
+        java-version: 21
+        jdkFile: zulu21.46.19-ca-fx-jdk21.0.9-linux_x64.tar.gz
+    - name: Shadow Jar 
+      run: ./gradlew  shadowJar        
+    - name: initialize the X11 DISPLAY variable
+      run:
+        export DISPLAY=:0
+    - name: Build/Test with Gradle 
+      run: xvfb-run -s '-screen 0 1024x768x24' ./gradlew test 
 
-     
-    - name: Build with Gradle 
-      run: ./gradlew shadowJar
-      
-    - name: Test with Gradle 
-      run: xvfb-run -s '-screen 0 1024x768x24' ./gradlew clean test
-
-         
     - name: Test Bezier 
       run:  xvfb-run -s '-screen 0 1024x768x24' java -Dprism.order=sw -Dprism.verbose=true -jar build/libs/bowler-kernel.jar -g https://gist.github.com/4aeeaa49bd3a807eed8f8ff3dea84c48.git  BezierEditorDemo.groovy 
     - name: start xvfb

JCSG

@@ -333,7 +333,22 @@ artifacts {
 	archives javadocJar, sourcesJar, jar
 }
 
+//test {
+//    testLogging.showExceptions = true
+//    testLogging.showCauses = true
+//}
 test {
-    testLogging.showExceptions = true
-    testLogging.showCauses = true
-}
+	testLogging {
+		// Show which test is running
+		events "passed", "skipped", "failed", "standardOut", "standardError"
+		
+		// Show standard out and error
+		showStandardStreams = true
+		
+		// Optional: show more details
+		exceptionFormat = "full"
+		showExceptions = true
+		showCauses = true
+		showStackTraces = true
+	}
+}

build.gradle

@@ -124,6 +124,12 @@ private static void loadHistoryLocal() {
 	}
 
 	private static void fail() {
+		try {
+			Thread.sleep(1000);
+		} catch (InterruptedException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
 		com.neuronrobotics.sdk.common.Log.error(
 				"Usage: \r\njava -jar BowlerScriptKernel.jar -s <file 1> .. <file n> # This will load one script after the next ");
 		com.neuronrobotics.sdk.common.Log.error(
@@ -200,7 +206,7 @@ public static void runArgumentsAfterStartup(String[] args, long startTime)
 		}
 
 		Object ret = null;
-		File baseWorkspaceFile = null;
+		File baseWorkspaceFile = new File(".").getAbsoluteFile();
 		if (gitRun && gitRepo != null) {
 			String url = null;
 
@@ -227,7 +233,7 @@ public static void runArgumentsAfterStartup(String[] args, long startTime)
 					url = gitRepo;
 					baseWorkspaceFile = ScriptingEngine.getRepositoryCloneDirectory(url);
 
-					processReturnedObjectsStart(ret, baseWorkspaceFile);
+					processReturnedObjectsStart(ret, baseWorkspaceFile,new File(".").getAbsoluteFile());
 				} catch (Throwable e) {
 					Log.error(e);
 					fail();
@@ -280,7 +286,7 @@ public static void runArgumentsAfterStartup(String[] args, long startTime)
 			}
 		}
 		if (startLoadingScripts) {
-			processReturnedObjectsStart(ret, baseWorkspaceFile);
+			processReturnedObjectsStart(ret, baseWorkspaceFile,new File(".").getAbsoluteFile());
 			startLoadingScripts = false;
 			finish(startTime);
 			return;
@@ -301,7 +307,7 @@ public static void runArgumentsAfterStartup(String[] args, long startTime)
 			}
 		}
 		if (startLoadingScripts) {
-			processReturnedObjectsStart(ret, new File("."));
+			processReturnedObjectsStart(ret, new File(".").getAbsoluteFile(),new File(".").getAbsoluteFile());
 			finish(startTime);
 			return;
 		}
@@ -403,7 +409,7 @@ public void run() {
 					if (ret != null) {
 						com.neuronrobotics.sdk.common.Log.error(ret);
 					}
-					processReturnedObjectsStart(ret, null);
+					processReturnedObjectsStart(ret, null,new File(".").getAbsoluteFile());
 				} catch (Throwable e) {
 					Log.error(e);
 				} 
@@ -448,12 +454,13 @@ private static void finish(long startTime) {
 		System.exit(0);
 	}
 
-	public static void processReturnedObjectsStart(Object ret, File baseWorkspaceFile) {
-		CSG.setPreventNonManifoldTriangles(true);
+	public static void processReturnedObjectsStart(Object ret, File baseWorkspaceFile, File target) {
 		processUIOpening(ret);
 		if (baseWorkspaceFile != null)
-			com.neuronrobotics.sdk.common.Log.debug("Processing file in directory " + baseWorkspaceFile.getAbsolutePath());
-
+			com.neuronrobotics.sdk.common.Log.debug("Processing file in directory: \n   " + baseWorkspaceFile.getAbsolutePath()+" \nto "+target.getAbsolutePath());
+		File baseDirForTarget = new File(target.getAbsolutePath() + "/manufacturing/");
+		if(!baseDirForTarget.exists())
+			baseDirForTarget.mkdirs();
 		if (baseWorkspaceFile != null) {
 
 			File baseDirForFiles = new File(baseWorkspaceFile.getAbsolutePath() + "/manufacturing/");
@@ -464,7 +471,7 @@ public static void processReturnedObjectsStart(Object ret, File baseWorkspaceFil
 				if (bomCSV.exists()) {
 
 					File file = new File(
-							baseWorkspaceFile.getAbsolutePath() + "/" + VitaminBomManager.getManufacturingBomCsv());
+							baseDirForTarget.getAbsolutePath() + "/" + VitaminBomManager.getManufacturingBomCsv());
 //					if (file.exists())
 //						file.delete();
 					try {
@@ -478,7 +485,7 @@ public static void processReturnedObjectsStart(Object ret, File baseWorkspaceFil
 						baseWorkspaceFile.getAbsolutePath() + "/" + VitaminBomManager.getManufacturingBomJson());
 				if (bom.exists()) {
 					File file = new File(
-							baseWorkspaceFile.getAbsolutePath() + "/" + VitaminBomManager.getManufacturingBomJson());
+							baseDirForTarget.getAbsolutePath() + "/" + VitaminBomManager.getManufacturingBomJson());
 //					if (file.exists())
 //						file.delete();
 					try {
@@ -488,8 +495,6 @@ public static void processReturnedObjectsStart(Object ret, File baseWorkspaceFil
 						Log.error(e);
 					}
 				}
-			} else {
-				baseDirForFiles.mkdirs();
 			}
 		}
 		ArrayList<CSG> csgBits = new ArrayList<>();
@@ -503,7 +508,7 @@ public static void processReturnedObjectsStart(Object ret, File baseWorkspaceFil
 			else {
 				com.neuronrobotics.sdk.common.Log.error("Exporting files without print bed");
 			}
-			new CadFileExporter().generateManufacturingParts(csgBits, baseWorkspaceFile);
+			new CadFileExporter().generateManufacturingParts(csgBits, baseDirForTarget);
 		} catch (Throwable t) {
 			Log.error(t);
 			fail();
@@ -615,6 +620,12 @@ public void setAllCSG(Collection<CSG> toAdd, File source) {
 				@Override
 				public void highlightException(File fileEngineRunByName, Throwable ex) {
 					Log.error(ex);
+					try {
+						Thread.sleep(1000);
+					} catch (InterruptedException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
 					fail();
 				}
 

src/main/java/com/neuronrobotics/bowlerstudio/BowlerKernel.java

@@ -70,6 +70,10 @@ private Object inline(String codeIn, ArrayList<Object> args, CSGDatabaseInstance
 			code=code.replace("inlineScriptRun(", "inlineScriptRun(csgdb,");
 			code=code.replace("inlineScriptStringRun(", "inlineScriptStringRun(csgdb,");
 			code=code.replace("gitScriptRun(", "gitScriptRun(((eu.mihosoft.vrl.v3d.parametrics.CSGDatabaseInstance)csgdb),");
+			//getVitaminsDisplay(
+			code=code.replace("getVitaminsDisplay(", "getVitaminsDisplay(csgdb,");
+			code=code.replace("getVitamins(", "getVitamins(csgdb,");
+
 		}
 
 		Script script;