summaryrefslogtreecommitdiff
path: root/pdf-over-gui
diff options
context:
space:
mode:
authorJakob Heher <jakob.heher@iaik.tugraz.at>2022-05-04 15:12:36 +0200
committerJakob Heher <jakob.heher@iaik.tugraz.at>2022-05-04 15:12:36 +0200
commit9cb652eaab01f61711cb67554f0bfdfa8f6f841e (patch)
tree0877576a3540e1c3afbb40e71f5b50026888854c /pdf-over-gui
parent82b1931c5d236485ab14c1d80b66999757082ccd (diff)
downloadpdf-over-9cb652eaab01f61711cb67554f0bfdfa8f6f841e.tar.gz
pdf-over-9cb652eaab01f61711cb67554f0bfdfa8f6f841e.tar.bz2
pdf-over-9cb652eaab01f61711cb67554f0bfdfa8f6f841e.zip
bundle JRE on linux
Diffstat (limited to 'pdf-over-gui')
-rw-r--r--pdf-over-gui/pom.xml8
-rw-r--r--pdf-over-gui/src/main/resources/izpack-linux/install.xml3
-rw-r--r--pdf-over-gui/src/main/resources/scripts/pdf-over_linux.sh2
3 files changed, 12 insertions, 1 deletions
diff --git a/pdf-over-gui/pom.xml b/pdf-over-gui/pom.xml
index e615caec..5bcd6a78 100644
--- a/pdf-over-gui/pom.xml
+++ b/pdf-over-gui/pom.xml
@@ -486,6 +486,8 @@
</activation>
<properties>
<pdfover-build.swt-artifact-id>org.eclipse.swt.gtk.linux.x86_64</pdfover-build.swt-artifact-id>
+ <pdfover-build.bundled-jre.archive-filename>OpenJDK17U-jre_x64_linux_hotspot_17.0.3_7.tar.gz</pdfover-build.bundled-jre.archive-filename>
+ <pdfover-build.bundled-jre.folder-in-archive>jdk-17.0.3+7-jre</pdfover-build.bundled-jre.folder-in-archive>
<pdfover-build.os-name>linux</pdfover-build.os-name>
<pdfover-build.output-filename-without-jar>pdf-over_linux-x86_64</pdfover-build.output-filename-without-jar>
<pdfover-build.output-filename>${pdfover-build.output-filename-without-jar}.jar</pdfover-build.output-filename>
@@ -507,6 +509,12 @@
<outputDirectory>${pdfover-build.staging-dir}</outputDirectory>
<resources>
<resource>
+ <directory>${pdfover-build.root-dir}/jre-bundles</directory>
+ <includes>
+ <include>${pdfover-build.bundled-jre.archive-filename}</include>
+ </includes>
+ </resource>
+ <resource>
<directory>src/main/resources/izpack-linux</directory>
<excludes>
<exclude>*.xml</exclude>
diff --git a/pdf-over-gui/src/main/resources/izpack-linux/install.xml b/pdf-over-gui/src/main/resources/izpack-linux/install.xml
index 1e95e93a..8df8b3a7 100644
--- a/pdf-over-gui/src/main/resources/izpack-linux/install.xml
+++ b/pdf-over-gui/src/main/resources/izpack-linux/install.xml
@@ -58,6 +58,9 @@
<include name="lib/**" />
</updatecheck>
<fileset dir="lib" targetdir="$INSTALL_PATH/lib" />
+ <file src="${pdfover-build.bundled-jre.archive-filename}" targetdir="$INSTALL_PATH/jre" unpack="true">
+ <archivefileset dir="${pdfover-build.bundled-jre.folder-in-archive}" />
+ </file>
<file src="pdf-over_linux.sh" targetdir="$INSTALL_PATH" />
<file src="uninstall_linux.sh" targetdir="$INSTALL_PATH" />
<file src="icons" targetdir="$INSTALL_PATH" />
diff --git a/pdf-over-gui/src/main/resources/scripts/pdf-over_linux.sh b/pdf-over-gui/src/main/resources/scripts/pdf-over_linux.sh
index c79726df..6736aa15 100644
--- a/pdf-over-gui/src/main/resources/scripts/pdf-over_linux.sh
+++ b/pdf-over-gui/src/main/resources/scripts/pdf-over_linux.sh
@@ -1,3 +1,3 @@
#!/bin/sh
BASEDIR=`dirname $0`
-exec java -cp "$BASEDIR/lib/*" at.asit.pdfover.gui.Main "$@"
+exec $BASEDIR/jre/bin/java -cp "$BASEDIR/lib/*" at.asit.pdfover.gui.Main "$@"