diff options
| author | Aura Linden <aura@lindenlab.com> | 2012-08-08 11:36:10 -0700 |
|---|---|---|
| committer | Aura Linden <aura@lindenlab.com> | 2012-08-08 11:36:10 -0700 |
| commit | 6f1be0007b53522374dcce52d542709c3906b824 (patch) | |
| tree | cd46d6940ef8c659399527eb47ba59686d8292c5 | |
| parent | 3e9c9993e3547acd8a9840ecce547066df0ccc34 (diff) | |
| parent | b0843fc14a3edd8cab090457f60100b00165e06a (diff) | |
Pulled merge, changed . to , in viewer-manifest
| -rw-r--r-- | indra/cmake/00-Common.cmake | 2 | ||||
| -rw-r--r-- | indra/newview/viewer_manifest.py | 23 |
2 files changed, 20 insertions, 5 deletions
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 00baf626d2..6896d050fb 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -206,6 +206,8 @@ if (DARWIN) # NOTE: it's critical to have both CXX_FLAGS and C_FLAGS covered. set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O0 ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}") set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O0 ${CMAKE_C_FLAGS_RELWITHDEBINFO}") + set(ENABLE_SIGNING TRUE) + set(SIGNING_IDENTITY "Developer ID Application: Linden Research, Inc.") endif (DARWIN) diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 587d708e86..ce0e48e18f 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -821,11 +821,24 @@ class DarwinManifest(ViewerManifest): identity = self.args['signature'] if identity == '': identity = 'Developer ID Application' - self.run_command('codesign --force --sign %(identity)r %(bundle)r' % { - 'identity': identity, - 'bundle': self.get_dst_prefix() - }) - + + # Look for an environment variable set via build.sh when running in Team City. + try: + build_secrets_checkout = os.environ['build_secrets_checkout'] + except KeyError: + pass + else: + # variable found so use it to unlock keyvchain followed by codesign + home_path = os.environ['HOME'] + keychain_pwd_path = os.path.join(build_secrets_checkout,'code-signing-osx','password.txt') + keychain_pwd = open(keychain_pwd_path).read().rstrip() + + self.run_command('security unlock-keychain -p "%s" "%s/Library/Keychains/developer.keychain"' % ( keychain_pwd, home_path ) ) + self.run_command('codesign --force --sign --verboose %(identity)r %(bundle)r' % { + 'identity': identity, + 'bundle': self.get_dst_prefix() + }) + channel_standin = 'Second Life Viewer' # hah, our default channel is not usable on its own if not self.default_channel(): channel_standin = self.channel() |