From 708d208654bcedbbf9db32ff4f6942d5a37b1ab9 Mon Sep 17 00:00:00 2001 From: Siana Gearz Date: Tue, 25 Jan 2011 05:50:49 +0100 Subject: [PATCH] Goodbye updater --- indra/CMakeLists.txt | 11 ++-- indra/mac_updater/CMakeLists.txt | 1 + indra/newview/viewer_manifest.py | 2 +- install.xml | 92 ++++++++++++++++---------------- 4 files changed, 54 insertions(+), 52 deletions(-) diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt index 6a9aafc77..d4ee2d244 100644 --- a/indra/CMakeLists.txt +++ b/indra/CMakeLists.txt @@ -88,17 +88,18 @@ if (VIEWER) add_dependencies(viewer linux-crash-logger-strip-target) elseif (DARWIN) add_subdirectory(${VIEWER_PREFIX}mac_crash_logger) - add_subdirectory(${VIEWER_PREFIX}mac_updater) - add_dependencies(viewer mac-updater mac-crash-logger) + #add_subdirectory(${VIEWER_PREFIX}mac_updater) + add_dependencies(viewer mac-crash-logger) + #add_dependencies(viewer mac-updater) elseif (WINDOWS) add_subdirectory(${VIEWER_PREFIX}win_crash_logger) # cmake EXISTS requires an absolute path, see indra/cmake/Variables.cmake if (EXISTS ${VIEWER_DIR}win_setup) add_subdirectory(${VIEWER_DIR}win_setup) endif (EXISTS ${VIEWER_DIR}win_setup) - add_subdirectory(${VIEWER_PREFIX}win_updater) - # add_dependencies(viewer windows-updater windows-setup windows-crash-logger) - add_dependencies(viewer windows-updater windows-crash-logger) + #add_subdirectory(${VIEWER_PREFIX}win_updater) + #add_dependencies(viewer windows-updater) + add_dependencies(viewer windows-crash-logger) elseif (SOLARIS) add_subdirectory(solaris_crash_logger) add_dependencies(viewer solaris-crash-logger) diff --git a/indra/mac_updater/CMakeLists.txt b/indra/mac_updater/CMakeLists.txt index 946ea3301..b769a2e17 100644 --- a/indra/mac_updater/CMakeLists.txt +++ b/indra/mac_updater/CMakeLists.txt @@ -50,6 +50,7 @@ set_target_properties(mac-updater target_link_libraries(mac-updater ${LLVFS_LIBRARIES} ${CURL_LIBRARIES} + ${OPENSSL_LIBRARIES} ${LLCOMMON_LIBRARIES} ) diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index edd72e183..fda44458d 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -486,7 +486,7 @@ class DarwinManifest(ViewerManifest): # our apps self.path("../mac_crash_logger/" + self.args['configuration'] + "/mac-crash-logger.app", "mac-crash-logger.app") - self.path("../mac_updater/" + self.args['configuration'] + "/mac-updater.app", "mac-updater.app") + #self.path("../mac_updater/" + self.args['configuration'] + "/mac-updater.app", "mac-updater.app") # plugin launcher self.path("../llplugin/slplugin/" + self.args['configuration'] + "/SLPlugin", "SLPlugin") diff --git a/install.xml b/install.xml index c63a53637..171cd8982 100644 --- a/install.xml +++ b/install.xml @@ -125,16 +125,16 @@ darwin md5sum - d9ce3ace9235249b7edf6f564de83395 + cdb2f5c4a5a1f9ecd75bc1dbdd4db8e9 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ares-1.4.0-darwin-20080731b.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ares-1.7.1-darwin-20100606.tar.bz2 linux md5sum - 946c2e106f14f7a1e521d4a14e0e146f + 91694429e391efeea1de974df26032a2 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ares-1.4.0-linux-20081202.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ares-1.7.1-linux-20100527.tar.bz2 linux64 @@ -146,9 +146,9 @@ windows md5sum - f5cf8d121b26f2e7944f7e63cdbff04d + 4b84738eec2e21b0c096d53b79ee2681 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ares-1.6.0-windows-20091105.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ares-1.7.1-windows-20100611a.tar.bz2 @@ -227,46 +227,46 @@ - curl - - copyright - Copyright (c) 1996 - 2008, Daniel Stenberg, <daniel@haxx.se>. - description - Client-side URL transfer library. Handles moving data across the net in many different protocols. Used to GET/POST/PUT/DELETE web resources. - license - curl - packages - - darwin - - md5sum - 1bece4ebdc5fc3818854bc3df14b511b - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/curl-7.16.4a-darwin-20090304.tar.bz2 - - linux - - md5sum - 0f366e421ae9c72d9659bd20a2a326d6 - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/curl-7.16.4a-linux-20090303a.tar.bz2 - - linux64 - - md5sum - 6994192cea7ab2d885a158a3de474273 - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/curl-7.16.4a-linux64-20090303.tar.bz2 - - windows - - md5sum - 53e5ab7affff7121a5af2f82b4d58b54 - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/curl-7.19.6-windows-20091016.tar.bz2 - - - + curl + + copyright + Copyright (c) 1996 - 2008, Daniel Stenberg, <daniel@haxx.se>. + description + Client-side URL transfer library. Handles moving data across the net in many different protocols. Used to GET/POST/PUT/DELETE web resources. + license + curl + packages + + darwin + + md5sum + 752e295ccb17f0dcb7c0167db3ad1e69 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/curl-7.20.1-darwin-20100606.tar.bz2 + + linux + + md5sum + a20e73f2e7d6a032ff25a5161b1b7394 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/curl-7.20.1-linux-20100527.tar.bz2 + + linux64 + + md5sum + 6994192cea7ab2d885a158a3de474273 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/curl-7.16.4a-linux64-20090303.tar.bz2 + + windows + + md5sum + b28856d3d02ee680353ae440561a6579 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/curl-7.20.1-windows-20100611.tar.bz2 + + + dbghelp copyright