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

Merge from default branch 

--HG--
branch : product-engine
meow-7.2.2
Vadim Savchuk 2010-08-24 15:52:20 +03:00
parent f305ddc7f7 01d06a3572
commit a412c2f747
13 changed files with 176 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
BuildParams
View File

@ -48,18 +48,38 @@ 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:
# <username>_<reponame>.email = <email-address>
# 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
# ========================================
viewer-development-import.build_debug_release_separately = true
viewer-development-fixes.build_debug_release_separately = true
# =======================================
# brad
# ========================================
@ -127,4 +147,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

6
doc/contributions.txt
View File

@ -151,6 +151,7 @@ blino Nakamura
Boroondas Gupte
SNOW-278
SNOW-503
SNOW-510
SNOW-527
SNOW-624
VWR-233
@ -524,6 +525,7 @@ Robin Cornelius
SNOW-504
SNOW-506
SNOW-507
SNOW-511
SNOW-514
SNOW-520
SNOW-585
@ -532,6 +534,7 @@ Robin Cornelius
VWR-11128
VWR-12533
VWR-12587
VWR-12758
VWR-12763
VWR-12995
Ryozu Kojima
@ -605,6 +608,8 @@ Strife Onizuka
VWR-2265
VWR-4111
Tayra Dagostino
SNOW-517
SNOW-543
VWR-13947
TBBle Kurosawa
VWR-938
@ -612,6 +617,7 @@ TBBle Kurosawa
VWR-942
VWR-944
VWR-945
SNOW-543
VWR-1891
VWR-1892
Teardrops Fall

31
indra/cmake/FindTut.cmake Normal file
View File

@ -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)

10
indra/cmake/Tut.cmake
View File

@ -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)

63
indra/cmake/WebKitLibPlugin.cmake
View File

@ -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)

2
indra/llcommon/llversionviewer.h
View File

@ -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";

3
indra/llui/llflatlistview.cpp
View File

@ -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;
}

2
indra/llui/llflatlistview.h
View File

@ -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<Params, LLFlatListView::Params>
{

4
indra/newview/CMakeLists.txt
View File

@ -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

1
indra/newview/llinventoryitemslist.h
View File

@ -38,6 +38,7 @@ class LLViewerInventoryItem;
class LLInventoryItemsList : public LLFlatListViewEx
{
LOG_CLASS(LLInventoryItemsList);
public:
struct Params : public LLInitParam::Block<Params, LLFlatListViewEx::Params>
{

7
indra/newview/llvoicevivox.cpp
View File

@ -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

1
indra/newview/llwearableitemslist.h
View File

@ -384,6 +384,7 @@ private:
*/
class LLWearableItemsList : public LLInventoryItemsList
{
LOG_CLASS(LLWearableItemsList);
public:
/**
* Context menu.

66
indra/newview/viewer_manifest.py
View File

@ -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__":