Second Life viewer sources 1.21.0-RC

4 files changed, 99 insertions, 1 deletions

diff --git a/linden/indra/mac_updater/CMakeLists.txt b/linden/indra/mac_updater/CMakeLists.txt
new file mode 100644
index 0000000..3ac5aee
--- /dev/null
+++ b/linden/indra/mac_updater/CMakeLists.txt
@@ -0,0 +1,82 @@
+# -*- cmake -*-
+
+project(mac_updater)
+
+include(00-Common)
+include(CURL)
+include(LLCommon)
+include(LLVFS)
+include(Linking)
+
+include_directories(
+    ${LLCOMMON_INCLUDE_DIRS}
+    ${LLVFS_INCLUDE_DIRS}
+    )
+
+set(mac_updater_SOURCE_FILES
+    mac_updater.cpp
+    FSCopyObject.c
+    GenLinkedList.c
+    MoreFilesX.c
+    )
+
+set(mac_updater_HEADER_FILES
+    CMakeLists.txt
+
+    FSCopyObject.h
+    GenLinkedList.h
+    MoreFilesX.h
+    )
+
+set_source_files_properties(
+    FSCopyObject.c
+    MoreFilesX.c
+    PROPERTIES
+    COMPILE_FLAGS -Wno-deprecated-declarations
+    )
+
+set_source_files_properties(${mac_updater_HEADER_FILES}
+                            PROPERTIES HEADER_FILE_ONLY TRUE)
+
+list(APPEND mac_updater_SOURCE_FILES ${mac_updater_HEADER_FILES})
+
+
+set(mac_updater_RESOURCE_FILES
+  Info.plist
+  AutoUpdater.nib/
+  )
+set_source_files_properties(
+  ${mac_updater_RESOURCE_FILES}
+  PROPERTIES
+  HEADER_FILE_ONLY TRUE
+  )
+set_source_files_properties(
+  Info.plist
+  PROPERTIES
+  MACOSX_PACKAGE_LOCATION . # will it blend? + poppy
+  )
+SOURCE_GROUP("Resources" FILES ${mac_updater_RESOURCE_FILES})
+list(APPEND mac_updater_SOURCE_FILES ${mac_updater_RESOURCE_FILES})
+
+
+add_executable(mac-updater
+  MACOSX_BUNDLE
+  ${mac_updater_SOURCE_FILES})
+
+target_link_libraries(mac-updater
+    ${LLVFS_LIBRARIES}
+    ${CURL_LIBRARIES}
+    ${LLCOMMON_LIBRARIES}
+    )
+
+add_custom_command(
+  TARGET mac-updater POST_BUILD
+  COMMAND ${CMAKE_COMMAND}
+  ARGS
+    -E
+    copy_directory
+    ${CMAKE_CURRENT_SOURCE_DIR}/AutoUpdater.nib
+    ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/mac-updater.app/Contents/Resources/AutoUpdater.nib
+  )
+
+
diff --git a/linden/indra/mac_updater/MoreFilesX.c b/linden/indra/mac_updater/MoreFilesX.c
index 283628d..a157b6a 100644
--- a/linden/indra/mac_updater/MoreFilesX.c
+++ b/linden/indra/mac_updater/MoreFilesX.c
@@ -2298,6 +2298,7 @@ BadParameter:
 
 /*****************************************************************************/
 
+#ifndef AVAILABLE_MAC_OS_X_VERSION_10_5_AND_LATER
 OSErr
 FSVolumeMount(
         const void *volMountInfo,
@@ -2321,6 +2322,7 @@ BadParameter:
 
         return ( result );
 }
+#endif
 
 /*****************************************************************************/
 
diff --git a/linden/indra/mac_updater/MoreFilesX.h b/linden/indra/mac_updater/MoreFilesX.h
index 2502905..b6793db 100644
--- a/linden/indra/mac_updater/MoreFilesX.h
+++ b/linden/indra/mac_updater/MoreFilesX.h
@@ -1509,10 +1509,12 @@ FSGetVolMountInfo(
 
 #pragma mark FSVolumeMount
 
+#ifndef AVAILABLE_MAC_OS_X_VERSION_10_5_AND_LATER
 OSErr
 FSVolumeMount(
         const void *volMountInfo,
         FSVolumeRefNum *volRefNum);
+#endif
 
 /*
         The VolumeMount function mounts a volume using a volume mounting
diff --git a/linden/indra/mac_updater/mac_updater.cpp b/linden/indra/mac_updater/mac_updater.cpp
index 15e28ac..c2f9f4d 100644
--- a/linden/indra/mac_updater/mac_updater.cpp
+++ b/linden/indra/mac_updater/mac_updater.cpp
@@ -50,6 +50,8 @@
 #include "MoreFilesX.h"
 #include "FSCopyObject.h"
 
+#include "llerrorcontrol.h"
+
 enum
 {
         kEventClassCustom = 'Cust',
@@ -345,6 +347,16 @@ int main(int argc, char **argv)
         // We assume that all the logs we're looking for reside on the current drive
         gDirUtilp->initAppDirs("SecondLife");
 
+        LLError::initForApplication( gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, ""));
+
+        // Rename current log file to ".old"
+        std::string old_log_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "updater.log.old");
+        std::string log_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "updater.log");
+        LLFile::rename(log_file.c_str(), old_log_file.c_str());
+
+        // Set the log file to updater.log
+        LLError::logToFile(log_file);
+
         /////////////////////////////////////////
         //
         // Process command line arguments
@@ -986,7 +998,7 @@ void *updatethreadproc(void*)
                 
                 // NOTE: we could add -private at the end of this command line to keep the image from showing up in the Finder,
                 //              but if our cleanup fails, this makes it much harder for the user to unmount the image.
-                LLString mountOutput;
+                std::string mountOutput;
                 FILE* mounter = popen("hdiutil attach SecondLife.dmg -mountpoint mnt", "r");            /* Flawfinder: ignore */
                 
                 if(mounter == NULL)