From 12a539c82db8b8a42c6a1fa7c692be39e26219f2 Mon Sep 17 00:00:00 2001 From: "Andrew A. de Laix" Date: Wed, 16 Mar 2011 13:53:06 -0700 Subject: update to latest curl library (linked to cares). --- autobuild.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 676fae6aa1..ff36c1c9bc 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -234,9 +234,9 @@ archive hash - 89b89ad923816317e1a3be963b406f27 + aaea644191807f51051cefa2fac11069 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-curl/rev/219379/arch/Darwin/installer/curl-7.21.1-darwin-20110120.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-curl/rev/224181/arch/Darwin/installer/curl-7.21.1-darwin-20110316.tar.bz2 name darwin -- cgit v1.2.3 From 2e0543a168255b6577da2e39a1f9a39207028d23 Mon Sep 17 00:00:00 2001 From: Andrew de Laix Date: Wed, 16 Mar 2011 20:54:12 +0000 Subject: update linux to lates curl archive (linked to cares). --- autobuild.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 676fae6aa1..690d62235a 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -246,9 +246,9 @@ archive hash - 65ca0a9b42de855ea574e454ec2e14c3 + 2d9377951d99a1aa4735cea8d4b5aa71 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-curl/rev/220996/arch/Linux/installer/curl-7.21.1-linux-20110308.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-curl/rev/224181/arch/Linux/installer/curl-7.21.1-linux-20110316.tar.bz2 name linux -- cgit v1.2.3 From 4b66f1e0134d3275e852e6387570d6bfe479a1e1 Mon Sep 17 00:00:00 2001 From: Andrew de Laix Date: Wed, 16 Mar 2011 22:06:01 +0000 Subject: package all breakpad symlinks for linux. --- indra/newview/viewer_manifest.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index dad0519a8a..f600cb42b0 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -934,6 +934,8 @@ class Linux_i686Manifest(LinuxManifest): self.path("libapr-1.so.0.4.2") self.path("libaprutil-1.so.0.3.10") self.path("libbreakpad_client.so.0.0.0") + self.path("libbreakpad_client.so.0") + self.path("libbreakpad_client.so") self.path("libdb-5.1.so") self.path("libcrypto.so.0.9.8") self.path("libexpat.so.1.5.2") -- cgit v1.2.3 From 4d11d30a3e241ccc52f099079f597a71142a187e Mon Sep 17 00:00:00 2001 From: brad kittenbrink Date: Wed, 16 Mar 2011 19:29:14 -0400 Subject: Updated BuildParams in prep for vs2010 project viewer. --- BuildParams | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/BuildParams b/BuildParams index ac64b834de..df569b65e0 100644 --- a/BuildParams +++ b/BuildParams @@ -238,6 +238,15 @@ viewer-asset-delivery-metrics.build_server_tests = false # autobuild viewers #============================================================================== viewer-autobuild.build_link_parallel = false + +#======================================== +# VS2010 +#======================================== +viewer-vs2010.viewer_channel = "Project Viewer - VS2010" +viewer-vs2010.login_channel = "Project Viewer - VS2010" +viewer-vs2010.viewer_grid = agni +viewer-vs2010.build_debug_release_separately = true +viewer-vs2010.build_viewer_update_version_manager = false viewer-vs2010.build_link_parallel = false # eof -- cgit v1.2.3 From 1ce22e11fd5cca67bf7e8d42d11bff7f710cce93 Mon Sep 17 00:00:00 2001 From: brad kittenbrink Date: Thu, 17 Mar 2011 12:49:30 -0400 Subject: Removed trailing spaces that were breaking BuildParams parsing. --- BuildParams | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/BuildParams b/BuildParams index df569b65e0..dbaf7d67a2 100644 --- a/BuildParams +++ b/BuildParams @@ -242,11 +242,11 @@ viewer-autobuild.build_link_parallel = false #======================================== # VS2010 #======================================== -viewer-vs2010.viewer_channel = "Project Viewer - VS2010" -viewer-vs2010.login_channel = "Project Viewer - VS2010" -viewer-vs2010.viewer_grid = agni -viewer-vs2010.build_debug_release_separately = true -viewer-vs2010.build_viewer_update_version_manager = false +viewer-vs2010.viewer_channel = "Project Viewer - VS2010" +viewer-vs2010.login_channel = "Project Viewer - VS2010" +viewer-vs2010.viewer_grid = agni +viewer-vs2010.build_debug_release_separately = true +viewer-vs2010.build_viewer_update_version_manager = false viewer-vs2010.build_link_parallel = false # eof -- cgit v1.2.3