From 4fb1bae807a5dd8a342946b8f23d2a7a5aa5d36a Mon Sep 17 00:00:00 2001
From: callum_linden <none@none>
Date: Fri, 10 Oct 2014 14:49:48 -0700
Subject: [PATCH] update autobuild.xml to point to new versions of boost,
googlemock and colladadom
---
autobuild.xml | 72 ++++++++++++++++++++++--------------
indra/cmake/GoogleMock.cmake | 10 ++---
2 files changed, 49 insertions(+), 33 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index f02e3c4d4fe..cd9ff3b67dc 100755
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -143,8 +143,12 @@
</map>
<key>boost</key>
<map>
+ <key>copyright</key>
+ <string>(see individual source files)</string>
+ <key>description</key>
+ <string>Boost C++ Libraries</string>
<key>license</key>
- <string>boost</string>
+ <string>boost 1.0</string>
<key>license_file</key>
<string>LICENSES/boost.txt</string>
<key>name</key>
@@ -156,9 +160,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>b57789bd22dd166aade4a35ec5d36fbb</string>
+ <string>ebbdee3a936e1ce3fc63da64fdab01b1</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3pl_3p-boost-update/rev/290566/arch/Darwin/installer/boost-1.55.0-darwin-20140602.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/boost_3p-update-boost/rev/295362/arch/Darwin/installer/boost-1.56-darwin-295362.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
@@ -188,11 +192,15 @@
<string>windows</string>
</map>
</map>
+ <key>version</key>
+ <string>1.56</string>
</map>
<key>colladadom</key>
<map>
+ <key>copyright</key>
+ <string>Copyright 2006 Sony Computer Entertainment Inc.</string>
<key>license</key>
- <string>scea</string>
+ <string>SCEA</string>
<key>license_file</key>
<string>LICENSES/collada.txt</string>
<key>name</key>
@@ -204,9 +212,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>68dc13f49a686331df6f0128c5483da3</string>
+ <string>07fc04b6fdac24461bd42eb81e187dfa</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3pl_3p-colladadom-update/rev/290576/arch/Darwin/installer/colladadom-2.3-darwin-20140602.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/colladadom_3p-update-colladadom/rev/295377/arch/Darwin/installer/colladadom-2.3.295377-darwin-295377.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
@@ -236,6 +244,8 @@
<string>windows</string>
</map>
</map>
+ <key>version</key>
+ <string>2.3.295377</string>
</map>
<key>curl</key>
<map>
@@ -839,14 +849,18 @@
<key>version</key>
<string>2.36.295075</string>
</map>
- <key>gmock</key>
+ <key>google_breakpad</key>
<map>
+ <key>copyright</key>
+ <string>Copyright (c) 2006, Google Inc.</string>
+ <key>description</key>
+ <string>Breakpad is a crossplatform library for capturing crash callstacks and runtime data.</string>
<key>license</key>
<string>bsd</string>
<key>license_file</key>
- <string>LICENSES/gmock.txt</string>
+ <string>LICENSES/google_breakpad.txt</string>
<key>name</key>
- <string>gmock</string>
+ <string>google_breakpad</string>
<key>platforms</key>
<map>
<key>darwin</key>
@@ -854,9 +868,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>36b0ea1a8be38f5749a7b13536b871ab</string>
+ <string>a41182ffaabaf72fd170535c0879eac0</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3pl_3p-google-mock-update/rev/290574/arch/Darwin/installer/gmock-1.7.0-darwin-20140602.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/google-breakpad_3p-update-google-breakpad/rev/294995/arch/Darwin/installer/google_breakpad-1332.294995-darwin-294995.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
@@ -866,9 +880,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>3de99704847b34c7acccf5ab87222f6c</string>
+ <string>52257e5eb166a0b69c9c0c38f6e1920e</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3pl_3p-google-mock-update/rev/290574/arch/Linux/installer/gmock-1.7.0-linux-20140602.tar.bz2</string>
+ <string>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</string>
</map>
<key>name</key>
<string>linux</string>
@@ -878,27 +892,29 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>5d91c1d03780aa26bcd5481145ee9e86</string>
+ <string>a1e519d08c507c12f9d412b2ae8328c8</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3pl_3p-google-mock-update/rev/290574/arch/CYGWIN/installer/gmock-1.7.0-windows-20140602.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-breakpad/rev/279804/arch/CYGWIN/installer/google_breakpad-0.0.0-rev1099-windows-20130813.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
</map>
</map>
+ <key>version</key>
+ <string>1332.294995</string>
</map>
- <key>google_breakpad</key>
+ <key>googlemock</key>
<map>
<key>copyright</key>
- <string>Copyright (c) 2006, Google Inc.</string>
+ <string>Copyright 2008, Google Inc.</string>
<key>description</key>
- <string>Breakpad is a crossplatform library for capturing crash callstacks and runtime data.</string>
+ <string>a library for writing and using C++ mock classes</string>
<key>license</key>
- <string>bsd</string>
+ <string>BSD</string>
<key>license_file</key>
- <string>LICENSES/google_breakpad.txt</string>
+ <string>LICENSES/gmock.txt</string>
<key>name</key>
- <string>google_breakpad</string>
+ <string>googlemock</string>
<key>platforms</key>
<map>
<key>darwin</key>
@@ -906,9 +922,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>a41182ffaabaf72fd170535c0879eac0</string>
+ <string>ccf131481cdbd211689a21f8294acc17</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/google-breakpad_3p-update-google-breakpad/rev/294995/arch/Darwin/installer/google_breakpad-1332.294995-darwin-294995.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/googlemock_3p-update-googlemock/rev/295374/arch/Darwin/installer/googlemock-1.7.0.295374-darwin-295374.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
@@ -918,9 +934,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>52257e5eb166a0b69c9c0c38f6e1920e</string>
+ <string>3de99704847b34c7acccf5ab87222f6c</string>
<key>url</key>
- <string>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</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3pl_3p-google-mock-update/rev/290574/arch/Linux/installer/gmock-1.7.0-linux-20140602.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
@@ -930,16 +946,16 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>a1e519d08c507c12f9d412b2ae8328c8</string>
+ <string>5d91c1d03780aa26bcd5481145ee9e86</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-breakpad/rev/279804/arch/CYGWIN/installer/google_breakpad-0.0.0-rev1099-windows-20130813.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3pl_3p-google-mock-update/rev/290574/arch/CYGWIN/installer/gmock-1.7.0-windows-20140602.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
</map>
</map>
<key>version</key>
- <string>1332.294995</string>
+ <string>1.7.0.295374</string>
</map>
<key>gperftools</key>
<map>
diff --git a/indra/cmake/GoogleMock.cmake b/indra/cmake/GoogleMock.cmake
index cac072988e8..5a00546927d 100755
--- a/indra/cmake/GoogleMock.cmake
+++ b/indra/cmake/GoogleMock.cmake
@@ -2,20 +2,20 @@
include(Prebuilt)
include(Linking)
-use_prebuilt_binary(gmock)
+use_prebuilt_binary(googlemock)
-set(GOOGLEMOCK_INCLUDE_DIRS
+set(GOOGLEMOCK_INCLUDE_DIRS
${LIBS_PREBUILT_DIR}/include)
if (LINUX)
# VWR-24366: gmock is underlinked, it needs gtest.
- set(GOOGLEMOCK_LIBRARIES
+ set(GOOGLEMOCK_LIBRARIES
gmock -Wl,--no-as-needed
gtest -Wl,--as-needed)
elseif(WINDOWS)
- set(GOOGLEMOCK_LIBRARIES
+ set(GOOGLEMOCK_LIBRARIES
gmock)
- set(GOOGLEMOCK_INCLUDE_DIRS
+ set(GOOGLEMOCK_INCLUDE_DIRS
${LIBS_PREBUILT_DIR}/include
${LIBS_PREBUILT_DIR}/include/gmock
${LIBS_PREBUILT_DIR}/include/gmock/boost/tr1/tr1)
--
GitLab