Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
4c205b11
Unverified
Commit
4c205b11
authored
Jun 22, 2020
by
Don Gagne
Committed by
GitHub
Jun 22, 2020
Browse files
Merge pull request #8857 from DonLakeFlyer/CodeSignOff
Code signing off for now
parents
a525b20b
ace951d8
Changes
2
Hide whitespace changes
Inline
Side-by-side
.travis.yml
View file @
4c205b11
...
...
@@ -186,13 +186,13 @@ before_script:
fi
# Install signing cert into OSX keychain
-
if [[ "${SPEC}" = "macx-clang" ]]; then
-
if [[ "${SPEC}" = "macx-clang"
&& "${TRAVIS_PULL_REQUEST}" = "false"
]]; then
export CODESIGN=codesign;
fi
-
if [[ "${SPEC}" = "macx-clang" ]]; then
-
if [[ "${SPEC}" = "macx-clang"
&& "${TRAVIS_PULL_REQUEST}" = "false"
]]; then
openssl aes-256-cbc -K $MAC_CERT_KEY -iv $MAC_CERT_IV -in deploy/MacCertificates.p12.enc -out deploy/MacCertificates.p12 -d;
fi
-
if [[ "${SPEC}" = "macx-clang" ]]; then
-
if [[ "${SPEC}" = "macx-clang"
&& "${TRAVIS_PULL_REQUEST}" = "false"
]]; then
source deploy/MacImportCert.sh;
fi
...
...
QGCPostLinkInstaller.pri
View file @
4c205b11
...
...
@@ -32,8 +32,9 @@ installer {
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
# Disabled for now since it's not working correctly yet
#QMAKE_POST_LINK += && echo codesign
#QMAKE_POST_LINK += && codesign --deep $${TARGET}.app -s WQREC9W69J
}
# Create package
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment