Skip to content

Commit cea1100

Browse files
pinhead84pinhead84
committed
improved application bundles for macOS
fixes #49
1 parent c621598 commit cea1100

13 files changed

Lines changed: 152 additions & 76 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ Changelog for Remote Support Tool
66

77
- [enhancement #33](https://github.com/OpenIndex/RemoteSupportTool/issues/33): Enable encryption via TLS 1.3
88
- [enhancement #46](https://github.com/OpenIndex/RemoteSupportTool/issues/46): Hide connection settings in Customer Tool via configuration
9+
- [enhancement #49](https://github.com/OpenIndex/RemoteSupportTool/issues/46): Improved application bundles for macOS
910
- update bundled [Java Runtime Environment](https://openjdk.java.net/) to version 11.0.10+9
1011
- update [Commons Lang](https://commons.apache.org/lang/) library to version 3.12.0
1112
- update [Commons IO](https://commons.apache.org/io) library to version 2.8.0

‎Customer/src/main/resources/de/openindex/support/customer/resources/about.html‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,10 @@ <h3>Third party components</h3>
6565
<a href="https://www.slf4j.org/">Simple Logging Facade for Java</a> ${version.slf4j}
6666
<a href="https://www.slf4j.org/license.html">(MIT)</a>
6767
</li>
68+
<li>
69+
<a href="https://github.com/OpenIndex/JavaMacLauncher">JavaMacLauncher</a> ${version.java-mac-launcher}
70+
<a href="https://raw.githubusercontent.com/OpenIndex/JavaMacLauncher/master/LICENSE.txt">(Apache License 2.0)</a>
71+
</li>
6872
</ul>
6973
<p>
7074
We especially like to thank <a href="https://www.bell-sw.com/">BellSoft</a>

‎Customer/src/main/resources/de/openindex/support/customer/resources/about_de.html‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,10 @@ <h3>Komponenten von Drittanbietern</h3>
6666
<a href="https://www.slf4j.org/">Simple Logging Facade for Java</a> ${version.slf4j}
6767
<a href="https://www.slf4j.org/license.html">(MIT)</a>
6868
</li>
69+
<li>
70+
<a href="https://github.com/OpenIndex/JavaMacLauncher">JavaMacLauncher</a> ${version.java-mac-launcher}
71+
<a href="https://raw.githubusercontent.com/OpenIndex/JavaMacLauncher/master/LICENSE.txt">(Apache License 2.0)</a>
72+
</li>
6973
</ul>
7074
<p>
7175
Wir bedanken uns insbesondere bei <a href="https://www.bell-sw.com/">BellSoft</a>

‎README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,8 @@ The following third party components are bundled into the application (in alphab
176176
[(GPL 2 with Classpath Exception)](https://openjdk.java.net/legal/gplv2+ce.html)
177177
- [Simple Logging Facade for Java](https://www.slf4j.org/) 1.7.30
178178
[(MIT)](https://www.slf4j.org/license.html)
179+
- [JavaMacLauncher](https://github.com/OpenIndex/JavaMacLauncher) 1.0.0
180+
[(Apache License 2.0)](https://raw.githubusercontent.com/OpenIndex/JavaMacLauncher/master/LICENSE.txt)
179181

180182
We especially like to thank [BellSoft](https://www.bell-sw.com/) for providing the high quality OpenJDK builds, that are bundled with this application.
181183

‎Staff/src/main/resources/de/openindex/support/staff/resources/about.html‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,10 @@ <h3>Third party components</h3>
6969
<a href="https://www.slf4j.org/">Simple Logging Facade for Java</a> ${version.slf4j}
7070
<a href="https://www.slf4j.org/license.html">(MIT)</a>
7171
</li>
72+
<li>
73+
<a href="https://github.com/OpenIndex/JavaMacLauncher">JavaMacLauncher</a> ${version.java-mac-launcher}
74+
<a href="https://raw.githubusercontent.com/OpenIndex/JavaMacLauncher/master/LICENSE.txt">(Apache License 2.0)</a>
75+
</li>
7276
</ul>
7377
<p>
7478
We especially like to thank <a href="https://www.bell-sw.com/">BellSoft</a>

‎Staff/src/main/resources/de/openindex/support/staff/resources/about_de.html‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,10 @@ <h3>Komponenten von Drittanbietern</h3>
7070
<a href="https://www.slf4j.org/">Simple Logging Facade for Java</a> ${version.slf4j}
7171
<a href="https://www.slf4j.org/license.html">(MIT)</a>
7272
</li>
73+
<li>
74+
<a href="https://github.com/OpenIndex/JavaMacLauncher">JavaMacLauncher</a> ${version.java-mac-launcher}
75+
<a href="https://raw.githubusercontent.com/OpenIndex/JavaMacLauncher/master/LICENSE.txt">(Apache License 2.0)</a>
76+
</li>
7377
</ul>
7478
<p>
7579
Wir bedanken uns insbesondere bei <a href="https://www.bell-sw.com/">BellSoft</a>

‎pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
<version.logback>1.2.3</version.logback>
5858
<version.miglayout>5.2</version.miglayout>
5959
<version.slf4j>1.7.30</version.slf4j>
60+
<version.java-mac-launcher>1.0.0</version.java-mac-launcher>
6061
<createChecksum>true</createChecksum>
6162
</properties>
6263

‎release/bundle-macos.sh‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ if [[ -d "$TARGET_DIR/Staff/macos-x86-64" ]]; then
3737
rm -f "$TARGET_DIR/$STAFF_TOOL-$VERSION.macos-x86-64.tar.gz"
3838
cp -R "$DIR/src/macos/Staff.app" "$TARGET_DIR/$STAFF_TOOL.app"
3939
mkdir -p "$TARGET_DIR/$STAFF_TOOL.app/Contents"
40+
mkdir -p "$TARGET_DIR/$STAFF_TOOL.app/Contents/MacOS"
41+
cp "$DIR/src/macos/JavaMacLauncher" "$TARGET_DIR/$STAFF_TOOL.app/Contents/MacOS/JavaMacLauncher"
42+
chmod ugo+x "$TARGET_DIR/$STAFF_TOOL.app/Contents/MacOS/JavaMacLauncher"
4043
cp -R "$TARGET_DIR/Staff/macos-x86-64" "$TARGET_DIR/$STAFF_TOOL.app/Contents/Resources"
4144
sed -i -e "s/{VERSION}/$VERSION/g" "$TARGET_DIR/$STAFF_TOOL.app/Contents/Info.plist"
4245
cd "$TARGET_DIR"
@@ -57,6 +60,9 @@ if [[ -d "$TARGET_DIR/Customer/macos-x86-64" ]]; then
5760
rm -f "$TARGET_DIR/$CUSTOMER_TOOL-$VERSION.macos-x86-64.tar.gz"
5861
cp -R "$DIR/src/macos/Customer.app" "$TARGET_DIR/$CUSTOMER_TOOL.app"
5962
mkdir -p "$TARGET_DIR/$CUSTOMER_TOOL.app/Contents"
63+
mkdir -p "$TARGET_DIR/$CUSTOMER_TOOL.app/Contents/MacOS"
64+
cp "$DIR/src/macos/JavaMacLauncher" "$TARGET_DIR/$CUSTOMER_TOOL.app/Contents/MacOS/JavaMacLauncher"
65+
chmod ugo+x "$TARGET_DIR/$CUSTOMER_TOOL.app/Contents/MacOS/JavaMacLauncher"
6066
cp -R "$TARGET_DIR/Customer/macos-x86-64" "$TARGET_DIR/$CUSTOMER_TOOL.app/Contents/Resources"
6167
sed -i -e "s/{VERSION}/$VERSION/g" "$TARGET_DIR/$CUSTOMER_TOOL.app/Contents/Info.plist"
6268
cd "$TARGET_DIR"

‎release/src/macos/Customer.app/Contents/Info.plist‎

Lines changed: 63 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,79 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
4-
<dict>
5-
<key>CFBundleInfoDictionaryVersion</key>
6-
<string>6.0</string>
4+
<dict>
5+
<key>CFBundleInfoDictionaryVersion</key>
6+
<string>6.0</string>
77

8-
<key>CFBundleIdentifier</key>
9-
<string>de.openindex.support.customer.default</string>
8+
<key>CFBundleIdentifier</key>
9+
<string>de.openindex.support.customer.default</string>
1010

11-
<key>CFBundleName</key>
12-
<string>CustomerSupport</string>
11+
<key>CFBundleName</key>
12+
<string>CustomerSupport</string>
1313

14-
<key>CFBundleDisplayName</key>
15-
<string>CustomerSupportTool</string>
14+
<key>CFBundleDisplayName</key>
15+
<string>CustomerSupportTool</string>
1616

17-
<key>CFBundleVersion</key>
18-
<string>{VERSION}</string>
17+
<key>CFBundleVersion</key>
18+
<string>{VERSION}</string>
1919

20-
<key>CFBundlePackageType</key>
21-
<string>APPL</string>
20+
<key>CFBundlePackageType</key>
21+
<string>APPL</string>
2222

23-
<key>CFBundleExecutable</key>
24-
<string>Start.sh</string>
23+
<key>CFBundleExecutable</key>
24+
<string>JavaMacLauncher</string>
2525

26-
<key>CFBundleIconFile</key>
27-
<string>share/icon.icns</string>
26+
<key>CFBundleIconFile</key>
27+
<string>share/icon.icns</string>
2828

29-
<key>CFBundleDevelopmentRegion</key>
30-
<string>en-US</string>
29+
<key>CFBundleDevelopmentRegion</key>
30+
<string>en-US</string>
3131

32-
<key>LSApplicationCategoryType</key>
33-
<string>public.app-category.utilities</string>
32+
<key>LSApplicationCategoryType</key>
33+
<string>public.app-category.utilities</string>
3434

35-
<key>LSMinimumSystemVersion</key>
36-
<string>10.9</string>
35+
<key>LSMinimumSystemVersion</key>
36+
<string>10.9</string>
3737

38-
<key>NSHumanReadableCopyright</key>
39-
<string>©2015-2021 OpenIndex.de</string>
38+
<key>NSHumanReadableCopyright</key>
39+
<string>©2015-2021 OpenIndex.de</string>
4040

41-
<key>NSHighResolutionCapable</key>
42-
<true/>
43-
</dict>
41+
<key>NSHighResolutionCapable</key>
42+
<true/>
43+
44+
<key>JavaMacLauncher</key>
45+
<dict>
46+
<key>JavaHome</key>
47+
<string>Contents/Resources</string>
48+
<key>JavaCommand</key>
49+
<string>Contents/Resources/bin/java</string>
50+
<key>JavaOptions</key>
51+
<array>
52+
<string>-Dfile.encoding=UTF-8</string>
53+
</array>
54+
<key>JavaModulePath</key>
55+
<array>
56+
<string>Contents/Resources/modules</string>
57+
</array>
58+
<key>ApplicationCommand</key>
59+
<string>-m de.openindex.support.customer/de.openindex.support.customer.CustomerApplication</string>
60+
<key>HeapMinimum</key>
61+
<string>32m</string>
62+
<key>HeapMaximum</key>
63+
<string>512m</string>
64+
<key>DockName</key>
65+
<dict>
66+
<key>default</key>
67+
<string>Customer Support</string>
68+
<key>de</key>
69+
<string>Kunden Support</string>
70+
</dict>
71+
<key>DockIcon</key>
72+
<string>Contents/Resources/share/icon.icns</string>
73+
<key>UseScreenMenuBar</key>
74+
<true/>
75+
<key>LaunchInForeground</key>
76+
<true/>
77+
</dict>
78+
</dict>
4479
</plist>

‎release/src/macos/Customer.app/Contents/MacOS/Start.sh‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)