From 4defb7d3a0a32354f76ff10fe24e40f03f741e8c Mon Sep 17 00:00:00 2001 From: Nathan McRae Date: Mon, 27 Jan 2025 14:49:25 -0800 Subject: [PATCH] Split build script into build and run So run can be invoked by task manager as a stop-gap launch method --- src/main/java/build.ps1 | 14 ++++++++++++-- src/main/java/run.ps1 | 16 ++++++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 src/main/java/run.ps1 diff --git a/src/main/java/build.ps1 b/src/main/java/build.ps1 index f5a439a..c7a1702 100644 --- a/src/main/java/build.ps1 +++ b/src/main/java/build.ps1 @@ -1,6 +1,16 @@ $Env:JAVA_HOME = "C:\Users\nathanm\Downloads\openjdk-23.0.1_windows-x64_bin\jdk-23.0.1" $Env:PATH = "C:\Users\nathanm\Downloads\openjdk-23.0.1_windows-x64_bin\jdk-23.0.1\bin;$($Env:PATH)" $Env:PATH_TO_FX="C:\Users\nathanm\Downloads\openjfx-23.0.1_windows-x64_bin-sdk\javafx-sdk-23.0.1\lib" -javac --module-path "$Env:PATH_TO_FX;P:\personal_root\projects\number-station\lib" --add-modules javafx.controls,javafx.fxml,com.fasterxml.jackson.annotation,com.fasterxml.jackson.core,com.fasterxml.jackson.dataformat.xml,com.fasterxml.jackson.datatype.jsr310,org.apache.commons.cli .\name\nathanmcrae\numbersstation\*.java -d out +$modulePath = "$Env:PATH_TO_FX;P:\personal_root\projects\number-station\lib" +$modules = $( + "com.fasterxml.jackson.annotation", + "com.fasterxml.jackson.core", + "com.fasterxml.jackson.dataformat.xml", + "com.fasterxml.jackson.datatype.jsr310", + "javafx.controls", + "javafx.fxml", + "org.apache.commons.cli" +) +$addModules = $modules -join "," +javac --module-path $modulePath --add-modules $addModules .\name\nathanmcrae\numbersstation\*.java -d out cp name/nathanmcrae/numbersstation/*.fxml out/name/nathanmcrae/numbersstation -java --module-path "$Env:PATH_TO_FX;P:\personal_root\projects\number-station\lib" --add-modules javafx.controls,javafx.fxml,com.fasterxml.jackson.annotation,com.fasterxml.jackson.core,com.fasterxml.jackson.dataformat.xml,com.fasterxml.jackson.datatype.jsr310,org.apache.commons.cli -cp out name.nathanmcrae.numbersstation.Main @args diff --git a/src/main/java/run.ps1 b/src/main/java/run.ps1 new file mode 100644 index 0000000..8d67782 --- /dev/null +++ b/src/main/java/run.ps1 @@ -0,0 +1,16 @@ +cd $PSScriptRoot +$Env:JAVA_HOME = "C:\Users\nathanm\Downloads\openjdk-23.0.1_windows-x64_bin\jdk-23.0.1" +$Env:PATH = "C:\Users\nathanm\Downloads\openjdk-23.0.1_windows-x64_bin\jdk-23.0.1\bin;$($Env:PATH)" +$Env:PATH_TO_FX="C:\Users\nathanm\Downloads\openjfx-23.0.1_windows-x64_bin-sdk\javafx-sdk-23.0.1\lib" +$modulePath = "$Env:PATH_TO_FX;P:\personal_root\projects\number-station\lib" +$modules = $( + "com.fasterxml.jackson.annotation", + "com.fasterxml.jackson.core", + "com.fasterxml.jackson.dataformat.xml", + "com.fasterxml.jackson.datatype.jsr310", + "javafx.controls", + "javafx.fxml", + "org.apache.commons.cli" +) +$addModules = $modules -join "," +java --module-path $modulePath --add-modules $addModules -cp out name.nathanmcrae.numbersstation.Main @args