diff --git a/.travis.yml b/.travis.yml index 069ad6aedd263df81d9abe7000ceaefd5851423f..d4fbc60738d39e27405496ec4be376dbc4103928 100644 --- a/.travis.yml +++ b/.travis.yml @@ -186,6 +186,12 @@ before_script: git fetch --tags origin master && ./tools/update_android_version.sh ${BITNESS} ${TRAVIS_BRANCH}; fi + + # Install signing cert into OSX keychain + - if [[ "${SPEC}" = "macx-clang" ]]; then + openssl aes-256-cbc -K $MAC_CERT_KEY -iv $MAC_CERT_IV -in deploy/MacCertificates.p12.enc -out deploy/MacCertificates.p12 -d && + ./deploy/MacImportCert.sh; + fi script: # run qmake @@ -197,7 +203,7 @@ script: echo "Daily build" && export STABLE_OR_DAILY=DailyBuild; fi - - qmake -r ${TRAVIS_BUILD_DIR}/qgroundcontrol.pro CONFIG+=${CONFIG} CONFIG+=${STABLE_OR_DAILY} -spec ${SPEC}; + - qmake -r ${TRAVIS_BUILD_DIR}/qgroundcontrol.pro CONFIG+=${CONFIG} CONFIG+=${STABLE_OR_DAILY} CONFIG+=codesign -spec ${SPEC}; # compile - if [ "${SPEC}" != "macx-ios-clang" ]; then diff --git a/QGCPostLinkInstaller.pri b/QGCPostLinkInstaller.pri index cbe1480fa2813c06ae2cc3ac1dceb6c4b3e1ef46..1acf8de05aa3ac1df04ee8dbbc91ecb711bbebd4 100644 --- a/QGCPostLinkInstaller.pri +++ b/QGCPostLinkInstaller.pri @@ -31,6 +31,11 @@ installer { QMAKE_POST_LINK += && echo osxrelocator QMAKE_POST_LINK += && python $$SOURCE_DIR/tools/osxrelocator.py $${TARGET}.app/Contents @rpath @executable_path/../Frameworks -r > /dev/null 2>&1 + codesign { + QMAKE_POST_LINK += && echo codesign + QMAKE_POST_LINK += && codesign --deep $${TARGET}.app -s WQREC9W69J + } + # Create package QMAKE_POST_LINK += && echo hdiutil QMAKE_POST_LINK += && mkdir -p package diff --git a/deploy/MacCertificates.p12.enc b/deploy/MacCertificates.p12.enc new file mode 100644 index 0000000000000000000000000000000000000000..0c4db32a58262e7d6a7af4b6722a2ceafbdfba9c Binary files /dev/null and b/deploy/MacCertificates.p12.enc differ diff --git a/deploy/MacImportCert.sh b/deploy/MacImportCert.sh new file mode 100644 index 0000000000000000000000000000000000000000..5db49fcd60fa4f2675e83c1762909ea9b7a7c4cd --- /dev/null +++ b/deploy/MacImportCert.sh @@ -0,0 +1,9 @@ +#!/bin/sh +KEY_CHAIN=mac-travis-build.keychain +security create-keychain -p travis $KEY_CHAIN +security default-keychain -s $KEY_CHAIN +security unlock-keychain -p travis $KEY_CHAIN +security set-keychain-settings -t 3600 -u $KEY_CHAIN +security import deploy/MacCertificates.p12 -k $KEY_CHAIN -P $MAC_CERT_PASSWORD -T /usr/bin/codesign +security set-key-partition-list -S apple-tool:,apple: -s -k travis $KEY_CHAIN +security list-keychains -s $KEY_CHAIN \ No newline at end of file