From b7637e58bef73abfced2721d6b697e47b2d9f622 Mon Sep 17 00:00:00 2001 From: "Andrew A. de Laix" Date: Thu, 13 Jan 2011 13:09:27 -0800 Subject: mac buiding with autobuild and autobuild style packages (just say no to install.py) --- indra/newview/viewer_manifest.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 338c62b9fb..2500ae2b37 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -566,7 +566,7 @@ class DarwinManifest(ViewerManifest): self.path("Info-SecondLife.plist", dst="Info.plist") # copy additional libs in /Contents/MacOS/ - self.path("../../libraries/universal-darwin/lib_release/libndofdev.dylib", dst="MacOS/libndofdev.dylib") + self.path("../packages/lib/release/libndofdev.dylib", dst="MacOS/libndofdev.dylib") self.path("../viewer_components/updater/scripts/darwin/update_install", "MacOS/update_install") @@ -616,7 +616,7 @@ class DarwinManifest(ViewerManifest): self.path("vivox-runtime/universal-darwin/libvivoxplatform.dylib", "libvivoxplatform.dylib") self.path("vivox-runtime/universal-darwin/SLVoice", "SLVoice") - libdir = "../../libraries/universal-darwin/lib_release" + libdir = "../packages/lib/release" dylibs = {} # Need to get the llcommon dll from any of the build directories as well @@ -685,7 +685,7 @@ class DarwinManifest(ViewerManifest): if self.prefix(src="", dst="llplugin"): self.path("../media_plugins/quicktime/" + self.args['configuration'] + "/media_plugin_quicktime.dylib", "media_plugin_quicktime.dylib") self.path("../media_plugins/webkit/" + self.args['configuration'] + "/media_plugin_webkit.dylib", "media_plugin_webkit.dylib") - self.path("../../libraries/universal-darwin/lib_release/libllqtwebkit.dylib", "libllqtwebkit.dylib") + self.path("../packages/lib/release/libllqtwebkit.dylib", "libllqtwebkit.dylib") self.end_prefix("llplugin") -- cgit v1.2.3 From 738c7546087b5c5fa049be0563623221ef5716c6 Mon Sep 17 00:00:00 2001 From: Alain Linden Date: Fri, 14 Jan 2011 09:03:22 -0800 Subject: windows autobuildibatized (bye bye install.py...) --- indra/newview/CMakeLists.txt | 2 +- indra/newview/viewer_manifest.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index a61c35abd2..759c8e4045 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1506,7 +1506,7 @@ if (WINDOWS) ${CMAKE_CURRENT_SOURCE_DIR}/licenses-win32.txt ${CMAKE_CURRENT_SOURCE_DIR}/featuretable.txt ${CMAKE_CURRENT_SOURCE_DIR}/featuretable_xp.txt - ${CMAKE_CURRENT_SOURCE_DIR}/dbghelp.dll + ${ARCH_PREBUILT_DIRS_RELEASE}/dbghelp.dll ${ARCH_PREBUILT_DIRS_RELEASE}/libeay32.dll ${ARCH_PREBUILT_DIRS_RELEASE}/qtcore4.dll ${ARCH_PREBUILT_DIRS_RELEASE}/qtgui4.dll diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 2500ae2b37..4a1ad6c893 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -299,6 +299,9 @@ class WindowsManifest(ViewerManifest): self.path("vivoxplatform.dll") self.path("vivoxoal.dll") + # For use in crash reporting (generates minidumps) + self.path("dbghelp.dll") + # For google-perftools tcmalloc allocator. try: if self.args['configuration'].lower() == 'debug': @@ -314,9 +317,6 @@ class WindowsManifest(ViewerManifest): self.path("featuretable.txt") self.path("featuretable_xp.txt") - # For use in crash reporting (generates minidumps) - self.path("dbghelp.dll") - self.enable_no_crt_manifest_check() # Media plugins - QuickTime @@ -336,7 +336,7 @@ class WindowsManifest(ViewerManifest): if self.args['configuration'].lower() == 'debug': - if self.prefix(src=os.path.join(os.pardir, os.pardir, 'libraries', 'i686-win32', 'lib', 'debug'), + if self.prefix(src=os.path.join(os.pardir, 'packages', 'lib', 'debug'), dst="llplugin"): self.path("libeay32.dll") self.path("qtcored4.dll") @@ -367,7 +367,7 @@ class WindowsManifest(ViewerManifest): self.end_prefix() else: - if self.prefix(src=os.path.join(os.pardir, os.pardir, 'libraries', 'i686-win32', 'lib', 'release'), + if self.prefix(src=os.path.join(os.pardir, 'packages', 'lib', 'release'), dst="llplugin"): self.path("libeay32.dll") self.path("qtcore4.dll") -- cgit v1.2.3 From 5b0d510ca0e136b0fb20b56b1c921666054bd7cc Mon Sep 17 00:00:00 2001 From: Alain Linden Date: Tue, 18 Jan 2011 12:41:49 -0800 Subject: windows build fixes. --- indra/newview/viewer_manifest.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 4a1ad6c893..cb74422ca2 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -300,7 +300,8 @@ class WindowsManifest(ViewerManifest): self.path("vivoxoal.dll") # For use in crash reporting (generates minidumps) - self.path("dbghelp.dll") + if self.args['configuration'].lower() != 'debug': + self.path("dbghelp.dll") # For google-perftools tcmalloc allocator. try: -- cgit v1.2.3 From a339c948b554070d900aaaca8e6df10694282672 Mon Sep 17 00:00:00 2001 From: "Andrew A. de Laix" Date: Wed, 19 Jan 2011 12:11:54 -0800 Subject: update google-breakpad package; fix call to dump symbols. --- indra/newview/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 759c8e4045..b5cb067061 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1870,7 +1870,7 @@ if (PACKAGE) "${VIEWER_DIST_DIR}" "${VIEWER_EXE_GLOBS}" "${VIEWER_LIB_GLOB}" - "${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/bin/dump_syms" + "${AUTOBUILD_INSTALL_DIR}/bin/dump_syms" "${VIEWER_SYMBOL_FILE}" DEPENDS generate_breakpad_symbols.py VERBATIM) -- cgit v1.2.3 From 046f2a9fea85f9d59128f8499563fad5840c9add Mon Sep 17 00:00:00 2001 From: "Andrew A. de Laix" Date: Wed, 19 Jan 2011 14:50:56 -0800 Subject: fix copying of vivox files for darwin manifest. --- indra/newview/viewer_manifest.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index cb74422ca2..2afd1fc1af 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -609,14 +609,6 @@ class DarwinManifest(ViewerManifest): self.path("uk.lproj") self.path("zh-Hans.lproj") - # SLVoice and vivox lols - self.path("vivox-runtime/universal-darwin/libsndfile.dylib", "libsndfile.dylib") - self.path("vivox-runtime/universal-darwin/libvivoxoal.dylib", "libvivoxoal.dylib") - self.path("vivox-runtime/universal-darwin/libortp.dylib", "libortp.dylib") - self.path("vivox-runtime/universal-darwin/libvivoxsdk.dylib", "libvivoxsdk.dylib") - self.path("vivox-runtime/universal-darwin/libvivoxplatform.dylib", "libvivoxplatform.dylib") - self.path("vivox-runtime/universal-darwin/SLVoice", "SLVoice") - libdir = "../packages/lib/release" dylibs = {} @@ -644,6 +636,11 @@ class DarwinManifest(ViewerManifest): ): self.path(os.path.join(libdir, libfile), libfile) + # SLVoice and vivox lols + for libfile in ('libsndfile.dylib', 'libvivoxoal.dylib', 'libortp.dylib', \ + 'libvivoxsdk.dylib', 'libvivoxplatform.dylib', 'SLVoice') : + self.path(os.path.join(libdir, libfile), libfile) + try: # FMOD for sound self.path(self.args['configuration'] + "/libfmodwrapper.dylib", "libfmodwrapper.dylib") -- cgit v1.2.3 From 1ec7b651e1090089ce91599eed4143ba8e978a43 Mon Sep 17 00:00:00 2001 From: jenn Date: Thu, 20 Jan 2011 14:25:03 -0800 Subject: Updated viewer_manifest.py to refer to the correct source paths for the linux build. --- indra/newview/viewer_manifest.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 2afd1fc1af..b803a55110 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -923,7 +923,7 @@ class Linux_i686Manifest(LinuxManifest): def construct(self): super(Linux_i686Manifest, self).construct() - if self.prefix("../../libraries/i686-linux/lib_release_client", dst="lib"): + if self.prefix("../packages/lib/release", dst="lib"): self.path("libapr-1.so.0") self.path("libaprutil-1.so.0") self.path("libbreakpad_client.so.0.0.0", "libbreakpad_client.so.0") @@ -947,10 +947,10 @@ class Linux_i686Manifest(LinuxManifest): self.end_prefix("lib") # Vivox runtimes - if self.prefix(src="vivox-runtime/i686-linux", dst="bin"): + if self.prefix(src="../packages/lib/release", dst="bin"): self.path("SLVoice") self.end_prefix() - if self.prefix(src="vivox-runtime/i686-linux", dst="lib"): + if self.prefix(src="../packages/lib/release", dst="lib"): self.path("libortp.so") self.path("libsndfile.so.1") #self.path("libvivoxoal.so.1") # no - we'll re-use the viewer's own OpenAL lib -- cgit v1.2.3 From 9775b80fefe79b7f424677aaf0f70e8b4142b15f Mon Sep 17 00:00:00 2001 From: "Mark Palange (Mani)" Date: Fri, 21 Jan 2011 14:25:33 -0800 Subject: Code fixes for VS2010 compatibility --- indra/newview/llgroupmgr.cpp | 1 + indra/newview/lllogchat.cpp | 1 + indra/newview/llpaneloutfitedit.cpp | 6 +++--- 3 files changed, 5 insertions(+), 3 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/llgroupmgr.cpp b/indra/newview/llgroupmgr.cpp index 7546c070ea..ce936a9924 100644 --- a/indra/newview/llgroupmgr.cpp +++ b/indra/newview/llgroupmgr.cpp @@ -52,6 +52,7 @@ #include #if LL_MSVC +#pragma warning(push) // disable boost::lexical_cast warning #pragma warning (disable:4702) #endif diff --git a/indra/newview/lllogchat.cpp b/indra/newview/lllogchat.cpp index b09cfbe907..efc4e23838 100644 --- a/indra/newview/lllogchat.cpp +++ b/indra/newview/lllogchat.cpp @@ -42,6 +42,7 @@ #include #if LL_MSVC +#pragma warning(push) // disable warning about boost::lexical_cast unreachable code // when it fails to parse the string #pragma warning (disable:4702) diff --git a/indra/newview/llpaneloutfitedit.cpp b/indra/newview/llpaneloutfitedit.cpp index c10c21683b..9346e48d1e 100644 --- a/indra/newview/llpaneloutfitedit.cpp +++ b/indra/newview/llpaneloutfitedit.cpp @@ -1323,19 +1323,19 @@ void LLPanelOutfitEdit::getCurrentItemUUID(LLUUID& selected_id) void LLPanelOutfitEdit::getSelectedItemsUUID(uuid_vec_t& uuid_list) { + void (uuid_vec_t::* tmp)(LLUUID const &) = &uuid_vec_t::push_back; if (mInventoryItemsPanel->getVisible()) { std::set item_set = mInventoryItemsPanel->getRootFolder()->getSelectionList(); - std::for_each(item_set.begin(), item_set.end(), boost::bind( &uuid_vec_t::push_back, &uuid_list, _1)); + std::for_each(item_set.begin(), item_set.end(), boost::bind( tmp, &uuid_list, _1)); } else if (mWearablesListViewPanel->getVisible()) { std::vector item_set; mWearableItemsList->getSelectedValues(item_set); - std::for_each(item_set.begin(), item_set.end(), boost::bind( &uuid_vec_t::push_back, &uuid_list, boost::bind(&LLSD::asUUID, _1 ))); - + std::for_each(item_set.begin(), item_set.end(), boost::bind( tmp, &uuid_list, boost::bind(&LLSD::asUUID, _1 ))); } // return selected_id; -- cgit v1.2.3 From 45e25e83cf7457f495b051b9f7683ee299547290 Mon Sep 17 00:00:00 2001 From: "Mark Palange (Mani)" Date: Fri, 21 Jan 2011 15:30:01 -0800 Subject: Disabled media_plugin_webkit dependency, temporarily --- indra/newview/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 5d2342e925..a842e0db76 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1547,7 +1547,7 @@ if (WINDOWS) ${ARCH_PREBUILT_DIRS_RELEASE}/codecs/qtwcodecsd4.dll SLPlugin media_plugin_quicktime - media_plugin_webkit + #media_plugin_webkit winmm_shim windows-crash-logger windows-updater -- cgit v1.2.3 From 48bf6b19b36a3ff3f5b3d440d511a0e3dba3d768 Mon Sep 17 00:00:00 2001 From: Alain Linden Date: Mon, 31 Jan 2011 15:55:42 -0800 Subject: build uses latest jsoncpp package with new layout. --- indra/newview/lltranslate.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/lltranslate.cpp b/indra/newview/lltranslate.cpp index 8ccfdb071b..7731a98778 100644 --- a/indra/newview/lltranslate.cpp +++ b/indra/newview/lltranslate.cpp @@ -39,7 +39,7 @@ #include "llversioninfo.h" #include "llviewercontrol.h" -#include "jsoncpp/reader.h" +#include "reader.h" // These two are concatenated with the language specifiers to form a complete Google Translate URL const char* LLTranslate::m_GoogleURL = "http://ajax.googleapis.com/ajax/services/language/translate?v=1.0&q="; -- cgit v1.2.3 From c2bfa25299c798b811c50b2f6f793d3a9bb914dd Mon Sep 17 00:00:00 2001 From: Alain Linden Date: Mon, 7 Feb 2011 16:46:18 -0800 Subject: update pacageing of msvc?100.dll's; use latest qt package with all needed libs. --- indra/newview/viewer_manifest.py | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index b803a55110..2c8d4bc6d5 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -174,6 +174,9 @@ class WindowsManifest(ViewerManifest): return ''.join(self.channel().split()) + '.exe' def test_msvcrt_and_copy_action(self, src, dst): + # Skip this test as of VS2010 + return + # This is used to test a dll manifest. # It is used as a temporary override during the construct method from test_win32_manifest import test_assembly_binding @@ -193,6 +196,9 @@ class WindowsManifest(ViewerManifest): print "Doesn't exist:", src def test_for_no_msvcrt_manifest_and_copy_action(self, src, dst): + # Skip this test as of VS2010 + return + # This is used to test that no manifest for the msvcrt exists. # It is used as a temporary override during the construct method from test_win32_manifest import test_assembly_binding @@ -282,13 +288,11 @@ class WindowsManifest(ViewerManifest): # These need to be installed as a SxS assembly, currently a 'private' assembly. # See http://msdn.microsoft.com/en-us/library/ms235291(VS.80).aspx if self.args['configuration'].lower() == 'debug': - self.path("msvcr80d.dll") - self.path("msvcp80d.dll") - self.path("Microsoft.VC80.DebugCRT.manifest") + self.path("msvcr100d.dll") + self.path("msvcp80d.dll") else: - self.path("msvcr80.dll") - self.path("msvcp80.dll") - self.path("Microsoft.VC80.CRT.manifest") + self.path("msvcr100.dll") + self.path("msvcp100.dll") # Vivox runtimes self.path("SLVoice.exe") @@ -390,12 +394,12 @@ class WindowsManifest(ViewerManifest): self.end_prefix() # For WebKit/Qt plugin runtimes (codec/character encoding plugins) - if self.prefix(src="codecs", dst="codecs"): - self.path("qcncodecs4.dll") - self.path("qjpcodecs4.dll") - self.path("qkrcodecs4.dll") - self.path("qtwcodecs4.dll") - self.end_prefix() +# if self.prefix(src="codecs", dst="codecs"): +# self.path("qcncodecs4.dll") +# self.path("qjpcodecs4.dll") +# self.path("qkrcodecs4.dll") +# self.path("qtwcodecs4.dll") +# self.end_prefix() self.end_prefix() -- cgit v1.2.3 From 6dd41886b3dfbc2df4ccc6bb75722a5aaee23682 Mon Sep 17 00:00:00 2001 From: Alain Linden Date: Tue, 8 Feb 2011 12:14:17 -0800 Subject: fix a couple more packaging problems... --- indra/newview/CMakeLists.txt | 2 +- indra/newview/viewer_manifest.py | 16 ++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index a7279bd86f..ef1d05a779 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1547,7 +1547,7 @@ if (WINDOWS) ${ARCH_PREBUILT_DIRS_RELEASE}/codecs/qtwcodecsd4.dll SLPlugin media_plugin_quicktime - #media_plugin_webkit + media_plugin_webkit winmm_shim windows-crash-logger windows-updater diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 2c8d4bc6d5..ed7422433e 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -302,6 +302,10 @@ class WindowsManifest(ViewerManifest): self.path("zlib1.dll") self.path("vivoxplatform.dll") self.path("vivoxoal.dll") + + # Security + self.path("ssleay32.dll") + self.path("libeay32.dll") # For use in crash reporting (generates minidumps) if self.args['configuration'].lower() != 'debug': @@ -394,12 +398,12 @@ class WindowsManifest(ViewerManifest): self.end_prefix() # For WebKit/Qt plugin runtimes (codec/character encoding plugins) -# if self.prefix(src="codecs", dst="codecs"): -# self.path("qcncodecs4.dll") -# self.path("qjpcodecs4.dll") -# self.path("qkrcodecs4.dll") -# self.path("qtwcodecs4.dll") -# self.end_prefix() + if self.prefix(src="codecs", dst="codecs"): + self.path("qcncodecs4.dll") + self.path("qjpcodecs4.dll") + self.path("qkrcodecs4.dll") + self.path("qtwcodecs4.dll") + self.end_prefix() self.end_prefix() -- cgit v1.2.3 From 38a2af923561f8865976843c58a21f851695c9c2 Mon Sep 17 00:00:00 2001 From: Alain Linden Date: Thu, 10 Feb 2011 17:26:16 -0800 Subject: various fixes to get the debug build working; don't look for or copy msvc*80.dll's. --- indra/newview/CMakeLists.txt | 15 ++++++--------- indra/newview/viewer_manifest.py | 2 +- 2 files changed, 7 insertions(+), 10 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index ef1d05a779..abba6f134d 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1488,15 +1488,12 @@ if (WINDOWS) ${SHARED_LIB_STAGING_DIR}/Release/fmod.dll ${SHARED_LIB_STAGING_DIR}/RelWithDebInfo/fmod.dll ${SHARED_LIB_STAGING_DIR}/Debug/fmod.dll - ${SHARED_LIB_STAGING_DIR}/Release/msvcr80.dll - ${SHARED_LIB_STAGING_DIR}/Release/msvcp80.dll - ${SHARED_LIB_STAGING_DIR}/Release/Microsoft.VC80.CRT.manifest - ${SHARED_LIB_STAGING_DIR}/RelWithDebInfo/msvcr80.dll - ${SHARED_LIB_STAGING_DIR}/RelWithDebInfo/msvcp80.dll - ${SHARED_LIB_STAGING_DIR}/RelWithDebInfo/Microsoft.VC80.CRT.manifest - ${SHARED_LIB_STAGING_DIR}/Debug/msvcr80d.dll - ${SHARED_LIB_STAGING_DIR}/Debug/msvcp80d.dll - ${SHARED_LIB_STAGING_DIR}/Debug/Microsoft.VC80.DebugCRT.manifest + ${SHARED_LIB_STAGING_DIR}/Release/msvcr100.dll + ${SHARED_LIB_STAGING_DIR}/Release/msvcp100.dll + ${SHARED_LIB_STAGING_DIR}/RelWithDebInfo/msvcr100.dll + ${SHARED_LIB_STAGING_DIR}/RelWithDebInfo/msvcp100.dll + ${SHARED_LIB_STAGING_DIR}/Debug/msvcr100d.dll + ${SHARED_LIB_STAGING_DIR}/Debug/msvcp100d.dll ${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/SLVoice.exe ${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/vivoxsdk.dll ${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/ortp.dll diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index ed7422433e..c11e5ed429 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -289,7 +289,7 @@ class WindowsManifest(ViewerManifest): # See http://msdn.microsoft.com/en-us/library/ms235291(VS.80).aspx if self.args['configuration'].lower() == 'debug': self.path("msvcr100d.dll") - self.path("msvcp80d.dll") + self.path("msvcp100d.dll") else: self.path("msvcr100.dll") self.path("msvcp100.dll") -- cgit v1.2.3 From c522aedacee8e5ecfbbb1573232af5311f96595a Mon Sep 17 00:00:00 2001 From: brad kittenbrink Date: Fri, 18 Feb 2011 18:31:19 -0800 Subject: Fix for packaging failure. Installer was missing the SecondLife.exe binary due to improperly disabled msvcrt manifest checking. reviewed by jenn. --- indra/newview/viewer_manifest.py | 39 ++++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 21 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index c11e5ed429..92b0129611 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -174,9 +174,6 @@ class WindowsManifest(ViewerManifest): return ''.join(self.channel().split()) + '.exe' def test_msvcrt_and_copy_action(self, src, dst): - # Skip this test as of VS2010 - return - # This is used to test a dll manifest. # It is used as a temporary override during the construct method from test_win32_manifest import test_assembly_binding @@ -196,9 +193,6 @@ class WindowsManifest(ViewerManifest): print "Doesn't exist:", src def test_for_no_msvcrt_manifest_and_copy_action(self, src, dst): - # Skip this test as of VS2010 - return - # This is used to test that no manifest for the msvcrt exists. # It is used as a temporary override during the construct method from test_win32_manifest import test_assembly_binding @@ -225,22 +219,25 @@ class WindowsManifest(ViewerManifest): else: print "Doesn't exist:", src - def enable_crt_manifest_check(self): - if self.is_packaging_viewer(): - WindowsManifest.copy_action = WindowsManifest.test_msvcrt_and_copy_action + ### DISABLED MANIFEST CHECKING for vs2010. we may need to reenable this + # shortly. If this hasn't been reenabled by the 2.9 viewer release then it + # should be deleted -brad + #def enable_crt_manifest_check(self): + # if self.is_packaging_viewer(): + # WindowsManifest.copy_action = WindowsManifest.test_msvcrt_and_copy_action - def enable_no_crt_manifest_check(self): - if self.is_packaging_viewer(): - WindowsManifest.copy_action = WindowsManifest.test_for_no_msvcrt_manifest_and_copy_action + #def enable_no_crt_manifest_check(self): + # if self.is_packaging_viewer(): + # WindowsManifest.copy_action = WindowsManifest.test_for_no_msvcrt_manifest_and_copy_action - def disable_manifest_check(self): - if self.is_packaging_viewer(): - del WindowsManifest.copy_action + #def disable_manifest_check(self): + # if self.is_packaging_viewer(): + # del WindowsManifest.copy_action def construct(self): super(WindowsManifest, self).construct() - self.enable_crt_manifest_check() + #self.enable_crt_manifest_check() if self.is_packaging_viewer(): # Find secondlife-bin.exe in the 'configuration' dir, then rename it to the result of final_exe. @@ -251,7 +248,7 @@ class WindowsManifest(ViewerManifest): 'llplugin', 'slplugin', self.args['configuration'], "slplugin.exe"), "slplugin.exe") - self.disable_manifest_check() + #self.disable_manifest_check() self.path(src="../viewer_components/updater/scripts/windows/update_install.bat", dst="update_install.bat") @@ -259,7 +256,7 @@ class WindowsManifest(ViewerManifest): if self.prefix(src=os.path.join(os.pardir, 'sharedlibs', self.args['configuration']), dst=""): - self.enable_crt_manifest_check() + #self.enable_crt_manifest_check() # Get llcommon and deps. If missing assume static linkage and continue. try: @@ -271,7 +268,7 @@ class WindowsManifest(ViewerManifest): print err.message print "Skipping llcommon.dll (assuming llcommon was linked statically)" - self.disable_manifest_check() + #self.disable_manifest_check() # Get fmod dll, continue if missing try: @@ -326,7 +323,7 @@ class WindowsManifest(ViewerManifest): self.path("featuretable.txt") self.path("featuretable_xp.txt") - self.enable_no_crt_manifest_check() + #self.enable_no_crt_manifest_check() # Media plugins - QuickTime if self.prefix(src='../media_plugins/quicktime/%s' % self.args['configuration'], dst="llplugin"): @@ -407,7 +404,7 @@ class WindowsManifest(ViewerManifest): self.end_prefix() - self.disable_manifest_check() + #self.disable_manifest_check() # pull in the crash logger and updater from other projects # tag:"crash-logger" here as a cue to the exporter -- cgit v1.2.3 From 2f6073bdb532c22efd808e064505c6b9d164268f Mon Sep 17 00:00:00 2001 From: brad kittenbrink Date: Fri, 18 Feb 2011 18:32:06 -0800 Subject: Fix for failure to link Release builds due to :Release being an invalid path name on windows. --- indra/newview/CMakeLists.txt | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index abba6f134d..db029f9de7 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1433,19 +1433,13 @@ set(PACKAGE ON CACHE BOOL "Add a package target that builds an installer package.") if (WINDOWS) - if(MSVC71) - set(release_flags "/MAP:Release/${VIEWER_BINARY_NAME}.map /MAPINFO:LINES") - else(MSVC71) - set(release_flags "/MAP:Release/${VIEWER_BINARY_NAME}.map") - endif(MSVC71) - set_target_properties(${VIEWER_BINARY_NAME} PROPERTIES # *TODO -reenable this once we get server usage sorted out #LINK_FLAGS "/debug /NODEFAULTLIB:LIBCMT /SUBSYSTEM:WINDOWS /INCLUDE:\"__tcmalloc\"" LINK_FLAGS "/debug /NODEFAULTLIB:LIBCMT /SUBSYSTEM:WINDOWS" LINK_FLAGS_DEBUG "/NODEFAULTLIB:\"LIBCMT;LIBCMTD;MSVCRT\" /INCREMENTAL:NO" - LINK_FLAGS_RELEASE ${release_flags} + LINK_FLAGS_RELEASE "" ) if(USE_PRECOMPILED_HEADERS) set_target_properties( -- cgit v1.2.3 From 2d268422deb1846da889e38100eae60b42c4d21c Mon Sep 17 00:00:00 2001 From: Nicky Date: Sat, 19 Feb 2011 20:27:38 +0100 Subject: Do not add /include/json as an include director. Instead use /include. Otherwise include/json/features.h will mask /usr/include/features. --- indra/newview/lltranslate.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/lltranslate.cpp b/indra/newview/lltranslate.cpp index 7731a98778..c777e15523 100644 --- a/indra/newview/lltranslate.cpp +++ b/indra/newview/lltranslate.cpp @@ -39,7 +39,7 @@ #include "llversioninfo.h" #include "llviewercontrol.h" -#include "reader.h" +#include "json/reader.h" // These two are concatenated with the language specifiers to form a complete Google Translate URL const char* LLTranslate::m_GoogleURL = "http://ajax.googleapis.com/ajax/services/language/translate?v=1.0&q="; -- cgit v1.2.3 From 1db3f3b5cede4971049a91f5cb99f76fd0952b54 Mon Sep 17 00:00:00 2001 From: Alain Linden Date: Thu, 24 Feb 2011 12:27:58 -0800 Subject: integrate xmlrpc-epi into windows build. --- indra/newview/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/newview') diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index db029f9de7..1f07af0608 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -10,6 +10,7 @@ include(DirectX) include(OpenSSL) include(DragDrop) include(ELFIO) +include(EXPAT) include(FMOD) include(OPENAL) include(FindOpenGL) @@ -1681,6 +1682,7 @@ target_link_libraries(${VIEWER_BINARY_NAME} ${SMARTHEAP_LIBRARY} ${UI_LIBRARIES} ${WINDOWS_LIBRARIES} + ${EXPAT_LIBRARIES} ${XMLRPCEPI_LIBRARIES} ${ELFIO_LIBRARIES} ${OPENSSL_LIBRARIES} -- cgit v1.2.3 From a7e2f1eafd303dad844c36ec77bb6a98fd6ee38c Mon Sep 17 00:00:00 2001 From: Jennifer Leech Date: Mon, 28 Feb 2011 23:47:48 -0800 Subject: Take out symbol generation for slplugin.exe since this step currently fails, need to debug, but don't want it to be a blocker. This is expected to get TeamCity runs passing on Windows. --- indra/newview/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 1f07af0608..55de2c8d20 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1841,7 +1841,9 @@ if (PACKAGE) if (WINDOWS) set(VIEWER_DIST_DIR "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}") set(VIEWER_SYMBOL_FILE "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/secondlife-symbols-windows.tar.bz2") - set(VIEWER_EXE_GLOBS "${VIEWER_BINARY_NAME}${CMAKE_EXECUTABLE_SUFFIX} slplugin.exe") + # slplugin.exe failing symbols dump - need to debug, might have to do with updated version of google breakpad + # set(VIEWER_EXE_GLOBS "${VIEWER_BINARY_NAME}${CMAKE_EXECUTABLE_SUFFIX} slplugin.exe") + set(VIEWER_EXE_GLOBS "${VIEWER_BINARY_NAME}${CMAKE_EXECUTABLE_SUFFIX}") set(VIEWER_LIB_GLOB "*${CMAKE_SHARED_MODULE_SUFFIX}") set(VIEWER_COPY_MANIFEST copy_w_viewer_manifest) endif (WINDOWS) -- cgit v1.2.3 From f228cebc7709321ee5d04c40066c755bed41af76 Mon Sep 17 00:00:00 2001 From: Alain Linden Date: Tue, 1 Mar 2011 16:27:04 -0800 Subject: add openal include path for openal dependent build. --- indra/newview/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview') diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 55de2c8d20..3c24006fb8 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -67,6 +67,7 @@ include_directories( ${LSCRIPT_INCLUDE_DIRS}/lscript_compile ${LLLOGIN_INCLUDE_DIRS} ${UPDATER_INCLUDE_DIRS} + ${OPENAL_LIB_INCLUDE_DIRS} ) set(viewer_SOURCE_FILES -- cgit v1.2.3 From 7285dd9e42ffd58ea51335de96eadadb652f6b49 Mon Sep 17 00:00:00 2001 From: "Andrew A. de Laix" Date: Fri, 4 Mar 2011 14:49:20 -0800 Subject: ares, boost, expat, freetype archives updated to latest builds. --- indra/newview/viewer_manifest.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 3e09b9daa0..9be3aa709b 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -636,9 +636,9 @@ class DarwinManifest(ViewerManifest): dylibs[lib] = True if dylibs["llcommon"]: - for libfile in ("libapr-1.0.3.7.dylib", - "libaprutil-1.0.3.8.dylib", - "libexpat.0.5.0.dylib", + for libfile in ("libapr-1.0.dylib", + "libaprutil-1.0.dylib", + "libexpat.1.5.2.dylib", "libexception_handler.dylib", ): self.path(os.path.join(libdir, libfile), libfile) @@ -667,9 +667,9 @@ class DarwinManifest(ViewerManifest): mac_updater_res_path = self.dst_path_of("mac-updater.app/Contents/Resources") slplugin_res_path = self.dst_path_of("SLPlugin.app/Contents/Resources") for libfile in ("libllcommon.dylib", - "libapr-1.0.3.7.dylib", - "libaprutil-1.0.3.8.dylib", - "libexpat.0.5.0.dylib", + "libapr-1.0.dylib", + "libaprutil-1.0.dylib", + "libexpat.1.5.2.dylib", "libexception_handler.dylib", ): target_lib = os.path.join('../../..', libfile) -- cgit v1.2.3 From d63c1a4df14f5eaeee37b82890a445e912d60683 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Sat, 5 Mar 2011 19:18:39 -0800 Subject: STORM-1023 : add missing fmod dependency so viewer can compile with -DFMOD_INCLUDE_DIR option --- indra/newview/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview') diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index ef1d05a779..21efcd284e 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -49,6 +49,7 @@ include_directories( ${LLAUDIO_INCLUDE_DIRS} ${LLCHARACTER_INCLUDE_DIRS} ${LLCOMMON_INCLUDE_DIRS} + ${FMOD_INCLUDE_DIR} ${LLIMAGE_INCLUDE_DIRS} ${LLKDU_INCLUDE_DIRS} ${LLINVENTORY_INCLUDE_DIRS} -- cgit v1.2.3 From eddf24a00fac10a5c2928b9797393cab8a547971 Mon Sep 17 00:00:00 2001 From: "Andrew A. de Laix" Date: Wed, 9 Mar 2011 08:58:52 -0800 Subject: update ndofdev archive usage on darwin. --- indra/newview/viewer_manifest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 9be3aa709b..cf7ece2284 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -574,7 +574,7 @@ class DarwinManifest(ViewerManifest): self.path("Info-SecondLife.plist", dst="Info.plist") # copy additional libs in /Contents/MacOS/ - self.path("../packages/lib/release/libndofdev.dylib", dst="MacOS/libndofdev.dylib") + self.path("../packages/lib/release/libndofdev.dylib", dst="Resources/libndofdev.dylib") self.path("../viewer_components/updater/scripts/darwin/update_install", "MacOS/update_install") -- cgit v1.2.3 From 4947062236f9abe280beac8ba8abea22f3d1d226 Mon Sep 17 00:00:00 2001 From: Andrew de Laix Date: Thu, 10 Mar 2011 00:48:20 +0000 Subject: update apr and sdl archives for linux; added new archive db (needed for linux only). --- indra/newview/viewer_manifest.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 9be3aa709b..68038121a0 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -934,12 +934,15 @@ class Linux_i686Manifest(LinuxManifest): self.path("libapr-1.so.0") self.path("libaprutil-1.so.0") self.path("libbreakpad_client.so.0.0.0", "libbreakpad_client.so.0") - self.path("libdb-4.2.so") + self.path("libdb-5.1.so") self.path("libcrypto.so.0.9.7") self.path("libexpat.so.1") self.path("libssl.so.0.9.7") self.path("libuuid.so.1") self.path("libSDL-1.2.so.0") + self.path("libdirectfb-1.4.so.5") + self.path("libfusion-1.4.so.5") + self.path("libdirect-1.4.so.5") self.path("libELFIO.so") self.path("libopenjpeg.so.1.3.0", "libopenjpeg.so.1.3") self.path("libalut.so") -- cgit v1.2.3 From b01b10bba3708b10440d59a7d0fd79430f5e37d7 Mon Sep 17 00:00:00 2001 From: Andrew de Laix Date: Thu, 10 Mar 2011 22:43:33 +0000 Subject: remove ELFIO cruft; no longer needed now that we use google breakpad. --- indra/newview/CMakeLists.txt | 3 --- indra/newview/viewer_manifest.py | 1 - 2 files changed, 4 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 3c24006fb8..4c8b3e84a2 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -9,7 +9,6 @@ include(DBusGlib) include(DirectX) include(OpenSSL) include(DragDrop) -include(ELFIO) include(EXPAT) include(FMOD) include(OPENAL) @@ -45,7 +44,6 @@ include(CMakeCopyIfDifferent) include_directories( ${DBUSGLIB_INCLUDE_DIRS} - ${ELFIO_INCLUDE_DIR} ${JSONCPP_INCLUDE_DIRS} ${LLAUDIO_INCLUDE_DIRS} ${LLCHARACTER_INCLUDE_DIRS} @@ -1685,7 +1683,6 @@ target_link_libraries(${VIEWER_BINARY_NAME} ${WINDOWS_LIBRARIES} ${EXPAT_LIBRARIES} ${XMLRPCEPI_LIBRARIES} - ${ELFIO_LIBRARIES} ${OPENSSL_LIBRARIES} ${CRYPTO_LIBRARIES} ${LLLOGIN_LIBRARIES} diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 39fd2d8886..dd347c2778 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -943,7 +943,6 @@ class Linux_i686Manifest(LinuxManifest): self.path("libdirectfb-1.4.so.5") self.path("libfusion-1.4.so.5") self.path("libdirect-1.4.so.5") - self.path("libELFIO.so") self.path("libopenjpeg.so.1.3.0", "libopenjpeg.so.1.3") self.path("libalut.so") self.path("libopenal.so", "libopenal.so.1") -- cgit v1.2.3 From 353c54d6682614ad62d73ace66146602d6682584 Mon Sep 17 00:00:00 2001 From: Andrew de Laix Date: Fri, 11 Mar 2011 00:27:44 +0000 Subject: update fontconfig archive for linux. --- indra/newview/viewer_manifest.py | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index dd347c2778..055bff378d 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -947,6 +947,7 @@ class Linux_i686Manifest(LinuxManifest): self.path("libalut.so") self.path("libopenal.so", "libopenal.so.1") self.path("libopenal.so", "libvivoxoal.so.1") # vivox's sdk expects this soname + self.path("libfontconfig.so.1.4.4") try: self.path("libfmod-3.75.so") pass -- cgit v1.2.3 From d4427fafda6a56de3e6b8fb95e67dac05c189205 Mon Sep 17 00:00:00 2001 From: Andrew de Laix Date: Fri, 11 Mar 2011 19:17:14 +0000 Subject: package the exact shared library (manifest doesn't follow symlinks) --- indra/newview/viewer_manifest.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 055bff378d..0574d8c005 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -931,18 +931,18 @@ class Linux_i686Manifest(LinuxManifest): super(Linux_i686Manifest, self).construct() if self.prefix("../packages/lib/release", dst="lib"): - self.path("libapr-1.so.0") - self.path("libaprutil-1.so.0") - self.path("libbreakpad_client.so.0.0.0", "libbreakpad_client.so.0") + 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("libdb-5.1.so") self.path("libcrypto.so.0.9.7") - self.path("libexpat.so.1") + self.path("libexpat.so.1.5.2") self.path("libssl.so.0.9.7") self.path("libuuid.so.1") - self.path("libSDL-1.2.so.0") - self.path("libdirectfb-1.4.so.5") - self.path("libfusion-1.4.so.5") - self.path("libdirect-1.4.so.5") + self.path("libSDL-1.2.so.0.11.3") + self.path("libdirectfb-1.4.so.5.0.4") + self.path("libfusion-1.4.so.5.0.4") + self.path("libdirect-1.4.so.5.0.4") self.path("libopenjpeg.so.1.3.0", "libopenjpeg.so.1.3") self.path("libalut.so") self.path("libopenal.so", "libopenal.so.1") -- cgit v1.2.3 From 72d1febadb5f254eb7199bd26eb04a7553a6e55d Mon Sep 17 00:00:00 2001 From: Andrew de Laix Date: Mon, 14 Mar 2011 21:18:24 +0000 Subject: update openjpeg archive for linux. --- indra/newview/viewer_manifest.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 0574d8c005..229055fdb7 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -943,7 +943,9 @@ class Linux_i686Manifest(LinuxManifest): self.path("libdirectfb-1.4.so.5.0.4") self.path("libfusion-1.4.so.5.0.4") self.path("libdirect-1.4.so.5.0.4") - self.path("libopenjpeg.so.1.3.0", "libopenjpeg.so.1.3") + self.path("libopenjpeg.so.1.4.0") + self.path("libopenjpeg.so.1") + self.path("libopenjpeg.so") self.path("libalut.so") self.path("libopenal.so", "libopenal.so.1") self.path("libopenal.so", "libvivoxoal.so.1") # vivox's sdk expects this soname -- cgit v1.2.3 From 17343b76dfc9351c6a7dc109ea11327306d250cc Mon Sep 17 00:00:00 2001 From: Andrew de Laix Date: Mon, 14 Mar 2011 22:43:09 +0000 Subject: update openssl archive for linux. --- indra/newview/viewer_manifest.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 229055fdb7..addaafa494 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -935,9 +935,9 @@ class Linux_i686Manifest(LinuxManifest): self.path("libaprutil-1.so.0.3.10") self.path("libbreakpad_client.so.0.0.0") self.path("libdb-5.1.so") - self.path("libcrypto.so.0.9.7") + self.path("libcrypto.so.0.9.8") self.path("libexpat.so.1.5.2") - self.path("libssl.so.0.9.7") + self.path("libssl.so.0.9.8") self.path("libuuid.so.1") self.path("libSDL-1.2.so.0.11.3") self.path("libdirectfb-1.4.so.5.0.4") -- cgit v1.2.3 From 650dd40187d63eb892a313b12d431f6b485e2dde Mon Sep 17 00:00:00 2001 From: Andrew de Laix Date: Tue, 15 Mar 2011 19:58:25 +0000 Subject: update openal archive for linux. --- indra/newview/viewer_manifest.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index addaafa494..2b756c8dce 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -947,7 +947,11 @@ class Linux_i686Manifest(LinuxManifest): self.path("libopenjpeg.so.1") self.path("libopenjpeg.so") self.path("libalut.so") - self.path("libopenal.so", "libopenal.so.1") + self.path("libalut.so.0") + self.path("libalut.so.0.0.0") + self.path("libopenal.so") + self.path("libopenal.so.1") + self.path("libopenal.so.1.12.854") self.path("libopenal.so", "libvivoxoal.so.1") # vivox's sdk expects this soname self.path("libfontconfig.so.1.4.4") try: -- cgit v1.2.3 From cd8485f9c0535455142f7f979159dcf8027ae93c Mon Sep 17 00:00:00 2001 From: Andrew de Laix Date: Tue, 15 Mar 2011 20:54:22 +0000 Subject: update uuid archive for linux. --- indra/newview/viewer_manifest.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 2b756c8dce..dad0519a8a 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -938,7 +938,9 @@ class Linux_i686Manifest(LinuxManifest): self.path("libcrypto.so.0.9.8") self.path("libexpat.so.1.5.2") self.path("libssl.so.0.9.8") - self.path("libuuid.so.1") + self.path("libuuid.so") + self.path("libuuid.so.16") + self.path("libuuid.so.16.0.22") self.path("libSDL-1.2.so.0.11.3") self.path("libdirectfb-1.4.so.5.0.4") self.path("libfusion-1.4.so.5.0.4") -- 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(+) (limited to 'indra/newview') 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 b260e89eef8d3c4a0a06419697f822de1f53f2a9 Mon Sep 17 00:00:00 2001 From: Andrew de Laix Date: Thu, 17 Mar 2011 21:48:47 +0000 Subject: package .so links needed by linux webkit plugin. --- indra/newview/viewer_manifest.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'indra/newview') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index f600cb42b0..b48b0e7a3a 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -931,12 +931,18 @@ class Linux_i686Manifest(LinuxManifest): super(Linux_i686Manifest, self).construct() if self.prefix("../packages/lib/release", dst="lib"): + self.path("libapr-1.so") + self.path("libapr-1.so.0") self.path("libapr-1.so.0.4.2") + self.path("libaprutil-1.so") + self.path("libaprutil-1.so.0") 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("libdb-5.so") + self.path("libdb.so") self.path("libcrypto.so.0.9.8") self.path("libexpat.so.1.5.2") self.path("libssl.so.0.9.8") -- cgit v1.2.3 From dd8c9eb98a86b3d3716719b739480c562f72c880 Mon Sep 17 00:00:00 2001 From: brad kittenbrink Date: Fri, 18 Mar 2011 12:24:04 -0400 Subject: Removal of dbghelp cruft. Reviewed by alain and nat. --- indra/newview/CMakeLists.txt | 3 --- indra/newview/viewer_manifest.py | 4 ---- 2 files changed, 7 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 4c8b3e84a2..0e407d92d3 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1289,8 +1289,6 @@ if (WINDOWS) if (INTEL_MEMOPS_LIBRARY) list(APPEND viewer_LIBRARIES ${INTEL_MEMOPS_LIBRARY}) endif (INTEL_MEMOPS_LIBRARY) - - use_prebuilt_binary(dbghelp) endif (WINDOWS) # Add the xui files. This is handy for searching for xui elements @@ -1499,7 +1497,6 @@ if (WINDOWS) ${CMAKE_CURRENT_SOURCE_DIR}/licenses-win32.txt ${CMAKE_CURRENT_SOURCE_DIR}/featuretable.txt ${CMAKE_CURRENT_SOURCE_DIR}/featuretable_xp.txt - ${ARCH_PREBUILT_DIRS_RELEASE}/dbghelp.dll ${ARCH_PREBUILT_DIRS_RELEASE}/libeay32.dll ${ARCH_PREBUILT_DIRS_RELEASE}/qtcore4.dll ${ARCH_PREBUILT_DIRS_RELEASE}/qtgui4.dll diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index b48b0e7a3a..80e47125a0 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -306,10 +306,6 @@ class WindowsManifest(ViewerManifest): self.path("ssleay32.dll") self.path("libeay32.dll") - # For use in crash reporting (generates minidumps) - if self.args['configuration'].lower() != 'debug': - self.path("dbghelp.dll") - # For google-perftools tcmalloc allocator. try: if self.args['configuration'].lower() == 'debug': -- cgit v1.2.3