summaryrefslogtreecommitdiff
path: root/indra/mac_updater
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-04-14 15:15:48 -0400
committerOz Linden <oz@lindenlab.com>2011-04-14 15:15:48 -0400
commit572e491acf2d9ca1701ec54df31632cbc9c253c8 (patch)
tree4fa39e7b5263f76a62f73d08a1dc8ab550d4ec05 /indra/mac_updater
parent71f5c1f5e8bbf6b22776cd7f98aabecc7a48918d (diff)
parentb49446c863644d603ec2e1f86f12d24b1c4375c2 (diff)
pull back tags from viewer-release
Diffstat (limited to 'indra/mac_updater')
-rw-r--r--indra/mac_updater/CMakeLists.txt4
-rw-r--r--indra/mac_updater/mac_updater.cpp10
2 files changed, 6 insertions, 8 deletions
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}
)
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))