livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Automated merge with http://hg.secondlife.com/viewer-development

master
Nat Goodspeed 2012-11-20 14:46:24 -05:00
parent 8b65c37250 e66dacddfd
commit 557293137c
17 changed files with 64 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
autobuild.xml
View File

@ -186,9 +186,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>36aa500e13cdde61607b6e93065206ec</string>
<string>610d3c3790b39d44b45ed1e471f7b34d</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-boost/rev/261457/arch/Darwin/installer/boost-1.48.0-darwin-20120710.tar.bz2</string>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-boost/rev/267115/arch/Darwin/installer/boost-1.52.0-darwin-20121117.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
@ -198,9 +198,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>18602d44bd435eb0d7189f436ff2cb0f</string>
<string>86b9108ab71bd6551365d1706e2fb178</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-boost/rev/261457/arch/Linux/installer/boost-1.48.0-linux-20120710.tar.bz2</string>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-boost/rev/267115/arch/Linux/installer/boost-1.52.0-linux-20121117.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
@ -210,9 +210,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>dc8f5dc6be04c64bf3460b4932b18457</string>
<string>a3bf306ebd14036a93f7894f898a862c</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-boost/rev/261457/arch/CYGWIN/installer/boost-1.48.0-windows-20120710.tar.bz2</string>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-boost/rev/267115/arch/CYGWIN/installer/boost-1.52.0-windows-20121117.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>

2
indra/cmake/Boost.cmake
View File

@ -16,9 +16,9 @@ if (STANDALONE)
else (STANDALONE)
use_prebuilt_binary(boost)
set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
set(BOOST_VERSION "1.52")
if (WINDOWS)
set(BOOST_VERSION 1_48)
if(MSVC80)
set(BOOST_PROGRAM_OPTIONS_LIBRARY
optimized libboost_program_options-vc80-mt-${BOOST_VERSION}

12
indra/cmake/Copy3rdPartyLibs.cmake
View File

@ -254,12 +254,12 @@ elseif(LINUX)
libapr-1.so.0
libaprutil-1.so.0
libatk-1.0.so
libboost_program_options-mt.so.1.48.0
libboost_regex-mt.so.1.48.0
libboost_thread-mt.so.1.48.0
libboost_filesystem-mt.so.1.48.0
libboost_signals-mt.so.1.48.0
libboost_system-mt.so.1.48.0
libboost_program_options-mt.so.${BOOST_VERSION}.0
libboost_regex-mt.so.${BOOST_VERSION}.0
libboost_thread-mt.so.${BOOST_VERSION}.0
libboost_filesystem-mt.so.${BOOST_VERSION}.0
libboost_signals-mt.so.${BOOST_VERSION}.0
libboost_system-mt.so.${BOOST_VERSION}.0
libbreakpad_client.so.0
libcollada14dom.so
libcrypto.so.1.0.0

1
indra/llcommon/CMakeLists.txt
View File

@ -116,6 +116,7 @@ set(llcommon_HEADER_FILES
bitpack.h
ctype_workaround.h
doublelinkedlist.h
fix_macros.h
imageids.h
indra_constants.h
linden_common.h

25
indra/llcommon/fix_macros.h Normal file
View File

@ -0,0 +1,25 @@
/**
* @file fix_macros.h
* @author Nat Goodspeed
* @date 2012-11-16
* @brief The Mac system headers seem to #define macros with obnoxiously
* generic names, preventing any library from using those names. We've
* had to fix these in so many places that it's worth making a header
* file to handle it.
*
* $LicenseInfo:firstyear=2012&license=viewerlgpl$
* Copyright (c) 2012, Linden Research, Inc.
* $/LicenseInfo$
*/
// DON'T use an #include guard: every time we encounter this header, #undef
// these macros all over again.
// who injects MACROS with such generic names?! Grr.
#ifdef equivalent
#undef equivalent
#endif
#ifdef check
#undef check
#endif

4
indra/llcommon/linden_common.h
View File

@ -59,8 +59,4 @@
#include "llerror.h"
#include "llfile.h"
// Boost 1.45 had version 2 as the default for the filesystem library,
// 1.48 has version 3 as the default. Keep compatibility for now.
#define BOOST_FILESYSTEM_VERSION 2
#endif

2
indra/llcorehttp/CMakeLists.txt
View File

@ -130,6 +130,7 @@ if (LL_TESTS)
${CARES_LIBRARIES}
${OPENSSL_LIBRARIES}
${CRYPTO_LIBRARIES}
${BOOST_SYSTEM_LIBRARY}
${BOOST_THREAD_LIBRARY}
)
@ -157,6 +158,7 @@ if (LL_TESTS)
${CARES_LIBRARIES}
${OPENSSL_LIBRARIES}
${CRYPTO_LIBRARIES}
${BOOST_SYSTEM_LIBRARY}
${BOOST_THREAD_LIBRARY}
)

1
indra/llcorehttp/_refcounted.h
View File

@ -30,6 +30,7 @@
#include "linden_common.h"
#include "fix_macros.h"
#include <boost/thread.hpp>
#include "llapr.h"

7
indra/llvfs/lldiriterator.cpp
View File

@ -26,6 +26,7 @@
#include "lldiriterator.h"
#include "fix_macros.h"
#include <boost/filesystem.hpp>
#include <boost/regex.hpp>
@ -59,7 +60,7 @@ LLDirIterator::Impl::Impl(const std::string &dirname, const std::string &mask)
{
is_dir = fs::is_directory(dir_path);
}
catch (fs::basic_filesystem_error<fs::path>& e)
catch (const fs::filesystem_error& e)
{
llwarns << e.what() << llendl;
return;
@ -76,7 +77,7 @@ LLDirIterator::Impl::Impl(const std::string &dirname, const std::string &mask)
{
mIter = fs::directory_iterator(dir_path);
}
catch (fs::basic_filesystem_error<fs::path>& e)
catch (const fs::filesystem_error& e)
{
llwarns << e.what() << llendl;
return;
@ -121,7 +122,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;

2
indra/llwindow/llwindowmacosx.h
View File

@ -36,8 +36,8 @@
#include <AGL/agl.h>
// AssertMacros.h does bad things.
#include "fix_macros.h"
#undef verify
#undef check
#undef require

2
indra/llwindow/llwindowsdl.h
View File

@ -41,8 +41,8 @@
#endif
// AssertMacros.h does bad things.
#include "fix_macros.h"
#undef verify
#undef check
#undef require

6
indra/newview/CMakeLists.txt
View File

@ -2079,6 +2079,12 @@ if (LL_TESTS)
LL_TEST_ADDITIONAL_LIBRARIES "${JSONCPP_LIBRARIES}"
)
set_source_files_properties(
lllogininstance.cpp
PROPERTIES
LL_TEST_ADDITIONAL_LIBRARIES "${BOOST_SYSTEM_LIBRARY}"
)
##################################################
# DISABLING PRECOMPILED HEADERS USAGE FOR TESTS
##################################################

2
indra/newview/lldirpicker.h
View File

@ -37,8 +37,8 @@
#include <Carbon/Carbon.h>
// AssertMacros.h does bad things.
#include "fix_macros.h"
#undef verify
#undef check
#undef require
#include <vector>

2
indra/newview/llfilepicker.h
View File

@ -39,8 +39,8 @@
#include <Carbon/Carbon.h>
// AssertMacros.h does bad things.
#include "fix_macros.h"
#undef verify
#undef check
#undef require
#include <vector>

4
indra/newview/lllocalbitmaps.cpp
View File

@ -32,9 +32,7 @@
#include "lllocalbitmaps.h"
/* boost: will not compile unless equivalent is undef'd, beware. */
#ifdef equivalent
#undef equivalent
#endif
#include "fix_macros.h"
#include <boost/filesystem.hpp>
/* image compression headers. */

2
indra/newview/macutil_Prefix.h
View File

@ -33,7 +33,7 @@
*/
#include <Carbon/Carbon.h>
#include "fix_macros.h"
#undef check
#undef verify
#undef require

12
indra/newview/viewer_manifest.py
View File

@ -1065,12 +1065,12 @@ class Linux_i686Manifest(LinuxManifest):
self.path("libaprutil-1.so")
self.path("libaprutil-1.so.0")
self.path("libaprutil-1.so.0.4.1")
self.path("libboost_program_options-mt.so.1.48.0")
self.path("libboost_regex-mt.so.1.48.0")
self.path("libboost_thread-mt.so.1.48.0")
self.path("libboost_filesystem-mt.so.1.48.0")
self.path("libboost_signals-mt.so.1.48.0")
self.path("libboost_system-mt.so.1.48.0")
self.path("libboost_program_options-mt.so.*")
self.path("libboost_regex-mt.so.*")
self.path("libboost_thread-mt.so.*")
self.path("libboost_filesystem-mt.so.*")
self.path("libboost_signals-mt.so.*")
self.path("libboost_system-mt.so.*")
self.path("libbreakpad_client.so.0.0.0")
self.path("libbreakpad_client.so.0")
self.path("libbreakpad_client.so")