From 327ec8aa639ceab66b73f90bbffc0d8fca6ce49a Mon Sep 17 00:00:00 2001
From: Jakob Heher <jakob.heher@iaik.tugraz.at>
Date: Mon, 4 Apr 2022 14:37:48 +0200
Subject: add bundled JRE to windows

---
 pdf-over-gui/pom.xml                               | 46 +++++++++++-----------
 pdf-over-gui/src/main/resources/izpack/install.xml |  1 +
 2 files changed, 24 insertions(+), 23 deletions(-)

(limited to 'pdf-over-gui')

diff --git a/pdf-over-gui/pom.xml b/pdf-over-gui/pom.xml
index 5647098b..30be24b5 100644
--- a/pdf-over-gui/pom.xml
+++ b/pdf-over-gui/pom.xml
@@ -291,6 +291,24 @@
 							</resources>
 						</configuration>
 					</execution>
+					<execution>
+						<id>copy-jre</id>
+						<phase>package</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${staging.dir}/jre</outputDirectory>
+							<resources>
+								<resource>
+									<directory>${project.basedir}/../jre-bundles</directory>
+									<includes>
+										<include>${bundled-jre.archiveName}</include>
+									</includes>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
 				</executions>
 			</plugin>
 			<plugin>
@@ -318,9 +336,7 @@
 							<chdir>.</chdir>
 							<icon>src/main/resources/icons/icon.ico</icon>
 							<jre>
-								<path>%JAVA_HOME%;%PATH%</path> 
-								<bundledJreAsFallback>true</bundledJreAsFallback>
-								<minVersion>1.8.0</minVersion>
+								<path>jre/${bundled-jre.nameInArchive}</path> 
 							</jre>
 							<versionInfo>
 								<fileVersion>${version.exe}</fileVersion>
@@ -355,9 +371,7 @@
 							<chdir>.</chdir>
 							<icon>src/main/resources/icons/icon.ico</icon>
 							<jre>
-								<path>%JAVA_HOME%;%PATH%</path>
-								<bundledJreAsFallback>true</bundledJreAsFallback>
-								<minVersion>1.8.0</minVersion>
+								<path>jre/${bundled-jre.nameInArchive}</path> 
 							</jre>
 							<versionInfo>
 								<fileVersion>${version.exe}</fileVersion>
@@ -392,9 +406,7 @@
 							<chdir>.</chdir>
 							<icon>src/main/resources/icons/icon.ico</icon>
 							<jre>
-								<path>%JAVA_HOME%;%PATH%</path> 
-								<bundledJreAsFallback>true</bundledJreAsFallback>
-								<minVersion>1.8.0</minVersion>
+								<path>jre/${bundled-jre.nameInArchive}</path> 
 							</jre>
 							<versionInfo>
 								<fileVersion>${version.exe}</fileVersion>
@@ -476,29 +488,17 @@
 				<target.name>linux</target.name>
 			</properties>
 		</profile>
-		<profile>
-			<id>windows-64</id>
-			<activation>
-				<os>
-					<family>windows</family>
-					<arch>amd64</arch>
-				</os>
-			</activation>
-			<properties>
-				<swt.artifactId>org.eclipse.swt.win32.win32.x86_64</swt.artifactId>
-				<target.name>windows</target.name>
-			</properties>
-		</profile>
 		<profile>
 			<id>windows</id>
 			<activation>
 				<os>
 					<family>windows</family>
-					<arch>x86</arch>
 				</os>
 			</activation>
 			<properties>
 				<swt.artifactId>org.eclipse.swt.win32.win32.x86_64</swt.artifactId>
+				<bundled-jre.archiveName>OpenJDK11U-jre_x64_windows_hotspot_11.0.14.1_1</bundled-jre.archiveName>
+				<bundled-jre.nameInArchive>jdk-11.0.14.1+1-jre</bundled-jre.nameInArchive>
 				<target.name>windows</target.name>
 			</properties>
 		</profile>
diff --git a/pdf-over-gui/src/main/resources/izpack/install.xml b/pdf-over-gui/src/main/resources/izpack/install.xml
index 249ed00a..c8170bd4 100644
--- a/pdf-over-gui/src/main/resources/izpack/install.xml
+++ b/pdf-over-gui/src/main/resources/izpack/install.xml
@@ -61,6 +61,7 @@
 			<file src="scripts" targetdir="$INSTALL_PATH" />
 			<file src="icons" targetdir="$INSTALL_PATH" />
 			<file src="ReadMe.txt" targetdir="$INSTALL_PATH" />
+			<file src="jre/${bundled-jre.archiveName}" targetdir="$INSTALL_PATH/jre" os="windows" unpack="true" />
 			<file src="PDF-Over.exe" targetdir="$INSTALL_PATH" os="windows"/>
 			<file src="PDF-Over-cli.exe" targetdir="$INSTALL_PATH" os="windows"/>
 			<file src="Uninstaller.exe" targetdir="$INSTALL_PATH/Uninstaller" os="windows"/>
-- 
cgit v1.2.3