summaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
Diffstat (limited to 'packaging')
-rwxr-xr-xpackaging/macosx/make-package.sh10
-rw-r--r--packaging/macosx/sign39
2 files changed, 24 insertions, 25 deletions
diff --git a/packaging/macosx/make-package.sh b/packaging/macosx/make-package.sh
index 67e7c76c6..e820b1588 100755
--- a/packaging/macosx/make-package.sh
+++ b/packaging/macosx/make-package.sh
@@ -20,17 +20,17 @@ VERSION=$(./scripts/get-version linux)
# first build and install Subsurface and then clean up the staging area
-sudo rm -rf ./Subsurface.app
-make
-sudo make mac-deploy
-sudo install_name_tool -change /Users/hohndel/src/marble/install/libssrfmarblewidget.0.19.2.dylib @executable_path/../Frameworks/libssrfmarblewidget.0.19.2.dylib Subsurface.app/Contents/MacOS/Subsurface
+rm -rf ./Subsurface.app
+make -j8
+make mac-deploy
+install_name_tool -change /Users/hohndel/src/marble/install/libssrfmarblewidget.0.19.2.dylib @executable_path/../Frameworks/libssrfmarblewidget.0.19.2.dylib Subsurface.app/Contents/MacOS/Subsurface
# copy things into staging so we can create a nice DMG
rm -rf ./staging
mkdir ./staging
cp -a ./Subsurface.app ./staging
-sudo sh ./packaging/macosx/sign
+sh ./packaging/macosx/sign
if [ -f ./Subsurface-$VERSION.dmg ]; then
rm ./Subsurface-$VERSION.dmg.bak
diff --git a/packaging/macosx/sign b/packaging/macosx/sign
index 73f60be4a..916600869 100644
--- a/packaging/macosx/sign
+++ b/packaging/macosx/sign
@@ -7,26 +7,25 @@ cd staging
echo -- signing Qt frameworks
-codesign --keychain /Users/hohndel/Library/Keychains/login.keychain -s Dirk ./Subsurface.app//Contents/Frameworks/QtConcurrent.framework/Versions/5/QtConcurrent
-codesign --keychain /Users/hohndel/Library/Keychains/login.keychain -s Dirk ./Subsurface.app//Contents/Frameworks/QtCore.framework/Versions/5/QtCore
-codesign --keychain /Users/hohndel/Library/Keychains/login.keychain -s Dirk ./Subsurface.app//Contents/Frameworks/QtGui.framework/Versions/5/QtGui
-codesign --keychain /Users/hohndel/Library/Keychains/login.keychain -s Dirk ./Subsurface.app//Contents/Frameworks/QtMultimedia.framework/Versions/5/QtMultimedia
-codesign --keychain /Users/hohndel/Library/Keychains/login.keychain -s Dirk ./Subsurface.app//Contents/Frameworks/QtMultimediaWidgets.framework/Versions/5/QtMultimediaWidgets
-codesign --keychain /Users/hohndel/Library/Keychains/login.keychain -s Dirk ./Subsurface.app//Contents/Frameworks/QtNetwork.framework/Versions/5/QtNetwork
-codesign --keychain /Users/hohndel/Library/Keychains/login.keychain -s Dirk ./Subsurface.app//Contents/Frameworks/QtOpenGL.framework/Versions/5/QtOpenGL
-codesign --keychain /Users/hohndel/Library/Keychains/login.keychain -s Dirk ./Subsurface.app//Contents/Frameworks/QtPositioning.framework/Versions/5/QtPositioning
-codesign --keychain /Users/hohndel/Library/Keychains/login.keychain -s Dirk ./Subsurface.app//Contents/Frameworks/QtPrintSupport.framework/Versions/5/QtPrintSupport
-codesign --keychain /Users/hohndel/Library/Keychains/login.keychain -s Dirk ./Subsurface.app//Contents/Frameworks/QtQml.framework/Versions/5/QtQml
-codesign --keychain /Users/hohndel/Library/Keychains/login.keychain -s Dirk ./Subsurface.app//Contents/Frameworks/QtQuick.framework/Versions/5/QtQuick
-codesign --keychain /Users/hohndel/Library/Keychains/login.keychain -s Dirk ./Subsurface.app//Contents/Frameworks/QtScript.framework/Versions/5/QtScript
-codesign --keychain /Users/hohndel/Library/Keychains/login.keychain -s Dirk ./Subsurface.app//Contents/Frameworks/QtSensors.framework/Versions/5/QtSensors
-codesign --keychain /Users/hohndel/Library/Keychains/login.keychain -s Dirk ./Subsurface.app//Contents/Frameworks/QtSql.framework/Versions/5/QtSql
-codesign --keychain /Users/hohndel/Library/Keychains/login.keychain -s Dirk ./Subsurface.app//Contents/Frameworks/QtSvg.framework/Versions/5/QtSvg
-codesign --keychain /Users/hohndel/Library/Keychains/login.keychain -s Dirk ./Subsurface.app//Contents/Frameworks/QtWebKit.framework/Versions/5/QtWebKit
-codesign --keychain /Users/hohndel/Library/Keychains/login.keychain -s Dirk ./Subsurface.app//Contents/Frameworks/QtWebKitWidgets.framework/Versions/5/QtWebKitWidgets
-codesign --keychain /Users/hohndel/Library/Keychains/login.keychain -s Dirk ./Subsurface.app//Contents/Frameworks/QtWidgets.framework/Versions/5/QtWidgets
-codesign --keychain /Users/hohndel/Library/Keychains/login.keychain -s Dirk ./Subsurface.app//Contents/Frameworks/QtXmlPatterns.framework/Versions/5/QtXMLPatterns
-
+codesign --keychain /Users/hohndel/Library/Keychains/login.keychain -s Dirk ./Subsurface.app//Contents/Frameworks/QtConcurrent.framework/Versions/5/QtConcurrent \
+ ./Subsurface.app//Contents/Frameworks/QtCore.framework/Versions/5/QtCore \
+ ./Subsurface.app//Contents/Frameworks/QtGui.framework/Versions/5/QtGui \
+ ./Subsurface.app//Contents/Frameworks/QtMultimedia.framework/Versions/5/QtMultimedia \
+ ./Subsurface.app//Contents/Frameworks/QtMultimediaWidgets.framework/Versions/5/QtMultimediaWidgets \
+ ./Subsurface.app//Contents/Frameworks/QtNetwork.framework/Versions/5/QtNetwork \
+ ./Subsurface.app//Contents/Frameworks/QtOpenGL.framework/Versions/5/QtOpenGL \
+ ./Subsurface.app//Contents/Frameworks/QtPositioning.framework/Versions/5/QtPositioning \
+ ./Subsurface.app//Contents/Frameworks/QtPrintSupport.framework/Versions/5/QtPrintSupport \
+ ./Subsurface.app//Contents/Frameworks/QtQml.framework/Versions/5/QtQml \
+ ./Subsurface.app//Contents/Frameworks/QtQuick.framework/Versions/5/QtQuick \
+ ./Subsurface.app//Contents/Frameworks/QtScript.framework/Versions/5/QtScript \
+ ./Subsurface.app//Contents/Frameworks/QtSensors.framework/Versions/5/QtSensors \
+ ./Subsurface.app//Contents/Frameworks/QtSql.framework/Versions/5/QtSql \
+ ./Subsurface.app//Contents/Frameworks/QtSvg.framework/Versions/5/QtSvg \
+ ./Subsurface.app//Contents/Frameworks/QtWebKit.framework/Versions/5/QtWebKit \
+ ./Subsurface.app//Contents/Frameworks/QtWebKitWidgets.framework/Versions/5/QtWebKitWidgets \
+ ./Subsurface.app//Contents/Frameworks/QtWidgets.framework/Versions/5/QtWidgets \
+ ./Subsurface.app//Contents/Frameworks/QtXmlPatterns.framework/Versions/5/QtXMLPatterns
echo -- signing plugins
find ./Subsurface.app/Contents/PlugIns -name \*.dylib | xargs codesign --keychain /Users/hohndel/Library/Keychains/login.keychain -s Dirk