From 35eda06ae47255f4d4ba15ab7e3df443c1c39a6e Mon Sep 17 00:00:00 2001 From: Aura Linden Date: Wed, 18 Jul 2012 17:35:10 -0700 Subject: llglheader include change for building on Lion --- indra/llrender/llglheaders.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/indra/llrender/llglheaders.h b/indra/llrender/llglheaders.h index a0727b8686..d93f464502 100644 --- a/indra/llrender/llglheaders.h +++ b/indra/llrender/llglheaders.h @@ -993,7 +993,12 @@ extern void glGetBufferPointervARB (GLenum, GLenum, GLvoid* *); } #endif +#ifdef MAC_OS_VERSION_10_7 +#include +#else #include +#endif + #endif // LL_MESA / LL_WINDOWS / LL_DARWIN -- cgit v1.2.3 From d2e67d0c0bc6e379a4241abf814f9e13a830ad31 Mon Sep 17 00:00:00 2001 From: Aura Linden Date: Wed, 18 Jul 2012 19:01:19 -0700 Subject: cmake changes for OSX 10.7 --- indra/cmake/Variables.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake index 4cbf7aa043..dd177ef222 100644 --- a/indra/cmake/Variables.cmake +++ b/indra/cmake/Variables.cmake @@ -100,9 +100,9 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") set(DARWIN 1) # To support a different SDK update these Xcode settings: - set(CMAKE_OSX_DEPLOYMENT_TARGET 10.5) - set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.5.sdk) - set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "4.0") + set(CMAKE_OSX_DEPLOYMENT_TARGET 10.6) + set(CMAKE_OSX_SYSROOT macosx10.6) + set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvmgcc42") set(CMAKE_XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT dwarf-with-dsym) # NOTE: To attempt an i386/PPC Universal build, add this on the configure line: -- cgit v1.2.3 From 5624f03b9c49624ab6360f735e7fca90c365d8c1 Mon Sep 17 00:00:00 2001 From: Aura Linden Date: Mon, 23 Jul 2012 12:34:02 -0700 Subject: Changed CMake to work for older and newer versions of OSX --- indra/cmake/Variables.cmake | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake index dd177ef222..4bd980f9db 100644 --- a/indra/cmake/Variables.cmake +++ b/indra/cmake/Variables.cmake @@ -99,10 +99,21 @@ endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux") if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") set(DARWIN 1) + execute_process( + COMMAND sh -c "sw_vers -productVersion | cut -d'.' -f1-2" + OUTPUT_VARIABLE DARWIN_VERSION ) + # To support a different SDK update these Xcode settings: - set(CMAKE_OSX_DEPLOYMENT_TARGET 10.6) - set(CMAKE_OSX_SYSROOT macosx10.6) - set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvmgcc42") + if (DARWIN_VERSION GREATER 10.6) + set(CMAKE_OSX_DEPLOYMENT_TARGET 10.6) + set(CMAKE_OSX_SYSROOT macosx10.6) + set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvmgcc42") + else (DARWIN_VERSION GREATER 10.6) + set(CMAKE_OSX_DEPLOYMENT_TARGET 10.5) + set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.5.sdk) + set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "4.0") + endif (DARWIN_VERSION GREATER 10.6) + set(CMAKE_XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT dwarf-with-dsym) # NOTE: To attempt an i386/PPC Universal build, add this on the configure line: -- cgit v1.2.3 From 629ae69793f98c1c92c08b1d657e94306fb920e7 Mon Sep 17 00:00:00 2001 From: Aura Linden Date: Mon, 23 Jul 2012 13:09:26 -0700 Subject: Make build dependent on version of xcode, not version of OSX for DARWIN --- indra/cmake/Variables.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake index 4bd980f9db..e9837a7bf1 100644 --- a/indra/cmake/Variables.cmake +++ b/indra/cmake/Variables.cmake @@ -100,19 +100,19 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") set(DARWIN 1) execute_process( - COMMAND sh -c "sw_vers -productVersion | cut -d'.' -f1-2" - OUTPUT_VARIABLE DARWIN_VERSION ) + COMMAND sh -c "xcodebuild -version | grep Xcode | cut -d ' ' -f2 | cut -d'.' -f1-2" + OUTPUT_VARIABLE XCODE_VERSION ) # To support a different SDK update these Xcode settings: - if (DARWIN_VERSION GREATER 10.6) + if (XCODE_VERSION GREATER 4.2) set(CMAKE_OSX_DEPLOYMENT_TARGET 10.6) set(CMAKE_OSX_SYSROOT macosx10.6) set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvmgcc42") - else (DARWIN_VERSION GREATER 10.6) + else (XCODE_VERSION GREATER 4.2) set(CMAKE_OSX_DEPLOYMENT_TARGET 10.5) set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.5.sdk) set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "4.0") - endif (DARWIN_VERSION GREATER 10.6) + endif (XCODE_VERSION GREATER 4.2) set(CMAKE_XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT dwarf-with-dsym) -- cgit v1.2.3 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/llvfs/lldir.h | 2 -- indra/llvfs/lldir_mac.cpp | 25 ++-------------------- indra/llvfs/lldir_mac.h | 1 - indra/newview/tests/lldir_stub.cpp | 1 - .../updater/tests/llupdaterservice_test.cpp | 4 ---- 5 files changed, 2 insertions(+), 31 deletions(-) diff --git a/indra/llvfs/lldir.h b/indra/llvfs/lldir.h index 5ee8bdb542..a8b204e63e 100644 --- a/indra/llvfs/lldir.h +++ b/indra/llvfs/lldir.h @@ -73,8 +73,6 @@ class LLDir virtual S32 deleteFilesInDir(const std::string &dirname, const std::string &mask); // pure virtual functions - virtual U32 countFilesInDir(const std::string &dirname, const std::string &mask) = 0; - virtual std::string getCurPath() = 0; virtual BOOL fileExists(const std::string &filename) const = 0; diff --git a/indra/llvfs/lldir_mac.cpp b/indra/llvfs/lldir_mac.cpp index 489bc3e4a7..f0b46ade6d 100644 --- a/indra/llvfs/lldir_mac.cpp +++ b/indra/llvfs/lldir_mac.cpp @@ -35,6 +35,7 @@ #include #include #include +#include #include @@ -239,34 +240,12 @@ void LLDir_Mac::initAppDirs(const std::string &app_name, //dumpCurrentDirectories(); } -U32 LLDir_Mac::countFilesInDir(const std::string &dirname, const std::string &mask) -{ - U32 file_count = 0; - glob_t g; - - std::string tmp_str; - tmp_str = dirname; - tmp_str += mask; - - if(glob(tmp_str.c_str(), GLOB_NOSORT, NULL, &g) == 0) - { - file_count = g.gl_pathc; - - globfree(&g); - } - - return (file_count); -} - std::string LLDir_Mac::getCurPath() { - char tmp_str[LL_MAX_PATH]; /* Flawfinder: ignore */ - getcwd(tmp_str, LL_MAX_PATH); - return tmp_str; + return boost::filesystem::path( boost::filesystem::current_path() ).string(); } - BOOL LLDir_Mac::fileExists(const std::string &filename) const { struct stat stat_data; diff --git a/indra/llvfs/lldir_mac.h b/indra/llvfs/lldir_mac.h index d190d70be4..9f1938ae23 100644 --- a/indra/llvfs/lldir_mac.h +++ b/indra/llvfs/lldir_mac.h @@ -45,7 +45,6 @@ public: const std::string& app_read_only_data_dir); virtual std::string getCurPath(); - virtual U32 countFilesInDir(const std::string &dirname, const std::string &mask); virtual BOOL fileExists(const std::string &filename) const; /*virtual*/ std::string getLLPluginLauncher(); 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; } diff --git a/indra/viewer_components/updater/tests/llupdaterservice_test.cpp b/indra/viewer_components/updater/tests/llupdaterservice_test.cpp index e19d5724f1..6f67fd0da0 100644 --- a/indra/viewer_components/updater/tests/llupdaterservice_test.cpp +++ b/indra/viewer_components/updater/tests/llupdaterservice_test.cpp @@ -54,10 +54,6 @@ class LLDir_Mock : public LLDir { void initAppDirs(const std::string &app_name, const std::string& app_read_only_data_dir = "") {} - U32 countFilesInDir(const std::string &dirname, const std::string &mask) - { - return 0; - } void getRandomFileInDir(const std::string &dirname, const std::string &mask, -- cgit v1.2.3 From a1d026889343b4745eeebffc85695bbcb2b93d64 Mon Sep 17 00:00:00 2001 From: Aura Linden Date: Tue, 24 Jul 2012 16:52:33 -0700 Subject: Minor improvement to identifying gl lib to use. Should use xcode version. --- indra/llrender/llglheaders.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/llrender/llglheaders.h b/indra/llrender/llglheaders.h index d93f464502..509de51f4d 100644 --- a/indra/llrender/llglheaders.h +++ b/indra/llrender/llglheaders.h @@ -993,7 +993,7 @@ extern void glGetBufferPointervARB (GLenum, GLenum, GLvoid* *); } #endif -#ifdef MAC_OS_VERSION_10_7 +#if __MAC_OS_X_VERSION_MAX_ALLOWED <= 1070 #include #else #include -- cgit v1.2.3 From 3b560d4c4902eff361ac308f56d982b1147739c4 Mon Sep 17 00:00:00 2001 From: Aura Linden Date: Wed, 25 Jul 2012 16:03:50 -0700 Subject: Some cocoa that doesn't work --- indra/llvfs/lldir_mac.cpp | 32 ++++++++++++++++---------------- indra/llvfs/lldir_mac.h | 5 ----- 2 files changed, 16 insertions(+), 21 deletions(-) diff --git a/indra/llvfs/lldir_mac.cpp b/indra/llvfs/lldir_mac.cpp index f0b46ade6d..de3347cf63 100644 --- a/indra/llvfs/lldir_mac.cpp +++ b/indra/llvfs/lldir_mac.cpp @@ -38,6 +38,21 @@ #include #include +//#include "lldir_mac.mm" +// +//std::string getApplicationSupportFolder () +//{ +// std::string support_folder_str; +// CFArrayRef a = appSupport(); +// if (CFArrayGetCount(a) > 0) { +// CFStringRef s = CFArrayGetValueAtIndex(a, 0); +// char path[PATH_MAX]; +// CFStringGetFileSystemRepresentation(s, path, sizeof(path)); +// support_folder_str = std::string(path); +// } +// CFRelease(a); +// return support_folder_str; +//} // -------------------------------------------------------------------------------- @@ -110,8 +125,6 @@ static void FSRefToLLString(FSRef *fsRef, std::string &llString) LLDir_Mac::LLDir_Mac() { mDirDelimiter = "/"; - mCurrentDirIndex = -1; - mCurrentDirCount = -1; CFBundleRef mainBundleRef = NULL; CFURLRef executableURLRef = NULL; @@ -236,8 +249,6 @@ void LLDir_Mac::initAppDirs(const std::string &app_name, mSkinBaseDir = mAppRODataDir + mDirDelimiter + "skins"; } mCAFile = getExpandedFilename(LL_PATH_APP_SETTINGS, "CA.pem"); - - //dumpCurrentDirectories(); } std::string LLDir_Mac::getCurPath() @@ -248,18 +259,7 @@ std::string LLDir_Mac::getCurPath() BOOL LLDir_Mac::fileExists(const std::string &filename) const { - struct stat stat_data; - // Check the age of the file - // Now, we see if the files we've gathered are recent... - int res = stat(filename.c_str(), &stat_data); - if (!res) - { - return TRUE; - } - else - { - return FALSE; - } + return boost::filesystem::exists(filename); } diff --git a/indra/llvfs/lldir_mac.h b/indra/llvfs/lldir_mac.h index 9f1938ae23..b8b9c6a9e7 100644 --- a/indra/llvfs/lldir_mac.h +++ b/indra/llvfs/lldir_mac.h @@ -49,11 +49,6 @@ public: /*virtual*/ std::string getLLPluginLauncher(); /*virtual*/ std::string getLLPluginFilename(std::string base_name); - -private: - int mCurrentDirIndex; - int mCurrentDirCount; - std::string mCurrentDir; }; #endif // LL_LLDIR_MAC_H -- 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/llvfs/lldir.h | 4 +- indra/llvfs/lldir_mac.cpp | 59 +++++++++++++++------- indra/llvfs/lldir_mac.h | 8 ++- indra/newview/tests/lldir_stub.cpp | 1 + .../updater/tests/llupdaterservice_test.cpp | 6 ++- 5 files changed, 56 insertions(+), 22 deletions(-) diff --git a/indra/llvfs/lldir.h b/indra/llvfs/lldir.h index a8b204e63e..3b1883b5d8 100644 --- a/indra/llvfs/lldir.h +++ b/indra/llvfs/lldir.h @@ -1,4 +1,4 @@ -/** +/** * @file lldir.h * @brief Definition of directory utilities class * @@ -73,6 +73,8 @@ class LLDir virtual S32 deleteFilesInDir(const std::string &dirname, const std::string &mask); // pure virtual functions + virtual U32 countFilesInDir(const std::string &dirname, const std::string &mask) = 0; + virtual std::string getCurPath() = 0; virtual BOOL fileExists(const std::string &filename) const = 0; diff --git a/indra/llvfs/lldir_mac.cpp b/indra/llvfs/lldir_mac.cpp index de3347cf63..9f60111275 100644 --- a/indra/llvfs/lldir_mac.cpp +++ b/indra/llvfs/lldir_mac.cpp @@ -22,7 +22,7 @@ * * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA * $/LicenseInfo$ - */ + */ #if LL_DARWIN @@ -35,24 +35,8 @@ #include #include #include -#include #include -//#include "lldir_mac.mm" -// -//std::string getApplicationSupportFolder () -//{ -// std::string support_folder_str; -// CFArrayRef a = appSupport(); -// if (CFArrayGetCount(a) > 0) { -// CFStringRef s = CFArrayGetValueAtIndex(a, 0); -// char path[PATH_MAX]; -// CFStringGetFileSystemRepresentation(s, path, sizeof(path)); -// support_folder_str = std::string(path); -// } -// CFRelease(a); -// return support_folder_str; -//} // -------------------------------------------------------------------------------- @@ -125,6 +109,8 @@ static void FSRefToLLString(FSRef *fsRef, std::string &llString) LLDir_Mac::LLDir_Mac() { mDirDelimiter = "/"; + mCurrentDirIndex = -1; + mCurrentDirCount = -1; CFBundleRef mainBundleRef = NULL; CFURLRef executableURLRef = NULL; @@ -249,17 +235,52 @@ void LLDir_Mac::initAppDirs(const std::string &app_name, mSkinBaseDir = mAppRODataDir + mDirDelimiter + "skins"; } mCAFile = getExpandedFilename(LL_PATH_APP_SETTINGS, "CA.pem"); + + //dumpCurrentDirectories(); +} + +U32 LLDir_Mac::countFilesInDir(const std::string &dirname, const std::string &mask) +{ + U32 file_count = 0; + glob_t g; + + std::string tmp_str; + tmp_str = dirname; + tmp_str += mask; + + if(glob(tmp_str.c_str(), GLOB_NOSORT, NULL, &g) == 0) + { + file_count = g.gl_pathc; + + globfree(&g); + } + + return (file_count); } std::string LLDir_Mac::getCurPath() { - return boost::filesystem::path( boost::filesystem::current_path() ).string(); + char tmp_str[LL_MAX_PATH]; /* Flawfinder: ignore */ + getcwd(tmp_str, LL_MAX_PATH); + return tmp_str; } + BOOL LLDir_Mac::fileExists(const std::string &filename) const { - return boost::filesystem::exists(filename); + struct stat stat_data; + // Check the age of the file + // Now, we see if the files we've gathered are recent... + int res = stat(filename.c_str(), &stat_data); + if (!res) + { + return TRUE; + } + else + { + return FALSE; + } } diff --git a/indra/llvfs/lldir_mac.h b/indra/llvfs/lldir_mac.h index b8b9c6a9e7..64e9485757 100644 --- a/indra/llvfs/lldir_mac.h +++ b/indra/llvfs/lldir_mac.h @@ -22,7 +22,7 @@ * * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA * $/LicenseInfo$ - */ + */ #if !LL_DARWIN #error This header must not be included when compiling for any target other than Mac OS. Consider including lldir.h instead. @@ -45,10 +45,16 @@ public: const std::string& app_read_only_data_dir); virtual std::string getCurPath(); + virtual U32 countFilesInDir(const std::string &dirname, const std::string &mask); virtual BOOL fileExists(const std::string &filename) const; /*virtual*/ std::string getLLPluginLauncher(); /*virtual*/ std::string getLLPluginFilename(std::string base_name); + +private: + int mCurrentDirIndex; + int mCurrentDirCount; + std::string mCurrentDir; }; #endif // LL_LLDIR_MAC_H 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; } diff --git a/indra/viewer_components/updater/tests/llupdaterservice_test.cpp b/indra/viewer_components/updater/tests/llupdaterservice_test.cpp index 6f67fd0da0..8ffb5cacc2 100644 --- a/indra/viewer_components/updater/tests/llupdaterservice_test.cpp +++ b/indra/viewer_components/updater/tests/llupdaterservice_test.cpp @@ -1,4 +1,4 @@ -/** +/** * @file llupdaterservice_test.cpp * @brief Tests of llupdaterservice.cpp. * @@ -54,6 +54,10 @@ class LLDir_Mock : public LLDir { void initAppDirs(const std::string &app_name, const std::string& app_read_only_data_dir = "") {} + U32 countFilesInDir(const std::string &dirname, const std::string &mask) + { + return 0; + } void getRandomFileInDir(const std::string &dirname, const std::string &mask, -- 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) --- doc/contributions.txt | 3 +++ indra/cmake/Variables.cmake | 3 +++ indra/lib/python/indra/util/llmanifest.py | 7 ++++++- indra/newview/CMakeLists.txt | 7 +++++++ indra/newview/viewer_manifest.py | 10 ++++++++++ 5 files changed, 29 insertions(+), 1 deletion(-) diff --git a/doc/contributions.txt b/doc/contributions.txt index df504e4a8a..7aa76e0003 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -400,6 +400,7 @@ Gaberoonie Zanzibar Ganymedes Costagravas Geenz Spad STORM-1823 + STORM-1900 Gene Frostbite GeneJ Composer Geneko Nemeth @@ -654,6 +655,8 @@ Kage Pixel VWR-11 Kagehi Kohn Kaimen Takahe +Katharine Berry + STORM-1900 Keklily Longfall Ken Lavender Ken March diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake index e9837a7bf1..df9755c0ec 100644 --- a/indra/cmake/Variables.cmake +++ b/indra/cmake/Variables.cmake @@ -145,6 +145,9 @@ set(VIEWER ON CACHE BOOL "Build Second Life viewer.") set(VIEWER_CHANNEL "LindenDeveloper" CACHE STRING "Viewer Channel Name") set(VIEWER_LOGIN_CHANNEL ${VIEWER_CHANNEL} CACHE STRING "Fake login channel for A/B Testing") +set(ENABLE_SIGNING OFF CACHE BOOL "Enable signing the viewer") +set(SIGNING_IDENTITY "" CACHE STRING "Specifies the signing identity to use, if necessary.") + set(VERSION_BUILD "0" CACHE STRING "Revision number passed in from the outside") set(STANDALONE OFF CACHE BOOL "Do not use Linden-supplied prebuilt libraries.") set(UNATTENDED OFF CACHE BOOL "Should be set to ON for building with VC Express editions.") diff --git a/indra/lib/python/indra/util/llmanifest.py b/indra/lib/python/indra/util/llmanifest.py index a4fb77357c..bfcb259709 100644 --- a/indra/lib/python/indra/util/llmanifest.py +++ b/indra/lib/python/indra/util/llmanifest.py @@ -167,7 +167,12 @@ ARGUMENTS=[ dict(name='version', description="""This specifies the version of Second Life that is being packaged up.""", - default=get_default_version) + default=get_default_version), + dict(name='signature', + description="""This specifies an identity to sign the viewer with, if any. + If no value is supplied, the default signature will be used, if any. Currently + only used on Mac OS X.""", + default=None) ] def usage(srctree=""): 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 1d950fad52bef2fbb0edd6846a6d7d1d3037b5d0 Mon Sep 17 00:00:00 2001 From: Aura Linden Date: Tue, 31 Jul 2012 17:14:37 -0700 Subject: For mac, viewers on 10.5 will pull mac_legacy rather than mac --- .../viewer_components/updater/llupdatechecker.cpp | 25 ++++++++++++++++------ indra/viewer_components/updater/llupdatechecker.h | 2 +- .../viewer_components/updater/llupdaterservice.cpp | 2 +- .../updater/tests/llupdaterservice_test.cpp | 2 +- 4 files changed, 22 insertions(+), 9 deletions(-) diff --git a/indra/viewer_components/updater/llupdatechecker.cpp b/indra/viewer_components/updater/llupdatechecker.cpp index c6aa9b0f11..4da774a5f6 100644 --- a/indra/viewer_components/updater/llupdatechecker.cpp +++ b/indra/viewer_components/updater/llupdatechecker.cpp @@ -30,7 +30,9 @@ #include "llsd.h" #include "llupdatechecker.h" #include "lluri.h" - +#if LL_DARWIN +#include +#endif #if LL_WINDOWS #pragma warning (disable : 4355) // 'this' used in initializer list: yes, intentionally @@ -55,7 +57,7 @@ class LLUpdateChecker::Implementation: public: Implementation(Client & client); ~Implementation(); - void check(std::string const & protocolVersion, std::string const & hostUrl, + void checkVersion(std::string const & protocolVersion, std::string const & hostUrl, std::string const & servicePath, std::string channel, std::string version); // Responder: @@ -91,10 +93,10 @@ LLUpdateChecker::LLUpdateChecker(LLUpdateChecker::Client & client): } -void LLUpdateChecker::check(std::string const & protocolVersion, std::string const & hostUrl, +void LLUpdateChecker::checkVersion(std::string const & protocolVersion, std::string const & hostUrl, std::string const & servicePath, std::string channel, std::string version) { - mImplementation->check(protocolVersion, hostUrl, servicePath, channel, version); + mImplementation->checkVersion(protocolVersion, hostUrl, servicePath, channel, version); } @@ -120,7 +122,7 @@ LLUpdateChecker::Implementation::~Implementation() } -void LLUpdateChecker::Implementation::check(std::string const & protocolVersion, std::string const & hostUrl, +void LLUpdateChecker::Implementation::checkVersion(std::string const & protocolVersion, std::string const & hostUrl, std::string const & servicePath, std::string channel, std::string version) { llassert(!mInProgress); @@ -179,7 +181,18 @@ std::string LLUpdateChecker::Implementation::buildUrl(std::string const & protoc #ifdef LL_WINDOWS static const char * platform = "win"; #elif LL_DARWIN - static const char * platform = "mac"; + long versMin; + Gestalt(gestaltSystemVersionMinor, &versMin); + + static const char *platform; + if (versMin == 5) //OS 10.5 + { + platform = "mac_legacy"; + } + else + { + platform = "mac"; + } #else static const char * platform = "lnx"; #endif diff --git a/indra/viewer_components/updater/llupdatechecker.h b/indra/viewer_components/updater/llupdatechecker.h index cea1f13647..d882169068 100644 --- a/indra/viewer_components/updater/llupdatechecker.h +++ b/indra/viewer_components/updater/llupdatechecker.h @@ -44,7 +44,7 @@ public: LLUpdateChecker(Client & client); // Check status of current app on the given host for the channel and version provided. - void check(std::string const & protocolVersion, std::string const & hostUrl, + void checkVersion(std::string const & protocolVersion, std::string const & hostUrl, std::string const & servicePath, std::string channel, std::string version); private: diff --git a/indra/viewer_components/updater/llupdaterservice.cpp b/indra/viewer_components/updater/llupdaterservice.cpp index 2e18218667..bc73c72ddc 100644 --- a/indra/viewer_components/updater/llupdaterservice.cpp +++ b/indra/viewer_components/updater/llupdaterservice.cpp @@ -509,7 +509,7 @@ bool LLUpdaterServiceImpl::onMainLoop(LLSD const & event) } else { - mUpdateChecker.check(mProtocolVersion, mUrl, mPath, mChannel, mVersion); + mUpdateChecker.checkVersion(mProtocolVersion, mUrl, mPath, mChannel, mVersion); setState(LLUpdaterService::CHECKING_FOR_UPDATE); } } diff --git a/indra/viewer_components/updater/tests/llupdaterservice_test.cpp b/indra/viewer_components/updater/tests/llupdaterservice_test.cpp index 8ffb5cacc2..7c016fecf9 100644 --- a/indra/viewer_components/updater/tests/llupdaterservice_test.cpp +++ b/indra/viewer_components/updater/tests/llupdaterservice_test.cpp @@ -44,7 +44,7 @@ *****************************************************************************/ LLUpdateChecker::LLUpdateChecker(LLUpdateChecker::Client & client) {} -void LLUpdateChecker::check(std::string const & protocolVersion, std::string const & hostUrl, +void LLUpdateChecker::checkVersion(std::string const & protocolVersion, std::string const & hostUrl, std::string const & servicePath, std::string channel, std::string version) {} LLUpdateDownloader::LLUpdateDownloader(Client & ) {} -- cgit v1.2.3 From 27d5547478a816bed87a0f3b0e275c26a2ef581d Mon Sep 17 00:00:00 2001 From: David Kaprielian Date: Wed, 1 Aug 2012 12:56:51 -0700 Subject: Added necessary signing information to autobuild.xml --- autobuild.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/autobuild.xml b/autobuild.xml index 9b564ddefc..bd441f5e5f 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -2125,6 +2125,8 @@ -configuration Release -project SecondLife.xcodeproj + -DENABLE_SIGNING:BOOL=YES + -DSIGNING_IDENTITY:STRING="Developer\ ID\ Application:\ Linden\ Research,\ Inc." configure @@ -2152,6 +2154,8 @@ -configuration Release -project SecondLife.xcodeproj + -DENABLE_SIGNING:BOOL=YES + -DSIGNING_IDENTITY:STRING="Developer\ ID\ Application:\ Linden\ Research,\ Inc." configure -- cgit v1.2.3 From 4ed9dfd47b9b22b4f777112a6b5d75de37cb0a78 Mon Sep 17 00:00:00 2001 From: David Kaprielian Date: Wed, 1 Aug 2012 16:25:56 -0700 Subject: Fixing up the string in the code sign flag. --- autobuild.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index bd441f5e5f..8238adc9a4 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -2126,7 +2126,7 @@ -configuration Release -project SecondLife.xcodeproj -DENABLE_SIGNING:BOOL=YES - -DSIGNING_IDENTITY:STRING="Developer\ ID\ Application:\ Linden\ Research,\ Inc." + -DSIGNING_IDENTITY:STRING="Developer ID Application: Linden Research, Inc." configure @@ -2155,7 +2155,7 @@ -configuration Release -project SecondLife.xcodeproj -DENABLE_SIGNING:BOOL=YES - -DSIGNING_IDENTITY:STRING="Developer\ ID\ Application:\ Linden\ Research,\ Inc." + -DSIGNING_IDENTITY:STRING="Developer ID Application: Linden Research, Inc." configure -- cgit v1.2.3 From 3971f3646de407839f4cd48f378a5fcbda564612 Mon Sep 17 00:00:00 2001 From: David Kaprielian Date: Fri, 3 Aug 2012 16:05:36 -0700 Subject: Stopping debug/relwithdebinfo builds in order to debug signing. --- BuildParams | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/BuildParams b/BuildParams index 3dd35c5863..037f708a94 100644 --- a/BuildParams +++ b/BuildParams @@ -8,6 +8,11 @@ Darwin.symbolfiles = "newview/Release/secondlife-symbols-darwin.tar.bz2" CYGWIN.symbolfiles = "newview/Release/secondlife-symbols-windows.tar.bz2" Linux.symbolfiles = "newview/secondlife-symbols-linux.tar.bz2" +build_Debug = false +build_RelWithDebInfo = false +build_Darwin_Debug = false +build_Darwin_RelWithDebInfo = false + # Use Public Upload Locations public_build = true -- cgit v1.2.3 From 9f2b86203a3493f8ed1aad9aa5298a75abacfa86 Mon Sep 17 00:00:00 2001 From: callumprentice Date: Mon, 6 Aug 2012 13:40:44 -0700 Subject: Removed (unworking) code signing parameters from autobuild (wrong place) Added them to correct place (Cmake config) --- autobuild.xml | 2 -- indra/cmake/00-Common.cmake | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 8238adc9a4..17fce69471 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -2125,8 +2125,6 @@ -configuration Release -project SecondLife.xcodeproj - -DENABLE_SIGNING:BOOL=YES - -DSIGNING_IDENTITY:STRING="Developer ID Application: Linden Research, Inc." configure 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) -- 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(-) 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 3e9c9993e3547acd8a9840ecce547066df0ccc34 Mon Sep 17 00:00:00 2001 From: Aura Linden Date: Wed, 8 Aug 2012 11:28:19 -0700 Subject: More optional config for 10.5 builds --- indra/cmake/Variables.cmake | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake index df9755c0ec..c117873d4c 100644 --- a/indra/cmake/Variables.cmake +++ b/indra/cmake/Variables.cmake @@ -145,8 +145,10 @@ set(VIEWER ON CACHE BOOL "Build Second Life viewer.") set(VIEWER_CHANNEL "LindenDeveloper" CACHE STRING "Viewer Channel Name") set(VIEWER_LOGIN_CHANNEL ${VIEWER_CHANNEL} CACHE STRING "Fake login channel for A/B Testing") -set(ENABLE_SIGNING OFF CACHE BOOL "Enable signing the viewer") -set(SIGNING_IDENTITY "" CACHE STRING "Specifies the signing identity to use, if necessary.") +if (XCODE_VERSION GREATER 4.2) + set(ENABLE_SIGNING OFF CACHE BOOL "Enable signing the viewer") + set(SIGNING_IDENTITY "" CACHE STRING "Specifies the signing identity to use, if necessary.") +endif (XCODE_VERSION GREATER 4.2) set(VERSION_BUILD "0" CACHE STRING "Revision number passed in from the outside") set(STANDALONE OFF CACHE BOOL "Do not use Linden-supplied prebuilt libraries.") -- cgit v1.2.3 From 75caf0c916d13eeb2a1df35a9a330484e155f44c Mon Sep 17 00:00:00 2001 From: Aura Linden Date: Wed, 8 Aug 2012 14:56:51 -0700 Subject: More optional signing stuff for 10.5 --- indra/cmake/00-Common.cmake | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 6896d050fb..563f8929a4 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -206,8 +206,10 @@ 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.") + if (XCODE_VERSION GREATER 4.2) + set(ENABLE_SIGNING TRUE) + set(SIGNING_IDENTITY "Developer ID Application: Linden Research, Inc.") + endif (XCODE_VERSION GREATER 4.2) endif (DARWIN) -- cgit v1.2.3 From b0c683344f9cee30f4dcd941a8f86cf4b763cc12 Mon Sep 17 00:00:00 2001 From: Aura Linden Date: Wed, 15 Aug 2012 12:49:42 -0700 Subject: 10.5 macs will begin looking for mac_legacy rather than mac --- .../viewer_components/updater/llupdatechecker.cpp | 25 ++++++++++++++++------ indra/viewer_components/updater/llupdatechecker.h | 2 +- .../viewer_components/updater/llupdaterservice.cpp | 2 +- .../updater/tests/llupdaterservice_test.cpp | 4 ++-- 4 files changed, 23 insertions(+), 10 deletions(-) diff --git a/indra/viewer_components/updater/llupdatechecker.cpp b/indra/viewer_components/updater/llupdatechecker.cpp index c6aa9b0f11..4da774a5f6 100644 --- a/indra/viewer_components/updater/llupdatechecker.cpp +++ b/indra/viewer_components/updater/llupdatechecker.cpp @@ -30,7 +30,9 @@ #include "llsd.h" #include "llupdatechecker.h" #include "lluri.h" - +#if LL_DARWIN +#include +#endif #if LL_WINDOWS #pragma warning (disable : 4355) // 'this' used in initializer list: yes, intentionally @@ -55,7 +57,7 @@ class LLUpdateChecker::Implementation: public: Implementation(Client & client); ~Implementation(); - void check(std::string const & protocolVersion, std::string const & hostUrl, + void checkVersion(std::string const & protocolVersion, std::string const & hostUrl, std::string const & servicePath, std::string channel, std::string version); // Responder: @@ -91,10 +93,10 @@ LLUpdateChecker::LLUpdateChecker(LLUpdateChecker::Client & client): } -void LLUpdateChecker::check(std::string const & protocolVersion, std::string const & hostUrl, +void LLUpdateChecker::checkVersion(std::string const & protocolVersion, std::string const & hostUrl, std::string const & servicePath, std::string channel, std::string version) { - mImplementation->check(protocolVersion, hostUrl, servicePath, channel, version); + mImplementation->checkVersion(protocolVersion, hostUrl, servicePath, channel, version); } @@ -120,7 +122,7 @@ LLUpdateChecker::Implementation::~Implementation() } -void LLUpdateChecker::Implementation::check(std::string const & protocolVersion, std::string const & hostUrl, +void LLUpdateChecker::Implementation::checkVersion(std::string const & protocolVersion, std::string const & hostUrl, std::string const & servicePath, std::string channel, std::string version) { llassert(!mInProgress); @@ -179,7 +181,18 @@ std::string LLUpdateChecker::Implementation::buildUrl(std::string const & protoc #ifdef LL_WINDOWS static const char * platform = "win"; #elif LL_DARWIN - static const char * platform = "mac"; + long versMin; + Gestalt(gestaltSystemVersionMinor, &versMin); + + static const char *platform; + if (versMin == 5) //OS 10.5 + { + platform = "mac_legacy"; + } + else + { + platform = "mac"; + } #else static const char * platform = "lnx"; #endif diff --git a/indra/viewer_components/updater/llupdatechecker.h b/indra/viewer_components/updater/llupdatechecker.h index cea1f13647..d882169068 100644 --- a/indra/viewer_components/updater/llupdatechecker.h +++ b/indra/viewer_components/updater/llupdatechecker.h @@ -44,7 +44,7 @@ public: LLUpdateChecker(Client & client); // Check status of current app on the given host for the channel and version provided. - void check(std::string const & protocolVersion, std::string const & hostUrl, + void checkVersion(std::string const & protocolVersion, std::string const & hostUrl, std::string const & servicePath, std::string channel, std::string version); private: diff --git a/indra/viewer_components/updater/llupdaterservice.cpp b/indra/viewer_components/updater/llupdaterservice.cpp index 2e18218667..bc73c72ddc 100644 --- a/indra/viewer_components/updater/llupdaterservice.cpp +++ b/indra/viewer_components/updater/llupdaterservice.cpp @@ -509,7 +509,7 @@ bool LLUpdaterServiceImpl::onMainLoop(LLSD const & event) } else { - mUpdateChecker.check(mProtocolVersion, mUrl, mPath, mChannel, mVersion); + mUpdateChecker.checkVersion(mProtocolVersion, mUrl, mPath, mChannel, mVersion); setState(LLUpdaterService::CHECKING_FOR_UPDATE); } } diff --git a/indra/viewer_components/updater/tests/llupdaterservice_test.cpp b/indra/viewer_components/updater/tests/llupdaterservice_test.cpp index e19d5724f1..7c016fecf9 100644 --- a/indra/viewer_components/updater/tests/llupdaterservice_test.cpp +++ b/indra/viewer_components/updater/tests/llupdaterservice_test.cpp @@ -1,4 +1,4 @@ -/** +/** * @file llupdaterservice_test.cpp * @brief Tests of llupdaterservice.cpp. * @@ -44,7 +44,7 @@ *****************************************************************************/ LLUpdateChecker::LLUpdateChecker(LLUpdateChecker::Client & client) {} -void LLUpdateChecker::check(std::string const & protocolVersion, std::string const & hostUrl, +void LLUpdateChecker::checkVersion(std::string const & protocolVersion, std::string const & hostUrl, std::string const & servicePath, std::string channel, std::string version) {} LLUpdateDownloader::LLUpdateDownloader(Client & ) {} -- 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(-) 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(-) 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(-) 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(-) 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(-) 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(-) 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 56298eed3d8ae586ab2ae4c7b8dcf53eeede7394 Mon Sep 17 00:00:00 2001 From: callumprentice Date: Thu, 16 Aug 2012 15:49:14 -0700 Subject: Reverting Sabin's change to build system that we used during testing --- BuildParams | 5 ----- 1 file changed, 5 deletions(-) diff --git a/BuildParams b/BuildParams index 037f708a94..3dd35c5863 100644 --- a/BuildParams +++ b/BuildParams @@ -8,11 +8,6 @@ Darwin.symbolfiles = "newview/Release/secondlife-symbols-darwin.tar.bz2" CYGWIN.symbolfiles = "newview/Release/secondlife-symbols-windows.tar.bz2" Linux.symbolfiles = "newview/secondlife-symbols-linux.tar.bz2" -build_Debug = false -build_RelWithDebInfo = false -build_Darwin_Debug = false -build_Darwin_RelWithDebInfo = false - # Use Public Upload Locations public_build = true -- cgit v1.2.3 From 3e05f169d68639d304c75cb464e05f27206b4739 Mon Sep 17 00:00:00 2001 From: Aura Linden Date: Fri, 17 Aug 2012 09:04:16 -0700 Subject: Minor change required for merge from viewer-development --- indra/cmake/Variables.cmake | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake index c117873d4c..3542fb0610 100644 --- a/indra/cmake/Variables.cmake +++ b/indra/cmake/Variables.cmake @@ -106,13 +106,12 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") # To support a different SDK update these Xcode settings: if (XCODE_VERSION GREATER 4.2) set(CMAKE_OSX_DEPLOYMENT_TARGET 10.6) - set(CMAKE_OSX_SYSROOT macosx10.6) - set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvmgcc42") else (XCODE_VERSION GREATER 4.2) set(CMAKE_OSX_DEPLOYMENT_TARGET 10.5) - set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.5.sdk) - set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "4.0") endif (XCODE_VERSION GREATER 4.2) + + set(CMAKE_OSX_SYSROOT macosx10.6) + set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvmgcc42") set(CMAKE_XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT dwarf-with-dsym) -- cgit v1.2.3 From 36fa95058ae956ff9b089c4a60e962c764f0889b Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Mon, 20 Aug 2012 10:04:38 -0400 Subject: tag merge of DRTVWR-199 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 2b85f54c14..8aaccae25b 100644 --- a/.hgtags +++ b/.hgtags @@ -344,3 +344,4 @@ a8057e1b9a1246b434a27405be35e030f7d28b0c 3.3.4-beta3 6c75f220b103db1420919c8b635fe53e2177f318 3.3.4-beta4 ab2ffc547c8a8950ff187c4f6c95e5334fab597b 3.3.4-beta5 28e100d0379a2b0710c57647a28fc5239d3d7b99 3.3.4-release +6dfb0fba782c9233dd95f24ec48146db0d3f210b DRTVWR-199 -- cgit v1.2.3 From 173364ed5da234c68dd6d0497e443f7aeb98e1b1 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Mon, 20 Aug 2012 10:43:45 -0400 Subject: Added tag 3.3.4-release2 for changeset 7c9102fb9988 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 8aaccae25b..6dd65c1d04 100644 --- a/.hgtags +++ b/.hgtags @@ -345,3 +345,4 @@ a8057e1b9a1246b434a27405be35e030f7d28b0c 3.3.4-beta3 ab2ffc547c8a8950ff187c4f6c95e5334fab597b 3.3.4-beta5 28e100d0379a2b0710c57647a28fc5239d3d7b99 3.3.4-release 6dfb0fba782c9233dd95f24ec48146db0d3f210b DRTVWR-199 +7c9102fb998885621919f2474a002c35b583539b 3.3.4-release2 -- cgit v1.2.3 From 44a934ef2af3c6d1fa7fc6294ea851db3f45bea0 Mon Sep 17 00:00:00 2001 From: callum_linden Date: Mon, 20 Aug 2012 11:24:18 -0700 Subject: silly change to trigger a rebuild in Team City --- build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/build.sh b/build.sh index b5876738e6..0ede8af1c5 100755 --- a/build.sh +++ b/build.sh @@ -15,6 +15,7 @@ # * The basic convention is that the build name can be mapped onto a mercurial URL, # which is also used as the "branch" name. + check_for() { if [ -e "$2" ]; then found_dict='FOUND'; else found_dict='MISSING'; fi -- cgit v1.2.3 From 79cb549edf5335b48fb4047f5bcf41331a88ad77 Mon Sep 17 00:00:00 2001 From: callum_linden Date: Mon, 20 Aug 2012 11:24:30 -0700 Subject: silly change to trigger a rebuild in Team City --- build.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/build.sh b/build.sh index 0ede8af1c5..b5876738e6 100755 --- a/build.sh +++ b/build.sh @@ -15,7 +15,6 @@ # * The basic convention is that the build name can be mapped onto a mercurial URL, # which is also used as the "branch" name. - check_for() { if [ -e "$2" ]; then found_dict='FOUND'; else found_dict='MISSING'; fi -- cgit v1.2.3 From 822dc1c580bc538b233132935639ee7574fe7186 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Tue, 21 Aug 2012 09:30:55 -0400 Subject: storm-1906: correct cmake error when using precompiled llphysicsextensions_tpv --- indra/newview/CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 753dbd7438..3cd03f8641 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -45,7 +45,10 @@ include(VisualLeakDetector) include(GLOD) include(CMakeCopyIfDifferent) -add_subdirectory(${LLPHYSICSEXTENSIONS_SRC_DIR} llphysicsextensions) +if (NOT HAVOK_TPV) + # When using HAVOK_TPV, the library is precompiled, so no need for this + add_subdirectory(${LLPHYSICSEXTENSIONS_SRC_DIR} llphysicsextensions) +endif (NOT HAVOK_TPV) include_directories( ${DBUSGLIB_INCLUDE_DIRS} -- cgit v1.2.3 From 0e4fa75e6441cdb6dac8b9463ce9c3ff3a0a6596 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Wed, 22 Aug 2012 11:12:53 -0400 Subject: tag merge of DRTVWR-201 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index f21607d9f5..4031f9bd19 100644 --- a/.hgtags +++ b/.hgtags @@ -360,3 +360,4 @@ e9732c739c8a72a590216951505ea9c76a526a84 DRTVWR-193 b1dbb1a83f48f93f6f878cff9e52d2cb635e145c 3.4.0-beta2 37402e2b19af970d51b0a814d79892cc5647532b DRTVWR-200 182a9bf30e81070361bb020a78003b1cf398e79c 3.4.0-beta3 +7649a3dff5ec22d3727377e5f02efd0f421e4cb5 DRTVWR-201 -- 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/cmake/Variables.cmake | 8 ++++---- indra/newview/viewer_manifest.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake index 3542fb0610..4b459f1a48 100644 --- a/indra/cmake/Variables.cmake +++ b/indra/cmake/Variables.cmake @@ -100,14 +100,14 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") set(DARWIN 1) execute_process( - COMMAND sh -c "xcodebuild -version | grep Xcode | cut -d ' ' -f2 | cut -d'.' -f1-2" - OUTPUT_VARIABLE XCODE_VERSION ) + COMMAND sh -c "xcodebuild -version | grep Xcode | cut -d ' ' -f2 | cut -d'.' -f1-2" + OUTPUT_VARIABLE XCODE_VERSION ) # To support a different SDK update these Xcode settings: if (XCODE_VERSION GREATER 4.2) - set(CMAKE_OSX_DEPLOYMENT_TARGET 10.6) + set(CMAKE_OSX_DEPLOYMENT_TARGET 10.6) else (XCODE_VERSION GREATER 4.2) - set(CMAKE_OSX_DEPLOYMENT_TARGET 10.5) + set(CMAKE_OSX_DEPLOYMENT_TARGET 10.5) endif (XCODE_VERSION GREATER 4.2) set(CMAKE_OSX_SYSROOT macosx10.6) 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 From fcfc686d9c4125c7bf35fcc97cb40b18dd9a4fc1 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Wed, 22 Aug 2012 17:08:49 -0400 Subject: Added tag 3.4.0-beta4 for changeset 84fb70dfe344 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 48e5c86e0b..cbf115be69 100644 --- a/.hgtags +++ b/.hgtags @@ -297,3 +297,4 @@ b1dbb1a83f48f93f6f878cff9e52d2cb635e145c 3.4.0-beta2 6dfb0fba782c9233dd95f24ec48146db0d3f210b DRTVWR-199 7c9102fb998885621919f2474a002c35b583539b 3.3.4-release2 7649a3dff5ec22d3727377e5f02efd0f421e4cb5 DRTVWR-201 +84fb70dfe3444e75a44fb4bee43e2fc8221cebdd 3.4.0-beta4 -- cgit v1.2.3 From d34e584b41ce317a942aa93e6217e678c88b9050 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Wed, 22 Aug 2012 17:11:08 -0400 Subject: tag merge of DRTVWR-202 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 42472c4038..3d7b92eab8 100755 --- a/.hgtags +++ b/.hgtags @@ -361,3 +361,4 @@ e9732c739c8a72a590216951505ea9c76a526a84 DRTVWR-193 421126293dcbde918e0da027ca0ab9deb5b4fbf2 DRTVWR-192 4b2c52aecb7a75de31dbb12d9f5b9a251d8707be DRTVWR-191 7602f61c804a512764e349c034c02ddabeefebc4 DRTVWR-196 +de3be913f68813a9bac7d1c671fef96d1159bcd6 DRTVWR-202 -- cgit v1.2.3