From fd60bd9b685d06a2367d07852ebdfd3ae8a4f0d5 Mon Sep 17 00:00:00 2001
From: Jakob Heher <jakob.heher@iaik.tugraz.at>
Date: Mon, 2 May 2022 15:29:16 +0200
Subject: fix some zip paths

---
 pdf-over-gui/pom.xml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'pdf-over-gui')

diff --git a/pdf-over-gui/pom.xml b/pdf-over-gui/pom.xml
index 26ca8bd9..2d50acc3 100644
--- a/pdf-over-gui/pom.xml
+++ b/pdf-over-gui/pom.xml
@@ -383,7 +383,8 @@
 							<chdir>.</chdir>
 							<icon>src/main/resources/icons/icon.ico</icon>
 							<jre>
-								<path>jre</path> 
+								<path>jre</path>
+								<bundledJre64Bit>true</bundledJre64Bit>
 							</jre>
 							<versionInfo>
 								<fileVersion>${version.exe}</fileVersion>
@@ -418,7 +419,7 @@
 							<chdir>.</chdir>
 							<icon>src/main/resources/icons/icon.ico</icon>
 							<jre>
-								<path>jre/${pdfover-build.bundled-jre.folder-in-archive}</path> 
+								<path>jre</path> 
 							</jre>
 							<versionInfo>
 								<fileVersion>${version.exe}</fileVersion>
@@ -453,7 +454,7 @@
 							<chdir>.</chdir>
 							<icon>src/main/resources/icons/icon.ico</icon>
 							<jre>
-								<path>jre/${pdfover-build.bundled-jre.folder-in-archive}</path>
+								<path>jre</path>
 							</jre>
 							<versionInfo>
 								<fileVersion>${version.exe}</fileVersion>
@@ -656,7 +657,7 @@
 			<properties>
 				<pdfover-build.swt-artifact-id>org.eclipse.swt.cocoa.macosx.x86_64</pdfover-build.swt-artifact-id>
 				<pdfover-build.bundled-jre.archive-filename>OpenJDK17U-jre_x64_mac_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.bundled-jre.folder-in-archive>jdk-17.0.3+7-jre/Contents/Home</pdfover-build.bundled-jre.folder-in-archive>
 				<pdfover-build.target-name>mac</pdfover-build.target-name>
 				<pdfover-build.output-filename>pdf-over_mac-x86_64.tar.gz</pdfover-build.output-filename>
 			</properties>
@@ -676,7 +677,7 @@
 			<properties>
 				<pdfover-build.swt-artifact-id>org.eclipse.swt.cocoa.macosx.aarch64</pdfover-build.swt-artifact-id>
 				<pdfover-build.bundled-jre.archive-filename>OpenJDK17U-jre_aarch64_mac_hotspot_17.0.2_8.tar.gz</pdfover-build.bundled-jre.archive-filename>
-				<pdfover-build.bundled-jre.folder-in-archive>jdk-17.0.2+8-jre</pdfover-build.bundled-jre.folder-in-archive>
+				<pdfover-build.bundled-jre.folder-in-archive>jdk-17.0.2+8-jre/Contents/Home</pdfover-build.bundled-jre.folder-in-archive>
 				<pdfover-build.target-name>mac-aarch64</pdfover-build.target-name>
 				<pdfover-build.output-filename>pdf-over_mac-aarch64.tar.gz</pdfover-build.output-filename>
 			</properties>
-- 
cgit v1.2.3