From ed4b37906749dd7ba2da56af741f2c0826f222d1 Mon Sep 17 00:00:00 2001 From: Aura Linden Date: Tue, 24 Jul 2012 12:11:20 -0700 Subject: Eliminated countFilesInDir boostified getCurPath for OSX --- indra/newview/tests/lldir_stub.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/tests/lldir_stub.cpp b/indra/newview/tests/lldir_stub.cpp index 18cf4e7419..288541b4fd 100644 --- a/indra/newview/tests/lldir_stub.cpp +++ b/indra/newview/tests/lldir_stub.cpp @@ -45,7 +45,6 @@ public: /*virtual*/ void initAppDirs(const std::string &app_name) {} /*virtual*/ std::string getCurPath() { return "CUR_PATH_FROM_LLDIR"; } - /*virtual*/ U32 countFilesInDir(const std::string &dirname, const std::string &mask) { return 42; } /*virtual*/ BOOL getNextFileInDir(const std::string &dirname, const std::string &mask, std::string &fname, BOOL wrap) { fname = fname + "_NEXT"; return false; } /*virtual*/ void getRandomFileInDir(const std::string &dirname, const std::string &mask, std::string &fname) { fname = "RANDOM_FILE"; } /*virtual*/ BOOL fileExists(const std::string &filename) const { return false; } -- cgit v1.2.3 From 1154d5afde0730b541716587ca3c5b962dba1b8d Mon Sep 17 00:00:00 2001 From: Aura Linden Date: Wed, 25 Jul 2012 16:08:27 -0700 Subject: Reverted boost/cocoa changes to purely Mountain Lion fixes. --- indra/newview/tests/lldir_stub.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview') diff --git a/indra/newview/tests/lldir_stub.cpp b/indra/newview/tests/lldir_stub.cpp index 288541b4fd..18cf4e7419 100644 --- a/indra/newview/tests/lldir_stub.cpp +++ b/indra/newview/tests/lldir_stub.cpp @@ -45,6 +45,7 @@ public: /*virtual*/ void initAppDirs(const std::string &app_name) {} /*virtual*/ std::string getCurPath() { return "CUR_PATH_FROM_LLDIR"; } + /*virtual*/ U32 countFilesInDir(const std::string &dirname, const std::string &mask) { return 42; } /*virtual*/ BOOL getNextFileInDir(const std::string &dirname, const std::string &mask, std::string &fname, BOOL wrap) { fname = fname + "_NEXT"; return false; } /*virtual*/ void getRandomFileInDir(const std::string &dirname, const std::string &mask, std::string &fname) { fname = "RANDOM_FILE"; } /*virtual*/ BOOL fileExists(const std::string &filename) const { return false; } -- cgit v1.2.3 From 78854c9baa4528943a0b399bca38b7f6dd446000 Mon Sep 17 00:00:00 2001 From: callum_linden Date: Wed, 25 Jul 2012 16:42:37 -0700 Subject: Fix to build with code signing option (patch from STORM-1900) --- indra/newview/CMakeLists.txt | 7 +++++++ indra/newview/viewer_manifest.py | 10 ++++++++++ 2 files changed, 17 insertions(+) (limited to 'indra/newview') diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 9783601696..3ce40187b0 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1900,6 +1900,12 @@ if (DARWIN) ) add_dependencies(${VIEWER_BINARY_NAME} SLPlugin media_plugin_quicktime media_plugin_webkit mac-updater mac-crash-logger) + + if (ENABLE_SIGNING) + set(SIGNING_SETTING "--signature=${SIGNING_IDENTITY}") + else (ENABLE_SIGNING) + set(SIGNING_SETTING "") + endif (ENABLE_SIGNING) if (PACKAGE) add_custom_target(package ALL DEPENDS ${VIEWER_BINARY_NAME}) @@ -1919,6 +1925,7 @@ if (DARWIN) --login_channel=${VIEWER_LOGIN_CHANNEL} --source=${CMAKE_CURRENT_SOURCE_DIR} --touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/.${product}.touched + ${SIGNING_SETTING} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py ) diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index d1c952ac3b..587d708e86 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -816,6 +816,16 @@ class DarwinManifest(ViewerManifest): self.run_command("chmod +x %r" % os.path.join(self.get_dst_prefix(), script)) def package_finish(self): + # Sign the app if requested. + if 'signature' in self.args: + 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() + }) + channel_standin = 'Second Life Viewer' # hah, our default channel is not usable on its own if not self.default_channel(): channel_standin = self.channel() -- cgit v1.2.3 From b8ccedc8795df40d0c0407ed051068b19fb3a78c Mon Sep 17 00:00:00 2001 From: callum_linden Date: Tue, 7 Aug 2012 13:56:26 -0700 Subject: Read password for developer keychain from build-secrets repo and use it to unlock keychain. Only unlock and code sign if running under Team City. --- indra/newview/viewer_manifest.py | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 587d708e86..5fea98f5e9 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() -- cgit v1.2.3 From 811c466c6bb0e0bb31a6d6b92cd938fe2b59f552 Mon Sep 17 00:00:00 2001 From: callum_linden Date: Wed, 15 Aug 2012 15:51:41 -0700 Subject: Changed name of keychain to match setup instructions --- indra/newview/viewer_manifest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index ce0e48e18f..0dc7b94d1e 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -833,7 +833,7 @@ class DarwinManifest(ViewerManifest): 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('security unlock-keychain -p "%s" "%s/Library/Keychains/viewer.keychain"' % ( keychain_pwd, home_path ) ) self.run_command('codesign --force --sign --verboose %(identity)r %(bundle)r' % { 'identity': identity, 'bundle': self.get_dst_prefix() -- cgit v1.2.3 From f586a441cab0b27fd69cc6dfcf354e3da927d1c5 Mon Sep 17 00:00:00 2001 From: callumprentice Date: Wed, 15 Aug 2012 19:18:52 -0700 Subject: silly typo - change language from dutch to english :) --- indra/newview/viewer_manifest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 0dc7b94d1e..80107d5776 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -834,7 +834,7 @@ class DarwinManifest(ViewerManifest): keychain_pwd = open(keychain_pwd_path).read().rstrip() self.run_command('security unlock-keychain -p "%s" "%s/Library/Keychains/viewer.keychain"' % ( keychain_pwd, home_path ) ) - self.run_command('codesign --force --sign --verboose %(identity)r %(bundle)r' % { + self.run_command('codesign --force --sign --verbose %(identity)r %(bundle)r' % { 'identity': identity, 'bundle': self.get_dst_prefix() }) -- cgit v1.2.3 From d400bc2a3fd30a446d00243e219e183697a610a5 Mon Sep 17 00:00:00 2001 From: callumprentice Date: Wed, 15 Aug 2012 20:04:10 -0700 Subject: Add explicit reference to keychain to use --- indra/newview/viewer_manifest.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 80107d5776..095a64ca77 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -834,7 +834,8 @@ class DarwinManifest(ViewerManifest): keychain_pwd = open(keychain_pwd_path).read().rstrip() self.run_command('security unlock-keychain -p "%s" "%s/Library/Keychains/viewer.keychain"' % ( keychain_pwd, home_path ) ) - self.run_command('codesign --force --sign --verbose %(identity)r %(bundle)r' % { + self.run_command('codesign --force --keychain '"%(home_path)/Library/Keychains/viewer.keychain"' --sign --verbose %(identity)r %(bundle)r' % {i + 'home_path' : home_path, 'identity': identity, 'bundle': self.get_dst_prefix() }) -- cgit v1.2.3 From f94a2966735445087cc44adf9b78476dae0e7d3d Mon Sep 17 00:00:00 2001 From: callumprentice Date: Thu, 16 Aug 2012 10:11:42 -0700 Subject: Silly typo fix --- indra/newview/viewer_manifest.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 095a64ca77..22e3d8208d 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -834,10 +834,10 @@ class DarwinManifest(ViewerManifest): keychain_pwd = open(keychain_pwd_path).read().rstrip() self.run_command('security unlock-keychain -p "%s" "%s/Library/Keychains/viewer.keychain"' % ( keychain_pwd, home_path ) ) - self.run_command('codesign --force --keychain '"%(home_path)/Library/Keychains/viewer.keychain"' --sign --verbose %(identity)r %(bundle)r' % {i + self.run_command('codesign --force --keychain '"%(home_path)/Library/Keychains/viewer.keychain"' --sign --verbose %(identity)r %(bundle)r' % { 'home_path' : home_path, 'identity': identity, - 'bundle': self.get_dst_prefix() + 'bundle': self.get_dst_prefix() }) channel_standin = 'Second Life Viewer' # hah, our default channel is not usable on its own -- cgit v1.2.3 From ed92d45a5a288798d3f1b47f88a5020bb3723f03 Mon Sep 17 00:00:00 2001 From: callumprentice Date: Thu, 16 Aug 2012 11:12:21 -0700 Subject: Silly Python 'string' fix --- indra/newview/viewer_manifest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 22e3d8208d..b096d126f4 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -834,7 +834,7 @@ class DarwinManifest(ViewerManifest): keychain_pwd = open(keychain_pwd_path).read().rstrip() self.run_command('security unlock-keychain -p "%s" "%s/Library/Keychains/viewer.keychain"' % ( keychain_pwd, home_path ) ) - self.run_command('codesign --force --keychain '"%(home_path)/Library/Keychains/viewer.keychain"' --sign --verbose %(identity)r %(bundle)r' % { + self.run_command('codesign --force --keychain "%(home_path)s/Library/Keychains/viewer.keychain" --sign --verbose %(identity)r %(bundle)r' % { 'home_path' : home_path, 'identity': identity, 'bundle': self.get_dst_prefix() -- cgit v1.2.3 From 48a964e5ddd3d2829fbed1e971d42175db0707bf Mon Sep 17 00:00:00 2001 From: callumprentice Date: Thu, 16 Aug 2012 11:48:51 -0700 Subject: Silly Python 'string' fix --- indra/newview/viewer_manifest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index b096d126f4..fd5f3bd031 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -834,7 +834,7 @@ class DarwinManifest(ViewerManifest): keychain_pwd = open(keychain_pwd_path).read().rstrip() self.run_command('security unlock-keychain -p "%s" "%s/Library/Keychains/viewer.keychain"' % ( keychain_pwd, home_path ) ) - self.run_command('codesign --force --keychain "%(home_path)s/Library/Keychains/viewer.keychain" --sign --verbose %(identity)r %(bundle)r' % { + self.run_command('codesign --verbose --force --keychain "%(home_path)s/Library/Keychains/viewer.keychain" --sign %(identity)r %(bundle)r' % { 'home_path' : home_path, 'identity': identity, 'bundle': self.get_dst_prefix() -- cgit v1.2.3 From 848ed9cb2fa6decee2d8d8c7993b204e2faa3661 Mon Sep 17 00:00:00 2001 From: callum_linden Date: Wed, 22 Aug 2012 12:58:08 -0700 Subject: Fix up white space to follow coding policy guidelines --- indra/newview/viewer_manifest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index fd5f3bd031..3c3aba23f8 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -816,7 +816,7 @@ class DarwinManifest(ViewerManifest): self.run_command("chmod +x %r" % os.path.join(self.get_dst_prefix(), script)) def package_finish(self): - # Sign the app if requested. + # Sign the app if requested. if 'signature' in self.args: identity = self.args['signature'] if identity == '': -- cgit v1.2.3