diff --git a/nymea-app.pro b/nymea-app.pro index 04d6bac0..72a2fc1c 100644 --- a/nymea-app.pro +++ b/nymea-app.pro @@ -59,7 +59,7 @@ QMAKE_EXTRA_TARGETS += wininstaller osxbundle.depends = nymea-app osxbundle.commands += cd nymea-app && rm -f ../*.dmg ../*pkg *.dmg || true && osxbundle.commands += hdiutil eject /Volumes/nymea-app || true && -osxbundle.commands += macdeployqt nymea-app.app -appstore-compliant -qmldir=$$top_srcdir/nymea-app/ui -dmg && +osxbundle.commands += macdeployqt nymea-app.app -appstore-compliant -qmldir=$$top_srcdir/nymea-app/ui -codesign="3rd Party Mac Developer Application" -dmg && osxbundle.commands += hdiutil convert nymea-app.dmg -format UDRW -o nymea-app_writable.dmg && osxbundle.commands += hdiutil attach -readwrite -noverify nymea-app_writable.dmg && sleep 2 && osxbundle.commands += mv /Volumes/nymea-app/nymea-app.app /Volumes/nymea-app/nymea\:app.app && @@ -67,10 +67,17 @@ osxbundle.commands += tar -xpf $$top_srcdir/packaging/osx/template.tar -C /Volum osxbundle.commands += hdiutil eject /Volumes/nymea-app && osxbundle.commands += hdiutil convert nymea-app_writable.dmg -format UDRO -o ../nymea-app-osx-bundle-$${APP_VERSION}.dmg && osxbundle.commands += rm nymea-app.dmg nymea-app_writable.dmg && -osxbundle.commands += rm -r nymea-app.app/Contents/Frameworks/QtWebEngineCore.framework && -osxbundle.commands += productbuild --component nymea-app.app /Applications ../nymea-app-$${APP_VERSION}.pkg QMAKE_EXTRA_TARGETS += osxbundle +# Create a .pkg osx installer. We're dropping the QtWebEngineCore framework as that's not app store compliant +# and we're using the WebView instead anyways. (IMHO a bug that macdeployqt -appstore-compliant even adds it) +osxinstaller.depends = osxbundle +osxinstaller.commands += cd nymea-app && +osxinstaller.commands += rm -r nymea-app.app/Contents/Frameworks/QtWebEngineCore.framework && +osxinstaller.commands += productbuild --component nymea-app.app /Applications ../nymea-app-$${APP_VERSION}.pkg && +osxinstaller.commands += productsign -s "3rd Party Mac Developer Installer" nymea-app-$${APP_VERSION}.pkg nymea-app-signed-$${APP_VERSION}.pkg +QMAKE_EXTRA_TARGETS += osxinstaller + # Generic linux desktop linux:!android: { desktopfile.files = packaging/linux-common/nymea-app.desktop diff --git a/nymea-app/nymea-app.pro b/nymea-app/nymea-app.pro index 1c9114a8..4404c5fa 100644 --- a/nymea-app/nymea-app.pro +++ b/nymea-app/nymea-app.pro @@ -97,7 +97,7 @@ macx: { OTHER_FILES += ../packaging/osx/Info.plist.in \ ../packaging/osx/nymea-app.entitlements - ICON = ../packaging/osx/icon.icns + ICON = ../packaging/osx/AppIcon.icns OSX_ENTITLEMENTS.name = CODE_SIGN_ENTITLEMENTS OSX_ENTITLEMENTS.value = $$files($$PWD/../packaging/ios/nymea-app.entitlements) diff --git a/packaging/osx/AppIcon.icns b/packaging/osx/AppIcon.icns new file mode 100644 index 00000000..4869c74c Binary files /dev/null and b/packaging/osx/AppIcon.icns differ diff --git a/packaging/osx/icon.icns b/packaging/osx/icon.icns deleted file mode 100644 index fe532714..00000000 Binary files a/packaging/osx/icon.icns and /dev/null differ