From f9e9a876186ba7d75adc0bd3a1d31a4a9b570cfc Mon Sep 17 00:00:00 2001
From: Jakob Heher <jakob.heher@iaik.tugraz.at>
Date: Mon, 2 May 2022 18:28:32 +0200
Subject: swap run order of build-archive and bundle-jre

(fix a bug for mac builds)
---
 pdf-over-gui/pom.xml | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'pdf-over-gui')

diff --git a/pdf-over-gui/pom.xml b/pdf-over-gui/pom.xml
index 2d50acc3..b7afb3eb 100644
--- a/pdf-over-gui/pom.xml
+++ b/pdf-over-gui/pom.xml
@@ -238,28 +238,29 @@
 				<version>1.2</version>
 				<executions>
 					<execution>
-						<id>extract-jre</id>
-						<phase>package</phase> <!-- linux profile: none -->
+						<id>build-archive</id>
+						<phase>install</phase> <!-- linux profile: none -->
 						<goals>
 							<goal>copy</goal>
 						</goals>
 						<configuration>
 							<fileset>
-								<directory>${project.basedir}/../jre-bundles/${pdfover-build.bundled-jre.archive-filename}/${pdfover-build.bundled-jre.folder-in-archive}</directory>
-								<outputDirectory>${pdfover-build.output-dir}/${pdfover-build.output-filename}/jre</outputDirectory>
+								<directory>${pdfover-build.staging-dir}</directory>
+								<outputDirectory>${pdfover-build.output-dir}/${pdfover-build.output-filename}/</outputDirectory>
 							</fileset>
 						</configuration>
 					</execution>
 					<execution>
-						<id>build-archive</id>
+						<!-- this has to run strictly after build-archive; otherwise, the jre subfolder will be cleaned for .tar.gz (mac build) -->
+						<id>bundle-jre</id>
 						<phase>install</phase> <!-- linux profile: none -->
 						<goals>
 							<goal>copy</goal>
 						</goals>
 						<configuration>
 							<fileset>
-								<directory>${pdfover-build.staging-dir}</directory>
-								<outputDirectory>${pdfover-build.output-dir}/${pdfover-build.output-filename}/</outputDirectory>
+								<directory>${project.basedir}/../jre-bundles/${pdfover-build.bundled-jre.archive-filename}/${pdfover-build.bundled-jre.folder-in-archive}</directory>
+								<outputDirectory>${pdfover-build.output-dir}/${pdfover-build.output-filename}/jre</outputDirectory>
 							</fileset>
 						</configuration>
 					</execution>
@@ -542,7 +543,7 @@
 						<version>1.2</version>
 						<executions>
 							<execution>
-								<id>extract-jre</id>
+								<id>bundle-jre</id>
 								<phase>none</phase>
 							</execution>
 							<execution>
-- 
cgit v1.2.3