summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Heher <jakob.heher@iaik.tugraz.at>2022-04-04 15:21:59 +0200
committerJakob Heher <jakob.heher@iaik.tugraz.at>2022-04-04 15:21:59 +0200
commit5792d85f335f220964f4c1af94525d3ef6b6f575 (patch)
tree2c7e0ebb6a727ea02cc0e63d0f26b72c599b9b16
parente09c0dbecb2c65ed36a4b81f88c6ffdf7ca18b8e (diff)
downloadpdf-over-5792d85f335f220964f4c1af94525d3ef6b6f575.tar.gz
pdf-over-5792d85f335f220964f4c1af94525d3ef6b6f575.tar.bz2
pdf-over-5792d85f335f220964f4c1af94525d3ef6b6f575.zip
profile order no longer has effects on build
closes #62
-rw-r--r--pdf-over-gui/pom.xml31
-rwxr-xr-xpublish.sh2
2 files changed, 22 insertions, 11 deletions
diff --git a/pdf-over-gui/pom.xml b/pdf-over-gui/pom.xml
index 0e201cca..0911b518 100644
--- a/pdf-over-gui/pom.xml
+++ b/pdf-over-gui/pom.xml
@@ -473,14 +473,16 @@
</properties>
<profiles>
- <!-- Note: Build system profile has to come first! Else it overwrites the
- chosen profile -->
<profile>
- <id>linux-64</id>
+ <id>linux</id>
<activation>
<os>
- <name>linux</name>
+ <family>linux</family>
</os>
+ <property> <!-- this is set by publish.sh; it prevents this profile from turning on automatically when we're building for another OS -->
+ <name>no-native-profile</name>
+ <value>!true</value>
+ </property>
</activation>
<properties>
<swt.artifactId>org.eclipse.swt.gtk.linux.x86_64</swt.artifactId>
@@ -495,6 +497,10 @@
<os>
<family>windows</family>
</os>
+ <property>
+ <name>no-native-profile</name>
+ <value>!true</value>
+ </property>
</activation>
<properties>
<swt.artifactId>org.eclipse.swt.win32.win32.x86_64</swt.artifactId>
@@ -503,9 +509,6 @@
<target.name>windows</target.name>
</properties>
</profile>
-
-
-
<profile>
<id>mac</id>
<activation>
@@ -549,9 +552,13 @@
<id>mac-64-2</id>
<activation>
<os>
- <name>mac os x</name>
+ <family>mac</family>
<arch>x86_64</arch>
</os>
+ <property>
+ <name>no-native-profile</name>
+ <value>!true</value>
+ </property>
</activation>
<properties>
<swt.artifactId>org.eclipse.swt.cocoa.macosx.x86_64</swt.artifactId>
@@ -559,12 +566,16 @@
</properties>
</profile>
<profile>
- <id>mac-64-3</id>
+ <id>mac-aarch64</id>
<activation>
<os>
- <name>mac os x</name>
+ <family>mac</family>
<arch>aarch64</arch>
</os>
+ <property>
+ <name>no-native-profile</name>
+ <value>!true</value>
+ </property>
</activation>
<properties>
<swt.artifactId>org.eclipse.swt.cocoa.macosx.aarch64</swt.artifactId>
diff --git a/publish.sh b/publish.sh
index cae85541..fe969990 100755
--- a/publish.sh
+++ b/publish.sh
@@ -72,7 +72,7 @@ for (( i = 0 ; i < ${#names[@]} ; i++ )) do
NAME=${names[$i]}
INSTALLER=setup_pdf-over_$NAME.jar
begin_phase "Building package [$PROFILE] as $INSTALLER..."
- mvn install -P$PROFILE $MVN_PARAMS > "$LOG_DIR/build_$NAME.log" 2>&1
+ mvn install -P$PROFILE -Dno-native-profile $MVN_PARAMS > "$LOG_DIR/build_$NAME.log" 2>&1
RETVAL=$?
if [ $RETVAL -eq 0 ]; then
end_phase "OK"