From 28eaade69b4b330db7a9dfea528cc4f0a3998841 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Thu, 17 Mar 2011 22:51:23 -0700
Subject: Autobuild: Fix Mac building failure: c-ares linking of mac_updater

---
 indra/mac_updater/CMakeLists.txt | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'indra/mac_updater')

diff --git a/indra/mac_updater/CMakeLists.txt b/indra/mac_updater/CMakeLists.txt
index a4a6b50c6c..00dcedecaa 100644
--- a/indra/mac_updater/CMakeLists.txt
+++ b/indra/mac_updater/CMakeLists.txt
@@ -5,6 +5,7 @@ project(mac_updater)
 include(00-Common)
 include(OpenSSL)
 include(CURL)
+include(CARes)
 include(LLCommon)
 include(LLVFS)
 include(Linking)
@@ -12,6 +13,8 @@ include(Linking)
 include_directories(
     ${LLCOMMON_INCLUDE_DIRS}
     ${LLVFS_INCLUDE_DIRS}
+    ${CURL_INCLUDE_DIRS}
+    ${CARES_INCLUDE_DIRS}
     )
 
 set(mac_updater_SOURCE_FILES
@@ -53,6 +56,7 @@ target_link_libraries(mac-updater
     ${OPENSSL_LIBRARIES}
     ${CRYPTO_LIBRARIES}
     ${CURL_LIBRARIES}
+    ${CARES_LIBRARIES}
     ${LLCOMMON_LIBRARIES}
     )
 
-- 
cgit v1.2.3


From d20f8a07cce466dcdddd9c113c32f53faa4ab0fd Mon Sep 17 00:00:00 2001
From: "Andrew A. de Laix" <alain@lindenlab.com>
Date: Mon, 28 Mar 2011 14:00:35 -0700
Subject: fix CHOP-402: use newer api call for move to trash that will rename
 if needed.

---
 indra/mac_updater/mac_updater.cpp | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'indra/mac_updater')

diff --git a/indra/mac_updater/mac_updater.cpp b/indra/mac_updater/mac_updater.cpp
index 5d19e8a889..809f66cb1d 100644
--- a/indra/mac_updater/mac_updater.cpp
+++ b/indra/mac_updater/mac_updater.cpp
@@ -1230,20 +1230,14 @@ void *updatethreadproc(void*)
 	// Move work directory to the trash
 	if(tempDir[0] != 0)
 	{
-//		chdir("/");
-//		FSDeleteObjects(tempDirRef);
-
 		llinfos << "Moving work directory to the trash." << llendl;
 
-		err = FSMoveObject(&tempDirRef, &trashFolderRef, NULL);
+		FSRef trashRef;
+		OSStatus err = FSMoveObjectToTrashSync(&tempDirRef, &trashRef, 0); 
 		if(err != noErr) {
 			llwarns << "failed to move files to trash, (error code " <<
 				err << ")" << llendl;
 		}
-
-//		snprintf(temp, sizeof(temp), "rm -rf '%s'", tempDir);
-//		printf("%s\n", temp);
-//		system(temp);
 	}
 	
 	if(!gCancelled  && !gFailure && (target[0] != 0))
-- 
cgit v1.2.3