From c4cda389afbfb4969e6705bdf4ba1cd3479f5cfd Mon Sep 17 00:00:00 2001 From: Monty Brandenberg Date: Thu, 22 Aug 2013 19:48:45 -0400 Subject: Okay, move openssl back to 0.9.8q as we have compiler issues on the build farm. This, at least, gets us through the openssl-> libcurl->viewer dependency chain. --- autobuild.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 628d3f6883..2e911d78be 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -1648,9 +1648,9 @@ archive hash - facee34b8bd57ad602157e65a5af1a49 + 64544512ed2e9fc48e1fda0b490daa74 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openssl-0.9.8q-darwin-20110211.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-openssl/rev/223711/arch/Darwin/installer/openssl-0.9.8q-darwin-20110314.tar.bz2 name darwin -- cgit v1.2.3 From 912995de628676cb4e5845d6d9144536d4c3bb8a Mon Sep 17 00:00:00 2001 From: Monty Brandenberg Date: Fri, 23 Aug 2013 20:41:01 -0400 Subject: Moved OpenSSL to 1.0.1e as an experiement. Can't build llqtwebkit so that doesn't move. 3p-curl does, however, and this gets them all. I suspect I'll be backing down to 0.9.8 next week. --- autobuild.xml | 84 +++++++++++++++++------------------------------------------ 1 file changed, 24 insertions(+), 60 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 2e911d78be..40372fc3be 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -282,9 +282,9 @@ archive hash - aaea644191807f51051cefa2fac11069 + 31ed5d2b5f8b19372c2a1ecf6574239c url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/curl-7.21.1-darwin-20110316.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-curl/rev/280186/arch/Darwin/installer/curl-7.24.0-darwin-20130823.tar.bz2 name darwin @@ -294,9 +294,9 @@ archive hash - 2d9377951d99a1aa4735cea8d4b5aa71 + a7d736bcc952bd403a4912122035df53 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/curl-7.21.1-linux-20110316.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-curl/rev/280186/arch/Linux/installer/curl-7.24.0-linux-20130823.tar.bz2 name linux @@ -306,9 +306,9 @@ archive hash - fea96aa2a7d513397317194f3d6c979b + 4791f42564a1f426ea14492a86cfb7c9 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/curl-7.21.1-windows-20110211.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-curl/rev/280186/arch/CYGWIN/installer/curl-7.24.0-windows-20130824.tar.bz2 name windows @@ -522,9 +522,9 @@ archive hash - 91752db72202807cffb33c1ec3fd90fc + 91752db72202807cffb33c1ec3fd90fc url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-fmodex-private/rev/276321/arch/CYGWIN/installer/fmodex-4.44-windows-20130521.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-fmodex-private/rev/276321/arch/CYGWIN/installer/fmodex-4.44-windows-20130521.tar.bz2 name windows @@ -761,9 +761,9 @@ archive - hash - aff5566e04003de0383941981198e04e - url + hash + aff5566e04003de0383941981198e04e + url http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-breakpad/rev/273073/arch/Darwin/installer/google_breakpad-0.0.0-rev1099-darwin-20130329.tar.bz2 name @@ -773,9 +773,9 @@ archive - hash - 52257e5eb166a0b69c9c0c38f6e1920e - url + hash + 52257e5eb166a0b69c9c0c38f6e1920e + url http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-breakpad/rev/273079/arch/Linux/installer/google_breakpad-0.0.0-rev1099-linux-20130329.tar.bz2 name @@ -786,7 +786,7 @@ archive hash - d812a6dfcabe6528198a3191068dac09 + d812a6dfcabe6528198a3191068dac09 url http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-breakpad/rev/273073/arch/CYGWIN/installer/google_breakpad-0.0.0-rev1099-windows-20130329.tar.bz2 @@ -879,42 +879,6 @@ - gperftools - - license - bsd - license_file - LICENSES/gperftools.txt - name - gperftools - platforms - - linux - - archive - - hash - 8aedfdcf670348c18a9991ae1b384a61 - url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-perftools/rev/262672/arch/Linux/installer/gperftools-2.0-linux-20120727.tar.bz2 - - name - linux - - windows - - archive - - hash - f62841804acb91e1309603a84f3f0ce8 - url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-perftools/rev/262672/arch/CYGWIN/installer/gperftools-2.0-windows-20120727.tar.bz2 - - name - windows - - - gstreamer license @@ -1648,9 +1612,9 @@ archive hash - 64544512ed2e9fc48e1fda0b490daa74 + 29a4aa8f257989856f72f6021020fcdc url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-openssl/rev/223711/arch/Darwin/installer/openssl-0.9.8q-darwin-20110314.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-openssl/rev/280235/arch/Darwin/installer/openssl-1.0.1e-darwin-20130823.tar.bz2 name darwin @@ -1660,9 +1624,9 @@ archive hash - 3d40be8566fa4b9df9a38e2a0f9ea467 + d57f616e1127530f830eafb02a3b46bb url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-openssl/rev/226882/arch/Linux/installer/openssl-1.0.0d-linux-20110418.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-openssl/rev/280235/arch/Linux/installer/openssl-1.0.1e-linux-20130823.tar.bz2 name linux @@ -1672,9 +1636,9 @@ archive hash - 774c7f0a0312bee3054757a623e227bc + b291d94f35887e4caf807f07129d559c url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-openssl/rev/220986/arch/CYGWIN/installer/openssl-0.9.8q-windows-20110211.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-openssl/rev/280235/arch/CYGWIN/installer/openssl-1.0.1e-windows-20130824.tar.bz2 name windows @@ -2567,7 +2531,7 @@ "Visual Studio 10" -DUNATTENDED:BOOL=ON -DUSE_KDU=FALSE - + name DebugOS @@ -2655,7 +2619,7 @@ -DUNATTENDED:BOOL=ON -DINSTALL_PROPRIETARY=FALSE -DUSE_KDU=FALSE - + name RelWithDebInfoOS @@ -2742,7 +2706,7 @@ -DUNATTENDED:BOOL=ON -DINSTALL_PROPRIETARY=FALSE -DUSE_KDU=FALSE - + name ReleaseOS -- cgit v1.2.3 From a45806e17cc99961ab559f544f43691ccafa9bf2 Mon Sep 17 00:00:00 2001 From: Monty Brandenberg Date: Mon, 26 Aug 2013 15:35:34 -0400 Subject: Okay, move openssl back to the weird 0.9.8/1.0.0 mix it was before. Move libcurl forward to 7.24.0 and built on 0.9.8. Until we do some TC work, we may be stuck with this combo. --- autobuild.xml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 40372fc3be..038ac0f815 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -282,9 +282,9 @@ archive hash - 31ed5d2b5f8b19372c2a1ecf6574239c + f7d9b6a9c624364389b71209881f39de url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-curl/rev/280186/arch/Darwin/installer/curl-7.24.0-darwin-20130823.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-curl/rev/280289/arch/Darwin/installer/curl-7.24.0-darwin-20130826.tar.bz2 name darwin @@ -294,9 +294,9 @@ archive hash - a7d736bcc952bd403a4912122035df53 + 58b7bf45383c1b1bc24afb303b1519c8 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-curl/rev/280186/arch/Linux/installer/curl-7.24.0-linux-20130823.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-curl/rev/280289/arch/Linux/installer/curl-7.24.0-linux-20130826.tar.bz2 name linux @@ -306,9 +306,9 @@ archive hash - 4791f42564a1f426ea14492a86cfb7c9 + 8d9ccb0277a26bfe3f346c3c49ce4b58 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-curl/rev/280186/arch/CYGWIN/installer/curl-7.24.0-windows-20130824.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-curl/rev/280289/arch/CYGWIN/installer/curl-7.24.0-windows-20130826.tar.bz2 name windows @@ -1612,9 +1612,9 @@ archive hash - 29a4aa8f257989856f72f6021020fcdc + facee34b8bd57ad602157e65a5af1a49 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-openssl/rev/280235/arch/Darwin/installer/openssl-1.0.1e-darwin-20130823.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openssl-0.9.8q-darwin-20110211.tar.bz2 name darwin @@ -1624,9 +1624,9 @@ archive hash - d57f616e1127530f830eafb02a3b46bb + 3d40be8566fa4b9df9a38e2a0f9ea467 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-openssl/rev/280235/arch/Linux/installer/openssl-1.0.1e-linux-20130823.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-openssl/rev/226882/arch/Linux/installer/openssl-1.0.0d-linux-20110418.tar.bz2 name linux @@ -1636,9 +1636,9 @@ archive hash - b291d94f35887e4caf807f07129d559c + 774c7f0a0312bee3054757a623e227bc url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-openssl/rev/280235/arch/CYGWIN/installer/openssl-1.0.1e-windows-20130824.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-openssl/rev/220986/arch/CYGWIN/installer/openssl-0.9.8q-windows-20110211.tar.bz2 name windows -- cgit v1.2.3