diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index c61186e..5951c03 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -26,8 +26,7 @@ jobs: cp target/j3-*.jar staging/J3/lib cp -r data/ staging/J3/data cp -r animations staging/J3/animations - cp package/README.md staging/J3 - cp package/win/j3.bat staging/J3 + cp package/* staging/J3 - name: Upload uses: actions/upload-artifact@v4 diff --git a/package/README.md b/package/README.md index 062e2a6..15a4dc6 100644 --- a/package/README.md +++ b/package/README.md @@ -1,14 +1,14 @@ # J3 - 3D Interactive Visualization in Java -## Usage - -### Prerequisites +## Prerequisites 1. Download and install Java 17+ 2. Download and install JavaFX SDK - https://gluonhq.com/products/javafx/ 3. Set the environment variables `JAVA_HOME` and `JAVAFX_HOME` -### Launch App +## Usage + +Either use the provided `j3` command to run the application or launch from the terminals with: ```bash diff --git a/package/debian/DEBIAN/control b/package/debian/DEBIAN/control deleted file mode 100644 index 8baa6fa..0000000 --- a/package/debian/DEBIAN/control +++ /dev/null @@ -1,10 +0,0 @@ -Package: J3 -Version: 1.0-1 -Section: base -Priority: optional -Architecture: i386 -Depends: openjdk-8-jre -Maintainer: David Hadka -Description: J3 - An open source, high-dimensional visualization program. -Installed-Size: 10240 diff --git a/package/debian/usr/local/bin/J3 b/package/debian/usr/local/bin/J3 deleted file mode 100755 index 06ae6c5..0000000 --- a/package/debian/usr/local/bin/J3 +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -java -cp "/usr/local/src/J3/lib/*" j3.GUI $@ diff --git a/package/debian/usr/local/src/J3/appicon.png b/package/debian/usr/local/src/J3/appicon.png deleted file mode 100644 index f1fb706..0000000 Binary files a/package/debian/usr/local/src/J3/appicon.png and /dev/null differ diff --git a/package/debian/usr/local/src/J3/bin/J3.sh b/package/debian/usr/local/src/J3/bin/J3.sh deleted file mode 100755 index 06ae6c5..0000000 --- a/package/debian/usr/local/src/J3/bin/J3.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -java -cp "/usr/local/src/J3/lib/*" j3.GUI $@ diff --git a/package/debian/usr/share/applications/J3.desktop b/package/debian/usr/share/applications/J3.desktop deleted file mode 100644 index 4b67260..0000000 --- a/package/debian/usr/share/applications/J3.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Version=1.0-1 -Name=J3 -Exec=/usr/local/src/J3/bin/J3.sh -Icon=/usr/local/src/J3/appicon.png -Terminal=false -Type=Application -Categories=Application;Science;Graphics diff --git a/package/j3 b/package/j3 new file mode 100644 index 0000000..ce716db --- /dev/null +++ b/package/j3 @@ -0,0 +1,8 @@ +#!/bin/bash + +if [ -z "${JAVAFX_HOME}" ]; then + echo "JAVAFX_HOME environment variable must be set!" + exit -1 +fi + +java --module-path ${JAVAFX_HOME}\lib --add-modules javafx.controls --class-path "lib/*" j3.GUI \ No newline at end of file diff --git a/package/win/j3.bat b/package/j3.bat similarity index 57% rename from package/win/j3.bat rename to package/j3.bat index e37c193..d5c78dd 100644 --- a/package/win/j3.bat +++ b/package/j3.bat @@ -1,3 +1,5 @@ @echo off +if not defined JAVAFX_HOME echo JAVAFX_HOME environment variable must be set! + java --module-path %JAVAFX_HOME%\lib --add-modules javafx.controls --class-path "lib/*" j3.GUI \ No newline at end of file diff --git a/package/mac/appicon.icns b/package/mac/appicon.icns deleted file mode 100644 index 0a91cf6..0000000 Binary files a/package/mac/appicon.icns and /dev/null differ diff --git a/package/mac/build.xml b/package/mac/build.xml deleted file mode 100644 index 6998e25..0000000 --- a/package/mac/build.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/package/mac/lib/appbundler-1.0.jar b/package/mac/lib/appbundler-1.0.jar deleted file mode 100644 index ef30f1c..0000000 Binary files a/package/mac/lib/appbundler-1.0.jar and /dev/null differ