From 0953f7cde8a2c09850f398790adc983ebf7f1b8b Mon Sep 17 00:00:00 2001
From: Jakob Heher <jakob.heher@iaik.tugraz.at>
Date: Tue, 22 Mar 2022 13:52:29 +0100
Subject: sanitize swt handling

---
 pdf-over-gui/pom.xml | 60 ++++++++++++----------------------------------------
 1 file changed, 13 insertions(+), 47 deletions(-)

(limited to 'pdf-over-gui/pom.xml')

diff --git a/pdf-over-gui/pom.xml b/pdf-over-gui/pom.xml
index 4815382e..62cbe410 100644
--- a/pdf-over-gui/pom.xml
+++ b/pdf-over-gui/pom.xml
@@ -173,30 +173,12 @@
 							<artifactItems>
 								<artifactItem>
 									<groupId>org.eclipse.swt</groupId>
-									<artifactId>${swt.artifactId.64}</artifactId>
+									<artifactId>${swt.artifactId}</artifactId>
 									<version>${swt.version}</version>
 									<type>jar</type>
 									<overWrite>true</overWrite>
-									<outputDirectory>${staging.dir}/lib-swt</outputDirectory>
-									<destFileName>swt-${target.name}-32.jar</destFileName>
-								</artifactItem>
-								<artifactItem>
-									<groupId>org.eclipse.swt</groupId>
-									<artifactId>${swt.artifactId.64}</artifactId>
-									<version>${swt.version}</version>
-									<type>jar</type>
-									<overWrite>true</overWrite>
-									<outputDirectory>${staging.dir}/lib-swt</outputDirectory>
-									<destFileName>swt-${target.name}-64.jar</destFileName>
-								</artifactItem>
-								<artifactItem>
-									<groupId>at.a-sit</groupId>
-									<artifactId>pdf-over-install-helper</artifactId>
-									<version>${project.parent.version}</version>
-									<type>jar</type>
-									<overWrite>true</overWrite>
 									<outputDirectory>${staging.dir}/lib</outputDirectory>
-									<destFileName>pdf-over-install-helper.jar</destFileName>
+									<destFileName>swt.jar</destFileName>
 								</artifactItem>
 							</artifactItems>
 						</configuration>
@@ -321,6 +303,7 @@
 							<classPath>
 								<mainClass>at.asit.pdfover.gui.Main</mainClass>
 								<jarLocation>lib/</jarLocation>
+								<preCp>lib/swt.jar</preCp>
 							</classPath>
 							<chdir>.</chdir>
 							<icon>src/main/resources/icons/icon.ico</icon>
@@ -357,6 +340,7 @@
 							<classPath>
 								<mainClass>at.asit.pdfover.gui.Main</mainClass>
 								<jarLocation>lib/</jarLocation>
+								<preCp>lib/swt.jar</preCp>
 							</classPath>
 							<chdir>.</chdir>
 							<icon>src/main/resources/icons/icon.ico</icon>
@@ -478,9 +462,7 @@
 				</os>
 			</activation>
 			<properties>
-<!--				<swt.artifactId.32>org.eclipse.swt.gtk.linux.x86</swt.artifactId.32>-->
-				<swt.artifactId.64>org.eclipse.swt.gtk.linux.x86_64</swt.artifactId.64>
-				<swt.artifactId>${swt.artifactId.64}</swt.artifactId>
+				<swt.artifactId>org.eclipse.swt.gtk.linux.x86_64</swt.artifactId>
 				<target.name>linux</target.name>
 			</properties>
 		</profile>
@@ -493,9 +475,7 @@
 				</os>
 			</activation>
 			<properties>
-<!--				<swt.artifactId.32>org.eclipse.swt.win32.win32.x86</swt.artifactId.32>-->
-				<swt.artifactId.64>org.eclipse.swt.win32.win32.x86_64</swt.artifactId.64>
-				<swt.artifactId>${swt.artifactId.64}</swt.artifactId>
+				<swt.artifactId>org.eclipse.swt.win32.win32.x86_64</swt.artifactId>
 				<target.name>windows</target.name>
 			</properties>
 		</profile>
@@ -508,9 +488,7 @@
 				</os>
 			</activation>
 			<properties>
-<!--				<swt.artifactId.32>org.eclipse.swt.win32.win32.x86</swt.artifactId.32>-->
-				<swt.artifactId.64>org.eclipse.swt.win32.win32.x86_64</swt.artifactId.64>
-				<swt.artifactId>${swt.artifactId.64}</swt.artifactId>
+				<swt.artifactId>org.eclipse.swt.win32.win32.x86_64</swt.artifactId>
 				<target.name>windows</target.name>
 			</properties>
 		</profile>
@@ -523,9 +501,7 @@
 				</os>
 			</activation>
 			<properties>
-<!--				<swt.artifactId.32>org.eclipse.swt.gtk.linux.x86</swt.artifactId.32>-->
-				<swt.artifactId.64>org.eclipse.swt.gtk.linux.x86_64</swt.artifactId.64>
-				<swt.artifactId>${swt.artifactId.64}</swt.artifactId>
+				<swt.artifactId>org.eclipse.swt.gtk.linux.x86_64</swt.artifactId>
 				<target.name>linux</target.name>
 			</properties>
 		</profile>
@@ -541,9 +517,7 @@
 				</os>
 			</activation>
 			<properties>
-<!--				<swt.artifactId.32>org.eclipse.swt.cocoa.macosx</swt.artifactId.32>-->
-				<swt.artifactId.64>org.eclipse.swt.cocoa.macosx.x86_64</swt.artifactId.64>
-				<swt.artifactId>${swt.artifactId.64}</swt.artifactId>
+				<swt.artifactId>org.eclipse.swt.cocoa.macosx.x86_64</swt.artifactId>
 				<target.name>mac</target.name>
 			</properties>
 		</profile>
@@ -556,9 +530,7 @@
 				</os>
 			</activation>
 			<properties>
-<!--				<swt.artifactId.32>org.eclipse.swt.cocoa.macosx</swt.artifactId.32>-->
-				<swt.artifactId.64>org.eclipse.swt.cocoa.macosx.x86_64</swt.artifactId.64>
-				<swt.artifactId>${swt.artifactId.64}</swt.artifactId>
+				<swt.artifactId>org.eclipse.swt.cocoa.macosx.x86_64</swt.artifactId>
 				<target.name>mac</target.name>
 			</properties>
 		</profile>
@@ -571,9 +543,7 @@
 				</os>
 			</activation>
 			<properties>
-<!--				<swt.artifactId.32>org.eclipse.swt.cocoa.macosx</swt.artifactId.32>-->
-				<swt.artifactId.64>org.eclipse.swt.cocoa.macosx.x86_64</swt.artifactId.64>
-				<swt.artifactId>${swt.artifactId.64}</swt.artifactId>
+				<swt.artifactId>org.eclipse.swt.cocoa.macosx.x86_64</swt.artifactId>
 				<target.name>mac</target.name>
 			</properties>
 		</profile>
@@ -586,9 +556,7 @@
 				</os>
 			</activation>
 			<properties>
-<!--				<swt.artifactId.32>org.eclipse.swt.cocoa.macosx</swt.artifactId.32>-->
-				<swt.artifactId.64>org.eclipse.swt.cocoa.macosx.x86_64</swt.artifactId.64>
-				<swt.artifactId>${swt.artifactId.64}</swt.artifactId>
+				<swt.artifactId>org.eclipse.swt.cocoa.macosx.x86_64</swt.artifactId>
 				<target.name>mac</target.name>
 			</properties>
 		</profile>
@@ -601,9 +569,7 @@
 				</os>
 			</activation>
 			<properties>
-<!--				<swt.artifactId.32>org.eclipse.swt.cocoa.macosx</swt.artifactId.32>-->
-				<swt.artifactId.64>org.eclipse.swt.cocoa.macosx.aarch64</swt.artifactId.64>
-				<swt.artifactId>${swt.artifactId.64}</swt.artifactId>
+				<swt.artifactId>org.eclipse.swt.cocoa.macosx.aarch64</swt.artifactId>
 				<target.name>mac</target.name>
 			</properties>
 		</profile>
-- 
cgit v1.2.3