update Mac packaging for RC Google and TAP

cpesch · Oct 3, 2023 · 0e7d39c · 0e7d39c
1 parent d146e14
commit 0e7d39c
Show file tree

Hide file tree

Showing 21 changed files with 114 additions and 27 deletions.
diff --git a/RouteConverterMacGoogle/pom.xml b/RouteConverterMacGoogle/pom.xml
@@ -75,6 +75,30 @@
                 </executions>
             </plugin>
 
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.openjdk.java</groupId>
+                                    <artifactId>jlink-routeconverter-opensource</artifactId>
+                                    <version>17.0.7</version>
+                                    <type>zip</type>
+                                    <classifier>osx</classifier>
+                                    <outputDirectory>${project.basedir}/target/Runtime</outputDirectory>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <executions>

diff --git a/RouteConverterMacGoogle/src/main/app-resources/Info.plist b/RouteConverterMacGoogle/src/main/app-resources/Info.plist
@@ -15,7 +15,7 @@
         <key>CFBundleIconFile</key>
         <string>RouteConverter.icns</string>
         <key>CFBundleIdentifier</key>
-        <string>slash.navigation.converter.gui.RouteConverter</string>
+        <string>slash.navigation.converter.gui.RouteConverterGoogle</string>
         <key>CFBundleName</key>
         <string>RouteConverterGoogle</string>
         <key>CFBundlePackageType</key>
@@ -27,11 +27,11 @@
         <key>CFBundleVersion</key>
         <string>${project.version}-${maven.build.number} ${maven.build.timestamp.clone}</string>
         <key>NSHighResolutionCapable</key>
-        <true/>
+        <string>true</string>
         <key>NSHumanReadableCopyright</key>
         <string>Created by Christian Pesch</string>
         <key>LSMinimumSystemVersion</key>
-        <string>10.7.4</string>
+        <string>10.9</string>
         <key>LSApplicationCategoryType</key>
         <string>Navigation</string>
         <key>CFBundleDocumentTypes</key>

diff --git a/RouteConverterMacGoogle/src/main/app-resources/Java/RouteConverterGoogle.cfg b/RouteConverterMacGoogle/src/main/app-resources/Java/RouteConverterGoogle.cfg
@@ -1,9 +1,12 @@
-app.runtime=
-app.mainjar=RouteConverterGoogleStart.jar
+[Application]
+app.runtime=$APPDIR/Runtime
+app.mainjar=RouteConverterMacGoogle.jar
 app.version=${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${maven.build.number}
-app.id=slash.navigation.converter.gui.RouteConverterGoogle
-app.preferences.id=slash/navigation/converter/gui/RouteConverterGoogle
+app.name=RouteConverterGoogle
 app.identifier=slash.navigation.converter.gui.RouteConverterGoogle
 app.mainclass=slash/navigation/converter/gui/RouteConverterGoogle
 app.classpath=RouteConverterMacGoogle.jar
-jvmarg.1=-Xmx1024m
+
+[JavaOptions]
+
+[ArgOptions]
diff --git a/RouteConverterMacGoogle/src/main/app-resources/Java/RouteConverterGoogleStart.jar b/RouteConverterMacGoogle/src/main/app-resources/Java/RouteConverterGoogleStart.jar
diff --git a/RouteConverterMacGoogle/src/main/app-resources/MacOS/RouteConverterGoogle b/RouteConverterMacGoogle/src/main/app-resources/MacOS/RouteConverterGoogle
diff --git a/RouteConverterMacGoogle/src/main/app-resources/MacOS/libapplauncher.dylib b/RouteConverterMacGoogle/src/main/app-resources/MacOS/libapplauncher.dylib
diff --git a/RouteConverterMacGoogle/src/main/app-resources/MacOS/libpackager.dylib b/RouteConverterMacGoogle/src/main/app-resources/MacOS/libpackager.dylib
diff --git a/RouteConverterMacGoogle/src/main/app-resources/Resources/InfoPlist.strings b/RouteConverterMacGoogle/src/main/app-resources/Resources/InfoPlist.strings
diff --git a/RouteConverterMacGoogle/src/main/assembly/macos.xml b/RouteConverterMacGoogle/src/main/assembly/macos.xml
@@ -6,30 +6,39 @@
         <format>zip</format>
     </formats>
     <includeBaseDirectory>false</includeBaseDirectory>
+    <fileSets>
+        <fileSet>
+            <directory>target/Runtime/</directory>
+            <includes>
+                <include>**/*</include>
+            </includes>
+            <outputDirectory>/RouteConverter.app/Contents/</outputDirectory>
+        </fileSet>
+    </fileSets>
     <files>
         <file>
             <source>src/main/app-resources/Java/RouteConverterGoogle.cfg</source>
             <outputDirectory>/RouteConverter.app/Contents/Java/</outputDirectory>
             <filtered>true</filtered>
             <lineEnding>lf</lineEnding>
         </file>
-        <file>
-            <source>src/main/app-resources/Java/RouteConverterGoogleStart.jar</source>
-            <outputDirectory>/RouteConverter.app/Contents/Java/</outputDirectory>
-        </file>
         <file>
             <source>src/main/app-resources/MacOS/RouteConverterGoogle</source>
             <outputDirectory>/RouteConverter.app/Contents/MacOS/</outputDirectory>
             <fileMode>755</fileMode>
         </file>
         <file>
-            <source>src/main/app-resources/MacOS/libpackager.dylib</source>
+            <source>src/main/app-resources/MacOS/libapplauncher.dylib</source>
             <outputDirectory>/RouteConverter.app/Contents/MacOS/</outputDirectory>
         </file>
         <file>
             <source>src/main/app-resources/Resources/RouteConverter.icns</source>
             <outputDirectory>/RouteConverter.app/Contents/Resources/</outputDirectory>
         </file>
+        <file>
+            <source>src/main/app-resources/Resources/InfoPlist.strings</source>
+            <outputDirectory>/RouteConverter.app/Contents/Resources/German.lproj/</outputDirectory>
+        </file>
         <file>
             <source>src/main/app-resources/Info.plist</source>
             <outputDirectory>/RouteConverter.app/Contents/</outputDirectory>

diff --git a/RouteConverterMacOpenSource/jpackage.sh b/RouteConverterMacOpenSource/jpackage.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+jpackage \
+  --type app-image \
+  --verbose \
+  --input target \
+  --main-jar RouteConverterMacOpenSource.jar \
+  --main-class slash.navigation.converter.gui.RouteConverterOpenSource \
+  --dest release \
+  --java-options '--add-exports java.desktop/com.apple.eawt=ALL-UNNAMED' \
+  --java-options '-Xmx1024m'
diff --git a/TimeAlbumProMac/pom.xml b/TimeAlbumProMac/pom.xml
@@ -78,6 +78,30 @@
                 </executions>
             </plugin>
 
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.openjdk.java</groupId>
+                                    <artifactId>jlink-routeconverter-opensource</artifactId>
+                                    <version>17.0.7</version>
+                                    <type>zip</type>
+                                    <classifier>osx</classifier>
+                                    <outputDirectory>${project.basedir}/target/Runtime</outputDirectory>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <executions>

diff --git a/TimeAlbumProMac/src/main/app-resources/Info.plist b/TimeAlbumProMac/src/main/app-resources/Info.plist
@@ -27,11 +27,11 @@
         <key>CFBundleVersion</key>
         <string>${project.version}-${maven.build.number} ${maven.build.timestamp.clone}</string>
         <key>NSHighResolutionCapable</key>
-        <true/>
+        <string>true</string>
         <key>NSHumanReadableCopyright</key>
         <string>Created by Christian Pesch</string>
         <key>LSMinimumSystemVersion</key>
-        <string>10.7.4</string>
+        <string>10.9</string>
         <key>LSApplicationCategoryType</key>
         <string>Navigation</string>
     </dict>

diff --git a/TimeAlbumProMac/src/main/app-resources/Java/TimeAlbumPro.cfg b/TimeAlbumProMac/src/main/app-resources/Java/TimeAlbumPro.cfg
@@ -1,9 +1,12 @@
-app.runtime=
-app.mainjar=TimeAlbumProStart.jar
+[Application]
+app.runtime=$APPDIR/Runtime
+app.mainjar=TimeAlbumProMac.jar
 app.version=${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${maven.build.number}
-app.id=slash.navigation.converter.gui.TimeAlbumPro
-app.preferences.id=slash/navigation/converter/gui/TimeAlbumPro
+app.name=TimeAlbumPro
 app.identifier=slash.navigation.converter.gui.TimeAlbumPro
 app.mainclass=slash/navigation/converter/gui/TimeAlbumPro
 app.classpath=TimeAlbumProMac.jar
-jvmarg.1=-Xmx1024m
+
+[JavaOptions]
+
+[ArgOptions]
diff --git a/TimeAlbumProMac/src/main/app-resources/Java/TimeAlbumProStart.jar b/TimeAlbumProMac/src/main/app-resources/Java/TimeAlbumProStart.jar
diff --git a/TimeAlbumProMac/src/main/app-resources/MacOS/TimeAlbumPro b/TimeAlbumProMac/src/main/app-resources/MacOS/TimeAlbumPro
diff --git a/TimeAlbumProMac/src/main/app-resources/MacOS/libapplauncher.dylib b/TimeAlbumProMac/src/main/app-resources/MacOS/libapplauncher.dylib
diff --git a/TimeAlbumProMac/src/main/app-resources/MacOS/libpackager.dylib b/TimeAlbumProMac/src/main/app-resources/MacOS/libpackager.dylib
diff --git a/TimeAlbumProMac/src/main/app-resources/Resources/InfoPlist.strings b/TimeAlbumProMac/src/main/app-resources/Resources/InfoPlist.strings
diff --git a/TimeAlbumProMac/src/main/assembly/macos.xml b/TimeAlbumProMac/src/main/assembly/macos.xml
@@ -6,30 +6,39 @@
         <format>zip</format>
     </formats>
     <includeBaseDirectory>false</includeBaseDirectory>
+    <fileSets>
+        <fileSet>
+            <directory>target/Runtime/</directory>
+            <includes>
+                <include>**/*</include>
+            </includes>
+            <outputDirectory>/TimeAlbumPro.app/Contents/</outputDirectory>
+        </fileSet>
+    </fileSets>
     <files>
         <file>
             <source>src/main/app-resources/Java/TimeAlbumPro.cfg</source>
             <outputDirectory>/TimeAlbumPro.app/Contents/Java/</outputDirectory>
             <filtered>true</filtered>
             <lineEnding>lf</lineEnding>
         </file>
-        <file>
-            <source>src/main/app-resources/Java/TimeAlbumProStart.jar</source>
-            <outputDirectory>/TimeAlbumPro.app/Contents/Java/</outputDirectory>
-        </file>
         <file>
             <source>src/main/app-resources/MacOS/TimeAlbumPro</source>
             <outputDirectory>/TimeAlbumPro.app/Contents/MacOS/</outputDirectory>
             <fileMode>755</fileMode>
         </file>
         <file>
-            <source>src/main/app-resources/MacOS/libpackager.dylib</source>
+            <source>src/main/app-resources/MacOS/libapplauncher.dylib</source>
             <outputDirectory>/TimeAlbumPro.app/Contents/MacOS/</outputDirectory>
         </file>
         <file>
             <source>src/main/app-resources/Resources/TimeAlbumPro.icns</source>
             <outputDirectory>/TimeAlbumPro.app/Contents/Resources/</outputDirectory>
         </file>
+        <file>
+            <source>src/main/app-resources/Resources/InfoPlist.strings</source>
+            <outputDirectory>/TimeAlbumPro.app/Contents/Resources/German.lproj/</outputDirectory>
+        </file>
         <file>
             <source>src/main/app-resources/Info.plist</source>
             <outputDirectory>/TimeAlbumPro.app/Contents/</outputDirectory>

diff --git a/common/src/main/java/slash/common/system/Platform.java b/common/src/main/java/slash/common/system/Platform.java
@@ -62,6 +62,10 @@ public static boolean isCurrentAtLeastMinimumVersion(String currentVersion, Stri
         return currentVersion.compareTo(minimumVersion) >= 0;
     }
 
+    public static boolean isJava17OrLater() {
+        return isJavaLaterThan(System.getProperty("java.version"), 17);
+    }
+
     private static String canonical(String value) {
         return value.toLowerCase().replaceAll("[\\\\/ ]", "_");
     }

diff --git a/route-converter/src/main/java/slash/navigation/converter/gui/RouteConverter.java b/route-converter/src/main/java/slash/navigation/converter/gui/RouteConverter.java
@@ -220,8 +220,8 @@ protected void startup() {
 
     protected void checkJavaPrequisites() {
         String currentVersion = System.getProperty("java.version");
-        if (!isCurrentAtLeastMinimumVersion(currentVersion, "17")) {
-            showMessageDialog(null, "Java " + currentVersion + " is too old for JavaFX 20. Please install Java 17 or later.", "RouteConverter", ERROR_MESSAGE);
+        if (!isJava17OrLater()) {
+            showMessageDialog(null, "Java " + currentVersion + " is too old. Please install Java 17 or later.", "RouteConverter", ERROR_MESSAGE);
             System.exit(8);
         }
     }