From 29512788adbf08bc1d000a3682dd4efa3cab61db Mon Sep 17 00:00:00 2001 From: Aimee Linden Date: Thu, 19 Aug 2010 18:36:14 +0100 Subject: VWR-20815 (SNOW-511) Allow standalone builds to correctly find a system version of llqtwebkit --- doc/contributions.txt | 1 + indra/cmake/WebKitLibPlugin.cmake | 63 ++++++++++++++++++--------------------- 2 files changed, 30 insertions(+), 34 deletions(-) diff --git a/doc/contributions.txt b/doc/contributions.txt index 067f29ed55..3855cb5c29 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -524,6 +524,7 @@ Robin Cornelius SNOW-504 SNOW-506 SNOW-507 + SNOW-511 SNOW-514 SNOW-520 SNOW-585 diff --git a/indra/cmake/WebKitLibPlugin.cmake b/indra/cmake/WebKitLibPlugin.cmake index 1c572ab27f..12ba1b1b35 100644 --- a/indra/cmake/WebKitLibPlugin.cmake +++ b/indra/cmake/WebKitLibPlugin.cmake @@ -3,48 +3,46 @@ include(Linking) include(Prebuilt) if (STANDALONE) - set(WEBKITLIBPLUGIN OFF CACHE BOOL - "WEBKITLIBPLUGIN support for the llplugin/llmedia test apps.") + set(WEBKITLIBPLUGIN OFF CACHE BOOL + "WEBKITLIBPLUGIN support for the llplugin/llmedia test apps.") else (STANDALONE) - use_prebuilt_binary(llqtwebkit) - set(WEBKITLIBPLUGIN ON CACHE BOOL - "WEBKITLIBPLUGIN support for the llplugin/llmedia test apps.") + use_prebuilt_binary(llqtwebkit) + set(WEBKITLIBPLUGIN ON CACHE BOOL + "WEBKITLIBPLUGIN support for the llplugin/llmedia test apps.") endif (STANDALONE) if (WINDOWS) - set(WEBKIT_PLUGIN_LIBRARIES - debug llqtwebkitd - debug QtWebKitd4 - debug QtOpenGLd4 - debug QtNetworkd4 - debug QtGuid4 - debug QtCored4 - debug qtmaind - optimized llqtwebkit - optimized QtWebKit4 - optimized QtOpenGL4 - optimized QtNetwork4 - optimized QtGui4 - optimized QtCore4 - optimized qtmain - ) + set(WEBKIT_PLUGIN_LIBRARIES + debug llqtwebkitd + debug QtWebKitd4 + debug QtOpenGLd4 + debug QtNetworkd4 + debug QtGuid4 + debug QtCored4 + debug qtmaind + optimized llqtwebkit + optimized QtWebKit4 + optimized QtOpenGL4 + optimized QtNetwork4 + optimized QtGui4 + optimized QtCore4 + optimized qtmain + ) elseif (DARWIN) - set(WEBKIT_PLUGIN_LIBRARIES - optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.dylib - debug ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.dylib - ) + set(WEBKIT_PLUGIN_LIBRARIES + optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.dylib + debug ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.dylib + ) elseif (LINUX) + if (STANDALONE) + set(WEBKIT_PLUGIN_LIBRARIES llqtwebkit) + else (STANDALONE) set(WEBKIT_PLUGIN_LIBRARIES llqtwebkit qgif -# qico qjpeg -# qpng -# qtiff -# qsvg -# QtSvg QtWebKit QtOpenGL QtNetwork @@ -56,9 +54,6 @@ elseif (LINUX) X11 Xrender GL - -# sqlite3 -# Xi -# SM ) + endif (STANDALONE) endif (WINDOWS) -- cgit v1.2.3 From aabf1b4fa24ea8ce86e11d80f58f79a058237ff4 Mon Sep 17 00:00:00 2001 From: Aimee Linden Date: Fri, 20 Aug 2010 14:06:32 +0100 Subject: VWR-20847 (SNOW-543/SNOW-517) FIXED Linux packaging fixes. --- doc/contributions.txt | 3 ++ indra/newview/CMakeLists.txt | 4 +-- indra/newview/viewer_manifest.py | 66 +++++++++++++++++++--------------------- 3 files changed, 37 insertions(+), 36 deletions(-) diff --git a/doc/contributions.txt b/doc/contributions.txt index 3855cb5c29..eea73ee767 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -606,6 +606,8 @@ Strife Onizuka VWR-2265 VWR-4111 Tayra Dagostino + SNOW-517 + SNOW-543 VWR-13947 TBBle Kurosawa VWR-938 @@ -613,6 +615,7 @@ TBBle Kurosawa VWR-942 VWR-944 VWR-945 + SNOW-543 VWR-1891 VWR-1892 Teardrops Fall diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 65502209f7..1ee7586d5f 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1704,12 +1704,12 @@ if (LINUX) add_dependencies(${VIEWER_BINARY_NAME} SLPlugin media_plugin_gstreamer010 media_plugin_webkit) - if (NOT INSTALL) + if (PACKAGE) add_custom_target(package ALL DEPENDS ${product}.tar.bz2) add_dependencies(package linux-crash-logger-target) add_dependencies(package linux-updater-target) check_message_template(package) - endif (NOT INSTALL) + endif (PACKAGE) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/.${product}.copy_touched diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 9885d1aa0d..0eda4007e3 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -833,6 +833,28 @@ class LinuxManifest(ViewerManifest): # Create an appropriate gridargs.dat for this package, denoting required grid. self.put_in_file(self.flags_list(), 'etc/gridargs.dat') + self.path("secondlife-bin","bin/do-not-directly-run-secondlife-bin") + self.path("../linux_crash_logger/linux-crash-logger","bin/linux-crash-logger.bin") + self.path("../linux_updater/linux-updater", "bin/linux-updater.bin") + self.path("../llplugin/slplugin/SLPlugin", "bin/SLPlugin") + + if self.prefix("res-sdl"): + self.path("*") + # recurse + self.end_prefix("res-sdl") + + # plugins + if self.prefix(src="", dst="bin/llplugin"): + self.path("../media_plugins/webkit/libmedia_plugin_webkit.so", "libmedia_plugin_webkit.so") + self.path("../media_plugins/gstreamer010/libmedia_plugin_gstreamer010.so", "libmedia_plugin_gstreamer.so") + self.end_prefix("bin/llplugin") + + try: + self.path("../llcommon/libllcommon.so", "lib/libllcommon.so") + except: + print "Skipping llcommon.so (assuming llcommon was linked statically)" + + self.path("featuretable_linux.txt") def package_finish(self): if 'installer_name' in self.args: @@ -847,6 +869,10 @@ class LinuxManifest(ViewerManifest): else: installer_name += '_' + self.channel_oneword().upper() + if self.args['buildtype'].lower() == 'release' and self.is_packaging_viewer(): + print "* Going strip-crazy on the packaged binaries, since this is a RELEASE build" + self.run_command("find %(d)r/bin %(d)r/lib -type f | xargs --no-run-if-empty strip -S" % {'d': self.get_dst_prefix()} ) # makes some small assumptions about our packaged dir structure + # Fix access permissions self.run_command(""" find %(dst)s -type d | xargs --no-run-if-empty chmod 755; @@ -883,36 +909,12 @@ class Linux_i686Manifest(LinuxManifest): # install either the libllkdu we just built, or a prebuilt one, in # decreasing order of preference. for linux package, this goes to bin/ - for lib, destdir in ("llkdu", "bin"), ("llcommon", "lib"): - libfile = "lib%s.so" % lib - try: - self.path(self.find_existing_file(os.path.join(os.pardir, lib, libfile), - '../../libraries/i686-linux/lib_release_client/%s' % libfile), - dst=os.path.join(destdir, libfile)) - # keep this one to preserve syntax, open source mangling removes previous lines - pass - except RuntimeError: - print "Skipping %s - not found" % libfile - pass - - self.path("secondlife-bin","bin/do-not-directly-run-secondlife-bin") - - self.path("../linux_crash_logger/linux-crash-logger","bin/linux-crash-logger.bin") - self.path("../linux_updater/linux-updater", "bin/linux-updater.bin") - self.path("../llplugin/slplugin/SLPlugin", "bin/SLPlugin") - if self.prefix("res-sdl"): - self.path("*") - # recurse - self.end_prefix("res-sdl") - - # plugins - if self.prefix(src="", dst="bin/llplugin"): - self.path("../media_plugins/webkit/libmedia_plugin_webkit.so", "libmedia_plugin_webkit.so") - self.path("../media_plugins/gstreamer010/libmedia_plugin_gstreamer010.so", "libmedia_plugin_gstreamer.so") - self.end_prefix("bin/llplugin") - - self.path("featuretable_linux.txt") - #self.path("secondlife-i686.supp") + try: + self.path(self.find_existing_file('../llkdu/libllkdu.so', + '../../libraries/i686-linux/lib_release_client/libllkdu.so'), + dst='bin/libllkdu.so') + except: + print "Skipping libllkdu.so - not found" if self.prefix("../../libraries/i686-linux/lib_release_client", dst="lib"): self.path("libapr-1.so.0") @@ -955,10 +957,6 @@ class Linux_i686Manifest(LinuxManifest): self.path("libvivoxplatform.so") self.end_prefix("lib") - if self.args['buildtype'].lower() == 'release' and self.is_packaging_viewer(): - print "* Going strip-crazy on the packaged binaries, since this is a RELEASE build" - self.run_command("find %(d)r/bin %(d)r/lib -type f | xargs --no-run-if-empty strip -S" % {'d': self.get_dst_prefix()} ) # makes some small assumptions about our packaged dir structure - ################################################################ if __name__ == "__main__": -- cgit v1.2.3 From ba7fa006a11f94d47e263de24d183464eafe7f94 Mon Sep 17 00:00:00 2001 From: Aimee Linden Date: Fri, 20 Aug 2010 15:48:47 +0100 Subject: BuildParams for to separate debug and release builds for viewer-development-import --- BuildParams | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/BuildParams b/BuildParams index 95507ade0a..be9878f5c4 100644 --- a/BuildParams +++ b/BuildParams @@ -60,6 +60,24 @@ viewer-development.build_viewer_update_version_manager = false # Snowstorm canonical build (oz) snowstorm_viewer-development.email = viewer-development-builds@lists.secondlife.com +# ======================================== +# aimee +# ======================================== + +viewer-development-import.build_Linux = true +viewer-development-import_debug.build_Linux = false + +viewer-development-import.build_Darwin = true +viewer-development-import_debug.build_Darwin = false + +viewer-development-import.build_CYGWIN = true +viewer-development-import.build_CYGWIN_Debug = false +viewer-development-import.build_CYGWIN_RelWithDebInfo = false +viewer-development-import.build_CYGWIN_Release = true +viewer-development-import_debug.build_CYGWIN_Debug = true +viewer-development-import_debug.build_CYGWIN_RelWithDebInfo = true +viewer-development-import_debug.build_CYGWIN_Release = false + # ======================================= # brad # ======================================== -- cgit v1.2.3 From 89cb5aa99eaa7a662cd361746a80ecbb0c5ec7ca Mon Sep 17 00:00:00 2001 From: Aimee Linden Date: Fri, 20 Aug 2010 18:16:23 +0100 Subject: VWR-20855 (SNOW-510) FIXED Cannot find tut/tut.hpp in Standalone builds --- doc/contributions.txt | 2 ++ indra/cmake/FindTut.cmake | 31 +++++++++++++++++++++++++++++++ indra/cmake/Tut.cmake | 10 ++++++++-- 3 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 indra/cmake/FindTut.cmake diff --git a/doc/contributions.txt b/doc/contributions.txt index eea73ee767..9df072e937 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -151,6 +151,7 @@ blino Nakamura Boroondas Gupte SNOW-278 SNOW-503 + SNOW-510 SNOW-527 SNOW-624 VWR-233 @@ -533,6 +534,7 @@ Robin Cornelius VWR-11128 VWR-12533 VWR-12587 + VWR-12758 VWR-12763 VWR-12995 Ryozu Kojima diff --git a/indra/cmake/FindTut.cmake b/indra/cmake/FindTut.cmake new file mode 100644 index 0000000000..b5d58f6396 --- /dev/null +++ b/indra/cmake/FindTut.cmake @@ -0,0 +1,31 @@ +# -*- cmake -*- + +# - Find Tut +# Find the Tut unit test framework includes and library +# This module defines +# TUT_INCLUDE_DIR, where to find tut.h, etc. +# TUT_FOUND, If false, do not try to use Tut. + +find_path(TUT_INCLUDE_DIR tut.h + /usr/local/include/ + /usr/include + ) + +if (TUT_INCLUDE_DIR) + set(TUT_FOUND "YES") +else (TUT_INCLUDE_DIR) + set(TUT_FOUND "NO") +endif (TUT_INCLUDE_DIR) + +if (TUT_FOUND) + if (NOT TUT_FIND_QUIETLY) + message(STATUS "Found Tut: ${TUT_INCLUDE_DIR}") + set(TUT_FIND_QUIETLY TRUE) # Only alert us the first time + endif (NOT TUT_FIND_QUIETLY) +else (TUT_FOUND) + if (TUT_FIND_REQUIRED) + message(FATAL_ERROR "Could not find Tut") + endif (TUT_FIND_REQUIRED) +endif (TUT_FOUND) + +mark_as_advanced(TUT_INCLUDE_DIR) diff --git a/indra/cmake/Tut.cmake b/indra/cmake/Tut.cmake index 7488e9dcb0..784560471d 100644 --- a/indra/cmake/Tut.cmake +++ b/indra/cmake/Tut.cmake @@ -1,6 +1,12 @@ # -*- cmake -*- include(Prebuilt) -if (NOT STANDALONE) +set(TUT_FIND_REQUIRED TRUE) +set(TUT_FIND_QUIETLY TRUE) + +if (STANDALONE) + include(FindTut) + include_directories(${TUT_INCLUDE_DIR}) +else (STANDALONE) use_prebuilt_binary(tut) -endif(NOT STANDALONE) +endif (STANDALONE) -- cgit v1.2.3 From 9bbc45ae9504219bf7be028ef6f3f03f0b952c88 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Fri, 20 Aug 2010 18:58:32 -0400 Subject: change defaults so that developer builds are labelled correctly, add personal build params --- BuildParams | 53 ++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 46 insertions(+), 7 deletions(-) diff --git a/BuildParams b/BuildParams index be9878f5c4..3f5225ad49 100644 --- a/BuildParams +++ b/BuildParams @@ -48,18 +48,31 @@ viewer-development_coverity.build_CYGWIN_Debug = false viewer-development_coverity.build_CYGWIN_RelWithDebInfo = false viewer-development_coverity.build_CYGWIN_Release = true -# Channels etc.... -viewer-development.viewer_channel = "Second Life Development" -viewer-development.login_channel = "Second Life Beta Development" -viewer-development.viewer_grid = agni -viewer-development.build_viewer_update_version_manager = false - # Notifications - to configure email notices, add a setting like this: # _.email = -# Snowstorm canonical build (oz) +# ================================================================= +# Viewer Development (snowstorm canonical build owned by Oz Linden) +# ================================================================= +snowstorm_viewer-development.viewer_channel = "Second Life Development" +snowstorm_viewer-development.login_channel = "Second Life Development" +snowstorm_viewer-development.build_viewer_update_version_manager = false snowstorm_viewer-development.email = viewer-development-builds@lists.secondlife.com +# ======================================== +# Viewer Beta +# ======================================== +viewer-beta.viewer_channel = "Second Life Beta" +viewer-beta.login_channel = "Second Life Beta" +viewer-beta.build_viewer_update_version_manager = true + +# ======================================== +# Viewer Release +# ======================================== +viewer-release.viewer_channel = "Second Life Release" +viewer-release.login_channel = "Second Life Release" +viewer-release.build_viewer_update_version_manager = true + # ======================================== # aimee # ======================================== @@ -145,4 +158,30 @@ media.login_channel = "Second Life Alpha" media.viewer_grid = agni media.build_viewer_update_version_manager = false +# ================ +# oz +# ================ + +oz_viewer-review1_coverity.coverity_product = viewer + +oz_viewer-review1.build_Linux = true +oz_viewer-review1_debug.build_Linux = false +oz_viewer-review1_coverity.build_Linux = false + +oz_viewer-review1.build_Darwin = true +oz_viewer-review1_debug.build_Darwin = false +oz_viewer-review1_coverity.build_Darwin = false + +oz_viewer-review1.build_CYGWIN = true +oz_viewer-review1.build_CYGWIN_Debug = false +oz_viewer-review1.build_CYGWIN_RelWithDebInfo = false +oz_viewer-review1.build_CYGWIN_Release = true +oz_viewer-review1_debug.build_CYGWIN_Debug = true +oz_viewer-review1_debug.build_CYGWIN_RelWithDebInfo = true +oz_viewer-review1_debug.build_CYGWIN_Release = false +oz_viewer-review1_coverity.build_coverity = true +oz_viewer-review1_coverity.build_CYGWIN_Debug = false +oz_viewer-review1_coverity.build_CYGWIN_RelWithDebInfo = false +oz_viewer-review1_coverity.build_CYGWIN_Release = false + # eof -- cgit v1.2.3 From be3e754b34f024fe6f44eb62420a1640572932b9 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Fri, 20 Aug 2010 18:59:45 -0400 Subject: increment patch level so that version is 2.1.2 --- indra/llcommon/llversionviewer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h index d1f8e19c26..92d9e1204a 100644 --- a/indra/llcommon/llversionviewer.h +++ b/indra/llcommon/llversionviewer.h @@ -29,7 +29,7 @@ const S32 LL_VERSION_MAJOR = 2; const S32 LL_VERSION_MINOR = 1; -const S32 LL_VERSION_PATCH = 1; +const S32 LL_VERSION_PATCH = 2; const S32 LL_VERSION_BUILD = 0; const char * const LL_CHANNEL = "Second Life Developer"; -- cgit v1.2.3 From da612aa105b4fddb7a5dac371ceb7a440fe8bf06 Mon Sep 17 00:00:00 2001 From: Aimee Linden Date: Sat, 21 Aug 2010 16:40:47 +0100 Subject: CID-370 Checker: UNINIT_CTOR Function: LLVivoxProtocolParser::LLVivoxProtocolParser() File: /indra/newview/llvoicevivox.cpp --- indra/newview/llvoicevivox.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp index 15729b5175..2e003dd2b8 100644 --- a/indra/newview/llvoicevivox.cpp +++ b/indra/newview/llvoicevivox.cpp @@ -7111,6 +7111,13 @@ void LLVivoxProtocolParser::reset() alias.clear(); numberOfAliases = 0; applicationString.clear(); + id = 0; + nameString.clear(); + descriptionString.clear(); + expirationDate = LLDate(); + hasExpired = false; + fontType = 0; + fontStatus = 0; } //virtual -- cgit v1.2.3 From b5fc9c3254a1bb83d1d454cea95db85f36f40ccf Mon Sep 17 00:00:00 2001 From: Aimee Linden Date: Mon, 23 Aug 2010 13:12:56 +0100 Subject: VWR-20899 FIXED Minor potential memory leak in LLFlatListView::addItem --- indra/llui/llflatlistview.cpp | 3 +++ indra/llui/llflatlistview.h | 2 ++ indra/newview/llinventoryitemslist.h | 1 + indra/newview/llwearableitemslist.h | 1 + 4 files changed, 7 insertions(+) diff --git a/indra/llui/llflatlistview.cpp b/indra/llui/llflatlistview.cpp index f266af03ee..b28399a36b 100644 --- a/indra/llui/llflatlistview.cpp +++ b/indra/llui/llflatlistview.cpp @@ -87,6 +87,9 @@ bool LLFlatListView::addItem(LLPanel * item, const LLSD& value /*= LLUUID::null* mItemsPanel->addChild(item); break; default: + LL_WARNS("") << "Unsupported position." << LL_ENDL; + delete new_pair; + return false; break; } diff --git a/indra/llui/llflatlistview.h b/indra/llui/llflatlistview.h index 8667af048b..afd0176d98 100644 --- a/indra/llui/llflatlistview.h +++ b/indra/llui/llflatlistview.h @@ -54,6 +54,7 @@ */ class LLFlatListView : public LLScrollContainer, public LLEditMenuHandler { + LOG_CLASS(LLFlatListView); public: /** @@ -448,6 +449,7 @@ private: */ class LLFlatListViewEx : public LLFlatListView { + LOG_CLASS(LLFlatListViewEx); public: struct Params : public LLInitParam::Block { diff --git a/indra/newview/llinventoryitemslist.h b/indra/newview/llinventoryitemslist.h index 17131549e7..ca90427659 100644 --- a/indra/newview/llinventoryitemslist.h +++ b/indra/newview/llinventoryitemslist.h @@ -38,6 +38,7 @@ class LLViewerInventoryItem; class LLInventoryItemsList : public LLFlatListViewEx { + LOG_CLASS(LLInventoryItemsList); public: struct Params : public LLInitParam::Block { diff --git a/indra/newview/llwearableitemslist.h b/indra/newview/llwearableitemslist.h index 4806fb35bf..854c37c2c1 100644 --- a/indra/newview/llwearableitemslist.h +++ b/indra/newview/llwearableitemslist.h @@ -384,6 +384,7 @@ private: */ class LLWearableItemsList : public LLInventoryItemsList { + LOG_CLASS(LLWearableItemsList); public: /** * Context menu. -- cgit v1.2.3 From 2c6c4e2e2c5fc024522608a24204cf9f717b7805 Mon Sep 17 00:00:00 2001 From: Aimee Linden Date: Mon, 23 Aug 2010 18:01:28 +0100 Subject: BuildParams for aimee_linden/viewer-development-fixes --- BuildParams | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/BuildParams b/BuildParams index 3f5225ad49..73d3f938bb 100644 --- a/BuildParams +++ b/BuildParams @@ -91,6 +91,20 @@ viewer-development-import_debug.build_CYGWIN_Debug = true viewer-development-import_debug.build_CYGWIN_RelWithDebInfo = true viewer-development-import_debug.build_CYGWIN_Release = false +viewer-development-fixes.build_Linux = true +viewer-development-fixes_debug.build_Linux = false + +viewer-development-fixes.build_Darwin = true +viewer-development-fixes_debug.build_Darwin = false + +viewer-development-fixes.build_CYGWIN = true +viewer-development-fixes.build_CYGWIN_Debug = false +viewer-development-fixes.build_CYGWIN_RelWithDebInfo = false +viewer-development-fixes.build_CYGWIN_Release = true +viewer-development-fixes_debug.build_CYGWIN_Debug = true +viewer-development-fixes_debug.build_CYGWIN_RelWithDebInfo = true +viewer-development-fixes_debug.build_CYGWIN_Release = false + # ======================================= # brad # ======================================== -- cgit v1.2.3 From 01d06a3572c533f810f8f42e7ae9c55051f34aaf Mon Sep 17 00:00:00 2001 From: Aimee Linden Date: Tue, 24 Aug 2010 12:12:56 +0100 Subject: BuildParams - Use new 'build_debug_release_separately' flag for viewer-development-import and viewer-development-fixes --- BuildParams | 29 ++--------------------------- 1 file changed, 2 insertions(+), 27 deletions(-) diff --git a/BuildParams b/BuildParams index 73d3f938bb..9b5a9cfb3f 100644 --- a/BuildParams +++ b/BuildParams @@ -77,33 +77,8 @@ viewer-release.build_viewer_update_version_manager = true # aimee # ======================================== -viewer-development-import.build_Linux = true -viewer-development-import_debug.build_Linux = false - -viewer-development-import.build_Darwin = true -viewer-development-import_debug.build_Darwin = false - -viewer-development-import.build_CYGWIN = true -viewer-development-import.build_CYGWIN_Debug = false -viewer-development-import.build_CYGWIN_RelWithDebInfo = false -viewer-development-import.build_CYGWIN_Release = true -viewer-development-import_debug.build_CYGWIN_Debug = true -viewer-development-import_debug.build_CYGWIN_RelWithDebInfo = true -viewer-development-import_debug.build_CYGWIN_Release = false - -viewer-development-fixes.build_Linux = true -viewer-development-fixes_debug.build_Linux = false - -viewer-development-fixes.build_Darwin = true -viewer-development-fixes_debug.build_Darwin = false - -viewer-development-fixes.build_CYGWIN = true -viewer-development-fixes.build_CYGWIN_Debug = false -viewer-development-fixes.build_CYGWIN_RelWithDebInfo = false -viewer-development-fixes.build_CYGWIN_Release = true -viewer-development-fixes_debug.build_CYGWIN_Debug = true -viewer-development-fixes_debug.build_CYGWIN_RelWithDebInfo = true -viewer-development-fixes_debug.build_CYGWIN_Release = false +viewer-development-import.build_debug_release_separately = true +viewer-development-fixes.build_debug_release_separately = true # ======================================= # brad -- cgit v1.2.3