From d672415801f5e77c68ce44c90942b205b983e578 Mon Sep 17 00:00:00 2001 From: Jakob Heher Date: Thu, 12 May 2022 12:08:07 +0200 Subject: add mac installer resources to package --- installer/README.txt | 23 ----- installer/mac/PDF-Over.platypus | 93 --------------------- installer/mac/Platypus-drop-setting.png | Bin 311690 -> 0 bytes installer/mac/Platypus.png | Bin 256437 -> 0 bytes installer/mac/background.png | Bin 2389 -> 0 bytes installer/mac/old/Background.png | Bin 76601 -> 0 bytes installer/mac/old/DmgPress Package.png | Bin 43067 -> 0 bytes installer/mac/old/DmgPress.png | Bin 54041 -> 0 bytes installer/mac/old/Platypus drop settings.png | Bin 93044 -> 0 bytes pdf-over-gui/pom.xml | 27 ++++++ .../main/resources/installer-mac/background.png | Bin 0 -> 2389 bytes .../src/main/resources/installer-mac/signscript.sh | 62 ++++++++++++++ 12 files changed, 89 insertions(+), 116 deletions(-) delete mode 100644 installer/README.txt delete mode 100644 installer/mac/PDF-Over.platypus delete mode 100644 installer/mac/Platypus-drop-setting.png delete mode 100644 installer/mac/Platypus.png delete mode 100644 installer/mac/background.png delete mode 100644 installer/mac/old/Background.png delete mode 100644 installer/mac/old/DmgPress Package.png delete mode 100644 installer/mac/old/DmgPress.png delete mode 100644 installer/mac/old/Platypus drop settings.png create mode 100644 pdf-over-gui/src/main/resources/installer-mac/background.png create mode 100644 pdf-over-gui/src/main/resources/installer-mac/signscript.sh 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 @@ - - - - - AcceptsFiles - - AcceptsText - - Authentication - - Author - A-SIT - BundledFiles - - /Users/TestMac/Documents/Contents/icons - /Users/TestMac/Documents/Contents/lib - - Creator - Platypus-4.7 - DeclareService - - Destination - /Users/TestMac/Desktop/MyPlatypusApp.app - DestinationOverride - - DevelopmentVersion - - DocIcon - - Droppable - - ExecutablePath - /usr/local/share/platypus/ScriptExec - FileTypes - - fold - PDF - - IconPath - /Users/TestMac/Documents/Contents/icons/icon.icns - Identifier - at.a-sit.PDF-Over - Interpreter - /bin/sh - InterpreterArgs - - Name - PDF-Over - NibPath - /usr/local/share/platypus/MainMenu.nib - OptimizeApplication - - Output - None - RemainRunning - - Role - Viewer - ScriptArgs - - ScriptPath - /Users/TestMac/Documents/Contents/scripts/pdf-over_mac.sh - Secure - - ShowInDock - - StatusItemDisplayType - Text - StatusItemIcon - - - StatusItemTitle - MyPlatypusApp - Suffixes - - * - - TextBackground - #ffffff - TextEncoding - 4 - TextFont - Monaco - TextForeground - #000000 - TextSize - 10 - UseXMLPlistFormat - - Version - 4.0.2 - - diff --git a/installer/mac/Platypus-drop-setting.png b/installer/mac/Platypus-drop-setting.png deleted file mode 100644 index 84640687..00000000 Binary files a/installer/mac/Platypus-drop-setting.png and /dev/null differ diff --git a/installer/mac/Platypus.png b/installer/mac/Platypus.png deleted file mode 100644 index 20a28830..00000000 Binary files a/installer/mac/Platypus.png and /dev/null differ diff --git a/installer/mac/background.png b/installer/mac/background.png deleted file mode 100644 index 0d6edaf3..00000000 Binary files a/installer/mac/background.png and /dev/null differ diff --git a/installer/mac/old/Background.png b/installer/mac/old/Background.png deleted file mode 100644 index 5a8aeefa..00000000 Binary files a/installer/mac/old/Background.png and /dev/null differ diff --git a/installer/mac/old/DmgPress Package.png b/installer/mac/old/DmgPress Package.png deleted file mode 100644 index a92114b8..00000000 Binary files a/installer/mac/old/DmgPress Package.png and /dev/null differ diff --git a/installer/mac/old/DmgPress.png b/installer/mac/old/DmgPress.png deleted file mode 100644 index 0e19960a..00000000 Binary files a/installer/mac/old/DmgPress.png and /dev/null differ diff --git a/installer/mac/old/Platypus drop settings.png b/installer/mac/old/Platypus drop settings.png deleted file mode 100644 index d3ece52a..00000000 Binary files a/installer/mac/old/Platypus drop settings.png and /dev/null differ 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 @@ src/main/resources + installer-mac/* izpack-linux/* scripts/* ReadMe.txt @@ -649,6 +650,32 @@ mac pdf-over_mac-x86_64.zip + + + + maven-resources-plugin + 2.4.2 + + + copy-mac-resources + validate + + copy-resources + + + UTF-8 + ${pdfover-build.staging-dir} + + + src/main/resources/installer-mac + + + + + + + + mac-aarch64 diff --git a/pdf-over-gui/src/main/resources/installer-mac/background.png b/pdf-over-gui/src/main/resources/installer-mac/background.png new file mode 100644 index 00000000..0d6edaf3 Binary files /dev/null and b/pdf-over-gui/src/main/resources/installer-mac/background.png differ 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}" -- cgit v1.2.3