From 92acb99f6fc22aaaccc138187f874a90bd34529c Mon Sep 17 00:00:00 2001 From: callum Date: Mon, 12 Nov 2012 15:55:17 -0800 Subject: Point autobuild at new Boost 1.52 third-party libs --- autobuild.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 05e0ac28ae..5253b54a52 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -186,9 +186,9 @@ archive hash - d98078791ce345bf6168ce9ba53ca2d7 + 11aa8b3e11938076a4a28ab1ead9ba2b url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-boost/rev/222752/arch/Darwin/installer/boost-1.45.0-darwin-20110304.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-boost/rev/266872/arch/Darwin/installer/boost-1.52.0-darwin-20121112.tar.bz2 name darwin @@ -198,9 +198,9 @@ archive hash - a34e7fffdb94a6a4d8a2966b1f216da3 + eafde4723a18665239e3a2e0a5f20e10 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.45.0-linux-20110310.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-boost/rev/266872/arch/Linux/installer/boost-1.52.0-linux-20121112.tar.bz2 name linux @@ -210,9 +210,9 @@ archive hash - 98be22c8833aa2bca184b9fa09fbb82b + 6b448a9d0014c43f4f77b1410062525b url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.45.0-windows-20110124.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-boost/rev/266872/arch/CYGWIN/installer/boost-1.52.0-windows-20121112.tar.bz name windows -- cgit v1.2.3 From 586d878ef5c415ebf711e5b3a5ad220e9671e50b Mon Sep 17 00:00:00 2001 From: callum_linden Date: Mon, 12 Nov 2012 16:55:20 -0800 Subject: First round of fixes to make viewer work with Boost 1.52 --- indra/cmake/Boost.cmake | 10 +++++----- indra/llvfs/lldiriterator.cpp | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake index 2135f0584c..6b5af44a99 100644 --- a/indra/cmake/Boost.cmake +++ b/indra/cmake/Boost.cmake @@ -17,7 +17,7 @@ else (STANDALONE) set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) if (WINDOWS) - set(BOOST_VERSION 1_45) + set(BOOST_VERSION 1_52) if(MSVC80) set(BOOST_PROGRAM_OPTIONS_LIBRARY optimized libboost_program_options-vc80-mt-${BOOST_VERSION} @@ -50,9 +50,9 @@ else (STANDALONE) debug libboost_filesystem-vc100-mt-gd-${BOOST_VERSION}) endif (MSVC80) elseif (DARWIN OR LINUX) - set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options) - set(BOOST_REGEX_LIBRARY boost_regex) - set(BOOST_SYSTEM_LIBRARY boost_system) - set(BOOST_FILESYSTEM_LIBRARY boost_filesystem) + set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt) + set(BOOST_REGEX_LIBRARY boost_regex-mt) + set(BOOST_SYSTEM_LIBRARY boost_system-mt) + set(BOOST_FILESYSTEM_LIBRARY boost_filesystem-mt) endif (WINDOWS) endif (STANDALONE) diff --git a/indra/llvfs/lldiriterator.cpp b/indra/llvfs/lldiriterator.cpp index ff92cbb7fd..fa806bf23e 100644 --- a/indra/llvfs/lldiriterator.cpp +++ b/indra/llvfs/lldiriterator.cpp @@ -59,7 +59,7 @@ LLDirIterator::Impl::Impl(const std::string &dirname, const std::string &mask) { is_dir = fs::is_directory(dir_path); } - catch (fs::basic_filesystem_error& e) + catch (const fs::filesystem_error& e) { llwarns << e.what() << llendl; return; @@ -76,7 +76,7 @@ LLDirIterator::Impl::Impl(const std::string &dirname, const std::string &mask) { mIter = fs::directory_iterator(dir_path); } - catch (fs::basic_filesystem_error& e) + catch (const fs::filesystem_error& e) { llwarns << e.what() << llendl; return; @@ -121,7 +121,7 @@ bool LLDirIterator::Impl::next(std::string &fname) while (mIter != end_itr && !found) { boost::smatch match; - std::string name = mIter->path().filename(); + std::string name = mIter->path().filename().string(); if (found = boost::regex_match(name, match, mFilterExp)) { fname = name; -- cgit v1.2.3 From 48da6d457840eedee501fdb5f7d994fbaa703db8 Mon Sep 17 00:00:00 2001 From: calluym_linden Date: Tue, 13 Nov 2012 13:41:02 -0800 Subject: Changed format of Windows Boost 3p lib - Amazon S3 chokes on sub-domain version and no one knows why --- autobuild.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autobuild.xml b/autobuild.xml index 5253b54a52..210dfd7849 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -212,7 +212,7 @@ hash 6b448a9d0014c43f4f77b1410062525b url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-boost/rev/266872/arch/CYGWIN/installer/boost-1.52.0-windows-20121112.tar.bz + https://s3.amazonaws.com/automated-builds-secondlife-com/hg/repo/3p-boost/rev/266872/arch/CYGWIN/installer/boost-1.52.0-windows-20121112.tar.bz2 name windows -- cgit v1.2.3 From f4d30bd1ed7a175f659f5460ee4a78c332974cec Mon Sep 17 00:00:00 2001 From: callum_linden Date: Tue, 13 Nov 2012 14:25:01 -0800 Subject: Update Windows lib names for new Boost package --- indra/cmake/Boost.cmake | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake index 6b5af44a99..b857822071 100644 --- a/indra/cmake/Boost.cmake +++ b/indra/cmake/Boost.cmake @@ -17,8 +17,8 @@ else (STANDALONE) set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) if (WINDOWS) - set(BOOST_VERSION 1_52) if(MSVC80) + set(BOOST_VERSION 1_52) set(BOOST_PROGRAM_OPTIONS_LIBRARY optimized libboost_program_options-vc80-mt-${BOOST_VERSION} debug libboost_program_options-vc80-mt-gd-${BOOST_VERSION}) @@ -37,17 +37,17 @@ else (STANDALONE) else(MSVC80) # MSVC 10.0 config set(BOOST_PROGRAM_OPTIONS_LIBRARY - optimized libboost_program_options-vc100-mt-${BOOST_VERSION} - debug libboost_program_options-vc100-mt-gd-${BOOST_VERSION}) + optimized libboost_program_options-mt + debug libboost_program_options-mt-gd) set(BOOST_REGEX_LIBRARY - optimized libboost_regex-vc100-mt-${BOOST_VERSION} - debug libboost_regex-vc100-mt-gd-${BOOST_VERSION}) + optimized libboost_regex-mt} + debug libboost_regex-mt-gd) set(BOOST_SYSTEM_LIBRARY - optimized libboost_system-vc100-mt-${BOOST_VERSION} - debug libboost_system-vc100-mt-gd-${BOOST_VERSION}) + optimized libboost_system-mt} + debug libboost_system-mt-gd) set(BOOST_FILESYSTEM_LIBRARY - optimized libboost_filesystem-vc100-mt-${BOOST_VERSION} - debug libboost_filesystem-vc100-mt-gd-${BOOST_VERSION}) + optimized libboost_filesystem-mt} + debug libboost_filesystem-mt-gd) endif (MSVC80) elseif (DARWIN OR LINUX) set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt) -- cgit v1.2.3 From dfdab39c5e1933b3bada15035a5aff2882eb479d Mon Sep 17 00:00:00 2001 From: callum_linden Date: Tue, 13 Nov 2012 14:58:43 -0800 Subject: Stupid typo in Boost Cmake file --- indra/cmake/Boost.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake index b857822071..8c0dfe4fb2 100644 --- a/indra/cmake/Boost.cmake +++ b/indra/cmake/Boost.cmake @@ -40,13 +40,13 @@ else (STANDALONE) optimized libboost_program_options-mt debug libboost_program_options-mt-gd) set(BOOST_REGEX_LIBRARY - optimized libboost_regex-mt} + optimized libboost_regex-mt debug libboost_regex-mt-gd) set(BOOST_SYSTEM_LIBRARY - optimized libboost_system-mt} + optimized libboost_system-mt debug libboost_system-mt-gd) set(BOOST_FILESYSTEM_LIBRARY - optimized libboost_filesystem-mt} + optimized libboost_filesystem-mt debug libboost_filesystem-mt-gd) endif (MSVC80) elseif (DARWIN OR LINUX) -- cgit v1.2.3 From 8edd1c72be078977c045792c815defc324fb2696 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 15 Nov 2012 21:31:32 -0500 Subject: Remove Boost version "1_45" baked into library names. On Windows, LLPrimitive.cmake named four Boost libraries with names ending in the string 1_45. Now that we're trying to upgrade Boost to 1.52, those suffixes are inappropriate. Fortunately the libraries in our current Boost package do not have version-stamped names, so we hope this fix can survive for several Boost upgrades to come. --- indra/cmake/LLPrimitive.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/indra/cmake/LLPrimitive.cmake b/indra/cmake/LLPrimitive.cmake index f15a2c2649..ab39cbb6be 100644 --- a/indra/cmake/LLPrimitive.cmake +++ b/indra/cmake/LLPrimitive.cmake @@ -15,10 +15,10 @@ if (WINDOWS) optimized llprimitive debug libcollada14dom22-d optimized libcollada14dom22 - debug libboost_filesystem-vc100-mt-gd-1_45 - optimized libboost_filesystem-vc100-mt-1_45 - debug libboost_system-vc100-mt-gd-1_45 - optimized libboost_system-vc100-mt-1_45 + debug libboost_filesystem-mt-gd + optimized libboost_filesystem-mt + debug libboost_system-mt-gd + optimized libboost_system-mt ) else (WINDOWS) set(LLPRIMITIVE_LIBRARIES -- cgit v1.2.3 From 12a3f2ea72893827a3b34e2f95b462387e844c9d Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Fri, 16 Nov 2012 07:08:17 -0500 Subject: Use new 3p-boost 1.52 build with Windows /Zc:wchar_t- compile switch. --- autobuild.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 210dfd7849..b60f2137a1 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -186,9 +186,9 @@ archive hash - 11aa8b3e11938076a4a28ab1ead9ba2b + f01fb9e6b7e843b6d1179c88a5f77da2 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-boost/rev/266872/arch/Darwin/installer/boost-1.52.0-darwin-20121112.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-boost/rev/267082/arch/Darwin/installer/boost-1.52.0-darwin-20121115.tar.bz2 name darwin @@ -198,9 +198,9 @@ archive hash - eafde4723a18665239e3a2e0a5f20e10 + 3f8d67c43bad126dbc77b863cc232e09 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-boost/rev/266872/arch/Linux/installer/boost-1.52.0-linux-20121112.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-boost/rev/267082/arch/Linux/installer/boost-1.52.0-linux-20121116.tar.bz2 name linux @@ -210,9 +210,9 @@ archive hash - 6b448a9d0014c43f4f77b1410062525b + e32bb4bc1254003f4c651208e24d3cbd url - https://s3.amazonaws.com/automated-builds-secondlife-com/hg/repo/3p-boost/rev/266872/arch/CYGWIN/installer/boost-1.52.0-windows-20121112.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-boost/rev/267082/arch/CYGWIN/installer/boost-1.52.0-windows-20121115.tar.bz2 name windows -- cgit v1.2.3