diff options
-rw-r--r-- | installer/README.txt | 23 | ||||
-rw-r--r-- | installer/mac/PDF-Over.platypus | 93 | ||||
-rw-r--r-- | installer/mac/Platypus-drop-setting.png | bin | 311690 -> 0 bytes | |||
-rw-r--r-- | installer/mac/Platypus.png | bin | 256437 -> 0 bytes | |||
-rw-r--r-- | installer/mac/old/Background.png | bin | 76601 -> 0 bytes | |||
-rw-r--r-- | installer/mac/old/DmgPress Package.png | bin | 43067 -> 0 bytes | |||
-rw-r--r-- | installer/mac/old/DmgPress.png | bin | 54041 -> 0 bytes | |||
-rw-r--r-- | installer/mac/old/Platypus drop settings.png | bin | 93044 -> 0 bytes | |||
-rw-r--r-- | pdf-over-gui/pom.xml | 27 | ||||
-rw-r--r-- | pdf-over-gui/src/main/resources/installer-mac/background.png (renamed from installer/mac/background.png) | bin | 2389 -> 2389 bytes | |||
-rw-r--r-- | pdf-over-gui/src/main/resources/installer-mac/signscript.sh | 62 |
11 files changed, 89 insertions, 116 deletions
diff --git a/installer/README.txt b/installer/README.txt deleted file mode 100644 index 1eff3af4..00000000 --- a/installer/README.txt +++ /dev/null @@ -1,23 +0,0 @@ -Erzeugen der webstart-installer mit publish-script oder mit händischem -Aktivieren der jeweiligen Profile: -mvn install -P (linux/windows/mac) - -Signieren mittels Token mit ... -P pkcs11-sign -Dpkcs11-pass=(...) - -Windows-Installer: - Advanced-Installer-Projektdateien enthalten: - * PDF-Over.aip - Einfaches MSI, mit Free-Version erzeugbar - * PDF-Over-signed.aip - Benötigt Pro-Version, signiert, Sprachen - * User Interface -> Dialogs -> ShortcutsDlg - * "Show Desktop Option" & "Checked by default" aktivieren - -Mac-DMG-Paket: - * Per webstart installieren, Paketinhalt entpacken - * pdf-over_mac.sh script bearbeiten: - * "$BASEDIR/../lib/*" in "$BASEDIR/lib/*" ändern - * App erstellen mit Platypus: Screenshots platypus (drop settings).png - * Beispiel-Profil inkludiert - * DMG-Image erzeugen mit DmgPress: Screenshot DmgPress.png - * Hintergrund für Folder: Background.png - * Darstellung -> Als Liste; Darstellung -> Als Symbole - * App + Link zu Applications-Folder hineinziehen (Screenshot) diff --git a/installer/mac/PDF-Over.platypus b/installer/mac/PDF-Over.platypus deleted file mode 100644 index 91cc75ff..00000000 --- a/installer/mac/PDF-Over.platypus +++ /dev/null @@ -1,93 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> -<plist version="1.0"> -<dict> - <key>AcceptsFiles</key> - <true/> - <key>AcceptsText</key> - <false/> - <key>Authentication</key> - <false/> - <key>Author</key> - <string>A-SIT</string> - <key>BundledFiles</key> - <array> - <string>/Users/TestMac/Documents/Contents/icons</string> - <string>/Users/TestMac/Documents/Contents/lib</string> - </array> - <key>Creator</key> - <string>Platypus-4.7</string> - <key>DeclareService</key> - <false/> - <key>Destination</key> - <string>/Users/TestMac/Desktop/MyPlatypusApp.app</string> - <key>DestinationOverride</key> - <false/> - <key>DevelopmentVersion</key> - <false/> - <key>DocIcon</key> - <string></string> - <key>Droppable</key> - <true/> - <key>ExecutablePath</key> - <string>/usr/local/share/platypus/ScriptExec</string> - <key>FileTypes</key> - <array> - <string>fold</string> - <string>PDF </string> - </array> - <key>IconPath</key> - <string>/Users/TestMac/Documents/Contents/icons/icon.icns</string> - <key>Identifier</key> - <string>at.a-sit.PDF-Over</string> - <key>Interpreter</key> - <string>/bin/sh</string> - <key>InterpreterArgs</key> - <array/> - <key>Name</key> - <string>PDF-Over</string> - <key>NibPath</key> - <string>/usr/local/share/platypus/MainMenu.nib</string> - <key>OptimizeApplication</key> - <true/> - <key>Output</key> - <string>None</string> - <key>RemainRunning</key> - <false/> - <key>Role</key> - <string>Viewer</string> - <key>ScriptArgs</key> - <array/> - <key>ScriptPath</key> - <string>/Users/TestMac/Documents/Contents/scripts/pdf-over_mac.sh</string> - <key>Secure</key> - <false/> - <key>ShowInDock</key> - <false/> - <key>StatusItemDisplayType</key> - <string>Text</string> - <key>StatusItemIcon</key> - <data> - </data> - <key>StatusItemTitle</key> - <string>MyPlatypusApp</string> - <key>Suffixes</key> - <array> - <string>*</string> - </array> - <key>TextBackground</key> - <string>#ffffff</string> - <key>TextEncoding</key> - <integer>4</integer> - <key>TextFont</key> - <string>Monaco</string> - <key>TextForeground</key> - <string>#000000</string> - <key>TextSize</key> - <real>10</real> - <key>UseXMLPlistFormat</key> - <true/> - <key>Version</key> - <string>4.0.2</string> -</dict> -</plist> diff --git a/installer/mac/Platypus-drop-setting.png b/installer/mac/Platypus-drop-setting.png Binary files differdeleted file mode 100644 index 84640687..00000000 --- a/installer/mac/Platypus-drop-setting.png +++ /dev/null diff --git a/installer/mac/Platypus.png b/installer/mac/Platypus.png Binary files differdeleted file mode 100644 index 20a28830..00000000 --- a/installer/mac/Platypus.png +++ /dev/null diff --git a/installer/mac/old/Background.png b/installer/mac/old/Background.png Binary files differdeleted file mode 100644 index 5a8aeefa..00000000 --- a/installer/mac/old/Background.png +++ /dev/null diff --git a/installer/mac/old/DmgPress Package.png b/installer/mac/old/DmgPress Package.png Binary files differdeleted file mode 100644 index a92114b8..00000000 --- a/installer/mac/old/DmgPress Package.png +++ /dev/null diff --git a/installer/mac/old/DmgPress.png b/installer/mac/old/DmgPress.png Binary files differdeleted file mode 100644 index 0e19960a..00000000 --- a/installer/mac/old/DmgPress.png +++ /dev/null diff --git a/installer/mac/old/Platypus drop settings.png b/installer/mac/old/Platypus drop settings.png Binary files differdeleted file mode 100644 index d3ece52a..00000000 --- a/installer/mac/old/Platypus drop settings.png +++ /dev/null diff --git a/pdf-over-gui/pom.xml b/pdf-over-gui/pom.xml index 5f017bc5..591b6b2b 100644 --- a/pdf-over-gui/pom.xml +++ b/pdf-over-gui/pom.xml @@ -463,6 +463,7 @@ <resource> <directory>src/main/resources</directory> <excludes> + <exclude>installer-mac/*</exclude> <exclude>izpack-linux/*</exclude> <exclude>scripts/*</exclude> <exclude>ReadMe.txt</exclude> @@ -649,6 +650,32 @@ <pdfover-build.os-name>mac</pdfover-build.os-name> <pdfover-build.output-filename>pdf-over_mac-x86_64.zip</pdfover-build.output-filename> </properties> + <build> + <plugins> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <version>2.4.2</version> + <executions> + <execution> + <id>copy-mac-resources</id> + <phase>validate</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <encoding>UTF-8</encoding> + <outputDirectory>${pdfover-build.staging-dir}</outputDirectory> + <resources> + <resource> + <directory>src/main/resources/installer-mac</directory> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> </profile> <profile> <id>mac-aarch64</id> diff --git a/installer/mac/background.png b/pdf-over-gui/src/main/resources/installer-mac/background.png Binary files differindex 0d6edaf3..0d6edaf3 100644 --- a/installer/mac/background.png +++ b/pdf-over-gui/src/main/resources/installer-mac/background.png diff --git a/pdf-over-gui/src/main/resources/installer-mac/signscript.sh b/pdf-over-gui/src/main/resources/installer-mac/signscript.sh new file mode 100644 index 00000000..f9ee49f6 --- /dev/null +++ b/pdf-over-gui/src/main/resources/installer-mac/signscript.sh @@ -0,0 +1,62 @@ +#!/bin/sh + +# from: https://developer.apple.com/forums/thread/130855 +# Fail if any command fails. + +set -e + +# Check and unpack the arguments. + +if [ $# -ne 1 ] +then + echo "usage: package-archive.sh /path/to.xcarchive" > /dev/stderr + exit 1 +fi +ARCHIVE="$1" + +# Establish a work directory, create a disk image root directory within +# that, and then copy the app there. +# +# Note we use `-R`, not `-r`, to preserve symlinks. + +WORKDIR="pdf-over-`date '+%Y-%m-%d_%H.%M.%S'`" +DMGROOT="${WORKDIR}/PDF-Over" +APP="${WORKDIR}/PDF-Over/PDF-Over.app" +DMG="${WORKDIR}/pdf-over.dmg" + +mkdir -p "${DMGROOT}" +cp -R "${ARCHIVE}/PDF-Over.app" "${DMGROOT}/" + +# When you use `-f` to replace a signature, `codesign` prints `replacing +# existing signature`. There's no option to suppress that. The message +# goes to `stderr` so you don't want to redirect it to `/dev/null` because +# there might be other interesting stuff logged to `stderr`. One way to +# prevent it is to remove the signature beforehand, as shown by the +# following lines. It does slow things down a bunch though, so I've made +# it easy to disable them. + +if true +then + codesign --remove-signature "${APP}/Contents/MacOS/PDF-Over" + codesign --remove-signature "${APP}" +fi + + + +codesign -s "Developer ID Application: SIT Zentrum fuer sichere Informationstechnologie-Austria (9CYHJNG644)" -f -vvvv --timestamp -o runtime "${APP}/Contents/MacOS/PDF-Over" +#codesign -s "Developer ID Application: SIT Zentrum fuer sichere Informationstechnologie-Austria (9CYHJNG644)" -f --timestamp -o runtime "${APP}/Contents/Resources/bin/mocca.jar/BKULocal.war/WEB-INF/lib/smcc-1.4.2.jar/at/gv/egiz/smcc/osx-pcsc-jni/jre6.libosxj2pcsc.dylib" +#codesign -s "Developer ID Application: SIT Zentrum fuer sichere Informationstechnologie-Austria (9CYHJNG644)" -f --timestamp -o runtime "${APP}/Contents/Resources/bin/mocca.jar/BKULocal.war/WEB-INF/lib/smcc-1.4.2.jar/at/gv/egiz/smcc/osx-pcsc-jni/jre8.libosxj2pcsc.dylib" +#codesign -s "Developer ID Application: SIT Zentrum fuer sichere Informationstechnologie-Austria (9CYHJNG644)" -f --timestamp -o runtime "${APP}/Contents/Resources/bin/mocca.jar/BKULocal.war/WEB-INF/lib/smcc-1.4.2.jar/at/gv/egiz/smcc/osx-pcsc-jni/jre7.libosxj2pcsc.dylib" +codesign -s "Developer ID Application: SIT Zentrum fuer sichere Informationstechnologie-Austria (9CYHJNG644)" -f --timestamp -o runtime "${APP}" + + +# Create a disk image from our disk image root directory. + +hdiutil create -srcFolder "${DMGROOT}" -quiet -o "${DMG}" + +# Sign that. + +codesign -s "Developer ID Application: SIT Zentrum fuer sichere Informationstechnologie-Austria (9CYHJNG644)" -vvvv --timestamp -i at.egiz.PDF-Over "${DMG}" + +echo "finished signing script!" +echo "${DMG}" |