Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/siana/SingularityViewer.git

Browse Source
This commit is contained in:
Shyotl
2011-02-22 01:08:31 -06:00
parent ae07c82c05 146cb0ef97
commit 97d5e8f154
10 changed files with 2030 additions and 2032 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/CMakeLists.txt
View File

@@ -97,8 +97,8 @@ if (VIEWER)
if (EXISTS ${VIEWER_DIR}win_setup) if (EXISTS ${VIEWER_DIR}win_setup)
add_subdirectory(${VIEWER_DIR}win_setup) add_subdirectory(${VIEWER_DIR}win_setup)
endif (EXISTS ${VIEWER_DIR}win_setup) endif (EXISTS ${VIEWER_DIR}win_setup)
#add_subdirectory(${VIEWER_PREFIX}win_updater) add_subdirectory(${VIEWER_PREFIX}win_updater)
#add_dependencies(viewer windows-updater) add_dependencies(viewer windows-updater)
add_dependencies(viewer windows-crash-logger) add_dependencies(viewer windows-crash-logger)
elseif (SOLARIS) elseif (SOLARIS)
add_subdirectory(solaris_crash_logger) add_subdirectory(solaris_crash_logger)

2
indra/cmake/CopyWinLibs.cmake
View File

@@ -241,6 +241,8 @@ set(all_targets ${all_targets} ${out_targets})
set(release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release") set(release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release")
set(release_files set(release_files
libtcmalloc_minimal.dll
fmod.dll
libapr-1.dll libapr-1.dll
libaprutil-1.dll libaprutil-1.dll
libapriconv-1.dll libapriconv-1.dll

99
indra/cmake/GooglePerfTools.cmake
View File

@@ -1,49 +1,50 @@
# -*- cmake -*- # -*- cmake -*-
include(Prebuilt) include(Prebuilt)
if (STANDALONE) if (STANDALONE)
include(FindGooglePerfTools) include(FindGooglePerfTools)
else (STANDALONE) else (STANDALONE)
if (LINUX OR WINDOWS) if (LINUX OR WINDOWS)
use_prebuilt_binary(google) use_prebuilt_binary(google)
endif (LINUX OR WINDOWS) endif (LINUX OR WINDOWS)
if (WINDOWS) if (WINDOWS)
set(TCMALLOC_LIBRARIES set(TCMALLOC_LIBRARIES libtcmalloc_minimal.lib)
libtcmalloc_minimal) set(TCMALLOC_LINKER_FLAGS "/INCLUDE:\"__tcmalloc\"")
endif (WINDOWS) endif (WINDOWS)
if (LINUX) if (LINUX)
if(USE_GOOGLE_PERFTOOLS) if(USE_GOOGLE_PERFTOOLS)
set(TCMALLOC_LIBRARIES tcmalloc) set(TCMALLOC_LIBRARIES tcmalloc)
set(STACKTRACE_LIBRARIES stacktrace) set(STACKTRACE_LIBRARIES stacktrace)
set(PROFILER_LIBRARIES profiler) set(PROFILER_LIBRARIES profiler)
else() else()
set(TCMALLOC_LIBRARIES tcmalloc_minimal) set(TCMALLOC_LIBRARIES tcmalloc_minimal)
endif() endif()
set(GOOGLE_PERFTOOLS_INCLUDE_DIR set(GOOGLE_PERFTOOLS_INCLUDE_DIR
${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include) ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
set(GOOGLE_PERFTOOLS_FOUND "YES") set(GOOGLE_PERFTOOLS_FOUND "YES")
endif (LINUX) endif (LINUX)
endif (STANDALONE) endif (STANDALONE)
#if (GOOGLE_PERFTOOLS_FOUND) #if (GOOGLE_PERFTOOLS_FOUND)
# set(USE_GOOGLE_PERFTOOLS ON CACHE BOOL "Build with Google PerfTools support.") # set(USE_GOOGLE_PERFTOOLS ON CACHE BOOL "Build with Google PerfTools support.")
#endif (GOOGLE_PERFTOOLS_FOUND) #endif (GOOGLE_PERFTOOLS_FOUND)
# XXX Disable temporarily, until we have compilation issues on 64-bit # XXX Disable temporarily, until we have compilation issues on 64-bit
# Etch sorted. # Etch sorted.
#set(USE_GOOGLE_PERFTOOLS OFF) #set(USE_GOOGLE_PERFTOOLS OFF)
if (USE_GOOGLE_PERFTOOLS) if (USE_GOOGLE_PERFTOOLS)
set(TCMALLOC_FLAG -DLL_USE_TCMALLOC=1) set(TCMALLOC_FLAG -DLL_USE_TCMALLOC=1)
include_directories(${GOOGLE_PERFTOOLS_INCLUDE_DIR}) include_directories(${GOOGLE_PERFTOOLS_INCLUDE_DIR})
set(GOOGLE_PERFTOOLS_LIBRARIES ${TCMALLOC_LIBRARIES} ${STACKTRACE_LIBRARIES} ${PROFILER_LIBRARIES}) set(GOOGLE_PERFTOOLS_LIBRARIES ${TCMALLOC_LIBRARIES} ${STACKTRACE_LIBRARIES} ${PROFILER_LIBRARIES})
else (USE_GOOGLE_PERFTOOLS) else (USE_GOOGLE_PERFTOOLS)
set(TCMALLOC_FLAG -ULL_USE_TCMALLOC) set(TCMALLOC_FLAG -ULL_USE_TCMALLOC)
endif (USE_GOOGLE_PERFTOOLS) endif (USE_GOOGLE_PERFTOOLS)
if (NOT(DISABLE_TCMALLOC OR USE_GOOGLE_PERFTOOLS)) if (NOT(DISABLE_TCMALLOC OR USE_GOOGLE_PERFTOOLS))
set(TCMALLOC_FLAG -DLL_USE_TCMALLOC=1_) message(STATUS "Building with Google TCMalloc")
include_directories(${GOOGLE_PERFTOOLS_INCLUDE_DIR}) set(TCMALLOC_FLAG -DLL_USE_TCMALLOC=1_)
set(GOOGLE_PERFTOOLS_LIBRARIES ${TCMALLOC_LIBRARIES}) include_directories(${GOOGLE_PERFTOOLS_INCLUDE_DIR})
endif() set(GOOGLE_PERFTOOLS_LIBRARIES ${TCMALLOC_LIBRARIES})
set(GOOGLE_PERFTOOLS_LINKER_FLAGS ${TCMALLOC_LINKER_FLAGS})
endif()

424
indra/llcommon/CMakeLists.txt
View File

@@ -1,212 +1,212 @@
# -*- cmake -*- # -*- cmake -*-
project(llcommon) project(llcommon)
include(00-Common) include(00-Common)
include(LLCommon) include(LLCommon)
include(Linking) include(Linking)
include_directories( include_directories(
${EXPAT_INCLUDE_DIRS} ${EXPAT_INCLUDE_DIRS}
${LLCOMMON_INCLUDE_DIRS} ${LLCOMMON_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS}
) )
set(llcommon_SOURCE_FILES set(llcommon_SOURCE_FILES
imageids.cpp imageids.cpp
indra_constants.cpp indra_constants.cpp
llapp.cpp llapp.cpp
llapr.cpp llapr.cpp
llassettype.cpp llassettype.cpp
llavatarname.cpp llavatarname.cpp
llbase32.cpp llbase32.cpp
llbase64.cpp llbase64.cpp
llcommon.cpp llcommon.cpp
llcommonutils.cpp llcommonutils.cpp
llcrc.cpp llcrc.cpp
llcriticaldamp.cpp llcriticaldamp.cpp
llcursortypes.cpp llcursortypes.cpp
lldate.cpp lldate.cpp
llerror.cpp llerror.cpp
llerrorthread.cpp llerrorthread.cpp
llevent.cpp llevent.cpp
llfasttimer.cpp llfasttimer.cpp
llfile.cpp llfile.cpp
llfindlocale.cpp llfindlocale.cpp
llfixedbuffer.cpp llfixedbuffer.cpp
llformat.cpp llformat.cpp
llframetimer.cpp llframetimer.cpp
llheartbeat.cpp llheartbeat.cpp
llindraconfigfile.cpp llindraconfigfile.cpp
llliveappconfig.cpp llliveappconfig.cpp
lllivefile.cpp lllivefile.cpp
lllog.cpp lllog.cpp
llmd5.cpp llmd5.cpp
llmemory.cpp llmemory.cpp
llmemorystream.cpp llmemorystream.cpp
llmetrics.cpp llmetrics.cpp
llmortician.cpp llmortician.cpp
lloptioninterface.cpp lloptioninterface.cpp
llprocesslauncher.cpp llprocesslauncher.cpp
llprocessor.cpp llprocessor.cpp
llqueuedthread.cpp llqueuedthread.cpp
llrand.cpp llrand.cpp
llrun.cpp llrun.cpp
llsd.cpp llsd.cpp
llsdserialize.cpp llsdserialize.cpp
llsdserialize_xml.cpp llsdserialize_xml.cpp
llsdutil.cpp llsdutil.cpp
llsecondlifeurls.cpp llsecondlifeurls.cpp
llstat.cpp llstat.cpp
llstreamtools.cpp llstreamtools.cpp
llstring.cpp llstring.cpp
llstringtable.cpp llstringtable.cpp
llsys.cpp llsys.cpp
llthread.cpp llthread.cpp
lltimer.cpp lltimer.cpp
lluri.cpp lluri.cpp
lluuid.cpp lluuid.cpp
llworkerthread.cpp llworkerthread.cpp
metaclass.cpp metaclass.cpp
metaproperty.cpp metaproperty.cpp
reflective.cpp reflective.cpp
timing.cpp timing.cpp
u64.cpp u64.cpp
) )
set(llcommon_HEADER_FILES set(llcommon_HEADER_FILES
CMakeLists.txt CMakeLists.txt
bitpack.h bitpack.h
ctype_workaround.h ctype_workaround.h
doublelinkedlist.h doublelinkedlist.h
imageids.h imageids.h
indra_constants.h indra_constants.h
linden_common.h linden_common.h
linked_lists.h linked_lists.h
llagentconstants.h llagentconstants.h
llapp.h llapp.h
llapr.h llapr.h
llassettype.h llassettype.h
llassoclist.h llassoclist.h
llavatarconstants.h llavatarconstants.h
llavatarname.h llavatarname.h
llbase32.h llbase32.h
llbase64.h llbase64.h
llboost.h llboost.h
llchat.h llchat.h
llclickaction.h llclickaction.h
llcommon.h llcommon.h
llcommonutils.h llcommonutils.h
llcrc.h llcrc.h
llcriticaldamp.h llcriticaldamp.h
llcursortypes.h llcursortypes.h
lldarray.h lldarray.h
lldarrayptr.h lldarrayptr.h
lldate.h lldate.h
lldefs.h lldefs.h
lldepthstack.h lldepthstack.h
lldlinked.h lldlinked.h
lldqueueptr.h lldqueueptr.h
llendianswizzle.h llendianswizzle.h
llenum.h llenum.h
llerror.h llerror.h
llerrorcontrol.h llerrorcontrol.h
llerrorlegacy.h llerrorlegacy.h
llerrorthread.h llerrorthread.h
llevent.h llevent.h
lleventemitter.h lleventemitter.h
llextendedstatus.h llextendedstatus.h
llfasttimer.h llfasttimer.h
llfile.h llfile.h
llfindlocale.h llfindlocale.h
llfixedbuffer.h llfixedbuffer.h
llformat.h llformat.h
llframetimer.h llframetimer.h
llhash.h llhash.h
llheartbeat.h llheartbeat.h
llhttpstatuscodes.h llhttpstatuscodes.h
llindexedqueue.h llindexedqueue.h
llindraconfigfile.h llindraconfigfile.h
llkeythrottle.h llkeythrottle.h
lllinkedqueue.h lllinkedqueue.h
llliveappconfig.h llliveappconfig.h
lllivefile.h lllivefile.h
lllocalidhashmap.h lllocalidhashmap.h
lllog.h lllog.h
lllslconstants.h lllslconstants.h
llmap.h llmap.h
llmd5.h llmd5.h
llmemory.h llmemory.h
llmemorystream.h llmemorystream.h
llmemtype.h llmemtype.h
llmetrics.h llmetrics.h
llmortician.h llmortician.h
llnametable.h llnametable.h
lloptioninterface.h lloptioninterface.h
llpreprocessor.h llpreprocessor.h
llpriqueuemap.h llpriqueuemap.h
llprocesslauncher.h llprocesslauncher.h
llprocessor.h llprocessor.h
llptrskiplist.h llptrskiplist.h
llptrskipmap.h llptrskipmap.h
llqueuedthread.h llqueuedthread.h
llrand.h llrand.h
llrun.h llrun.h
llsd.h llsd.h
llsdserialize.h llsdserialize.h
llsdserialize_xml.h llsdserialize_xml.h
llsdutil.h llsdutil.h
llsecondlifeurls.h llsecondlifeurls.h
llsimplehash.h llsimplehash.h
llskiplist.h llskiplist.h
llskipmap.h llskipmap.h
llstack.h llstack.h
llstat.h llstat.h
llstatenums.h llstatenums.h
llstl.h llstl.h
llstreamtools.h llstreamtools.h
llstrider.h llstrider.h
llstring.h llstring.h
llstringtable.h llstringtable.h
llsys.h llsys.h
llthread.h llthread.h
lltimer.h lltimer.h
lluri.h lluri.h
lluuid.h lluuid.h
lluuidhashmap.h lluuidhashmap.h
llversionserver.h llversionserver.h
llversionviewer.h llversionviewer.h
llworkerthread.h llworkerthread.h
metaclass.h metaclass.h
metaclasst.h metaclasst.h
metaproperty.h metaproperty.h
metapropertyt.h metapropertyt.h
processor.h processor.h
reflective.h reflective.h
reflectivet.h reflectivet.h
roles_constants.h roles_constants.h
stdenums.h stdenums.h
stdtypes.h stdtypes.h
string_table.h string_table.h
timer.h timer.h
timing.h timing.h
u64.h u64.h
) )
set_source_files_properties(${llcommon_HEADER_FILES} set_source_files_properties(${llcommon_HEADER_FILES}
PROPERTIES HEADER_FILE_ONLY TRUE) PROPERTIES HEADER_FILE_ONLY TRUE)
list(APPEND llcommon_SOURCE_FILES ${llcommon_HEADER_FILES}) list(APPEND llcommon_SOURCE_FILES ${llcommon_HEADER_FILES})
add_library (llcommon ${llcommon_SOURCE_FILES}) add_library (llcommon ${llcommon_SOURCE_FILES})
add_dependencies(llcommon prepare) add_dependencies(llcommon prepare)
target_link_libraries( target_link_libraries(
llcommon llcommon
${APRUTIL_LIBRARIES} ${APRUTIL_LIBRARIES}
${APR_LIBRARIES} ${APR_LIBRARIES}
${EXPAT_LIBRARIES} ${EXPAT_LIBRARIES}
${ZLIB_LIBRARIES} ${ZLIB_LIBRARIES}
${WINDOWS_LIBRARIES} ${WINDOWS_LIBRARIES}
) )

2
indra/llcommon/llversionviewer.h
View File

@@ -36,7 +36,7 @@
const S32 LL_VERSION_MAJOR = 1; const S32 LL_VERSION_MAJOR = 1;
const S32 LL_VERSION_MINOR = 5; const S32 LL_VERSION_MINOR = 5;
const S32 LL_VERSION_PATCH = 4; const S32 LL_VERSION_PATCH = 4;
const S32 LL_VERSION_BUILD = 0; const S32 LL_VERSION_BUILD = 2;
const char * const LL_CHANNEL = "Singularity"; const char * const LL_CHANNEL = "Singularity";

180
indra/llplugin/slplugin/CMakeLists.txt
View File

@@ -1,86 +1,94 @@
project(SLPlugin) project(SLPlugin)
include(00-Common) include(00-Common)
include(LLCommon) include(LLCommon)
include(LLPlugin) include(LLPlugin)
include(Linking) include(Linking)
include(PluginAPI) include(PluginAPI)
include(LLMessage) include(LLMessage)
include_directories( include_directories(
${LLPLUGIN_INCLUDE_DIRS} ${LLPLUGIN_INCLUDE_DIRS}
${LLMESSAGE_INCLUDE_DIRS} ${LLMESSAGE_INCLUDE_DIRS}
${LLCOMMON_INCLUDE_DIRS} ${LLCOMMON_INCLUDE_DIRS}
) )
if (DARWIN) if (DARWIN)
include(CMakeFindFrameworks) include(CMakeFindFrameworks)
find_library(CARBON_LIBRARY Carbon) find_library(CARBON_LIBRARY Carbon)
find_library(COCOA_LIBRARY Cocoa) find_library(COCOA_LIBRARY Cocoa)
endif (DARWIN) endif (DARWIN)
### SLPlugin ### SLPlugin
set(SLPlugin_SOURCE_FILES set(SLPlugin_SOURCE_FILES
slplugin.cpp slplugin.cpp
) )
if (DARWIN) if (DARWIN)
list(APPEND SLPlugin_SOURCE_FILES list(APPEND SLPlugin_SOURCE_FILES
slplugin-objc.mm slplugin-objc.mm
) )
list(APPEND SLPlugin_HEADER_FILES list(APPEND SLPlugin_HEADER_FILES
slplugin-objc.h slplugin-objc.h
) )
endif (DARWIN) endif (DARWIN)
set_source_files_properties(${SLPlugin_HEADER_FILES} set_source_files_properties(${SLPlugin_HEADER_FILES}
PROPERTIES HEADER_FILE_ONLY TRUE) PROPERTIES HEADER_FILE_ONLY TRUE)
if (SLPlugin_HEADER_FILES) if (SLPlugin_HEADER_FILES)
list(APPEND SLPlugin_SOURCE_FILES ${SLPlugin_HEADER_FILES}) list(APPEND SLPlugin_SOURCE_FILES ${SLPlugin_HEADER_FILES})
endif (SLPlugin_HEADER_FILES) endif (SLPlugin_HEADER_FILES)
add_executable(SLPlugin add_executable(SLPlugin
WIN32 WIN32
MACOSX_BUNDLE MACOSX_BUNDLE
${SLPlugin_SOURCE_FILES} ${SLPlugin_SOURCE_FILES}
) )
set_target_properties(SLPlugin set_target_properties(SLPlugin
PROPERTIES PROPERTIES
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/slplugin_info.plist MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/slplugin_info.plist
) )
target_link_libraries(SLPlugin target_link_libraries(SLPlugin
${LLPLUGIN_LIBRARIES} ${GOOGLE_PERFTOOLS_LIBRARIES}
${LLMESSAGE_LIBRARIES} ${LLPLUGIN_LIBRARIES}
${LLCOMMON_LIBRARIES} ${LLMESSAGE_LIBRARIES}
${PLUGIN_API_WINDOWS_LIBRARIES} ${LLCOMMON_LIBRARIES}
) ${PLUGIN_API_WINDOWS_LIBRARIES}
)
add_dependencies(SLPlugin
${LLPLUGIN_LIBRARIES} add_dependencies(SLPlugin
${LLMESSAGE_LIBRARIES} ${LLPLUGIN_LIBRARIES}
${LLCOMMON_LIBRARIES} ${LLMESSAGE_LIBRARIES}
) ${LLCOMMON_LIBRARIES}
)
if (DARWIN)
# Mac version needs to link against Carbon if (DARWIN)
target_link_libraries(SLPlugin ${CARBON_LIBRARY} ${COCOA_LIBRARY}) # Mac version needs to link against Carbon
# Make sure the app bundle has a Resources directory (it will get populated by viewer-manifest.py later) target_link_libraries(SLPlugin ${CARBON_LIBRARY} ${COCOA_LIBRARY})
add_custom_command( # Make sure the app bundle has a Resources directory (it will get populated by viewer-manifest.py later)
TARGET SLPlugin POST_BUILD add_custom_command(
COMMAND mkdir TARGET SLPlugin POST_BUILD
ARGS COMMAND mkdir
-p ARGS
${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/SLPlugin.app/Contents/Resources -p
) ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/SLPlugin.app/Contents/Resources
endif (DARWIN) )
endif (DARWIN)
if (LINUX)
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lrt") if (LINUX)
endif (LINUX) SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lrt")
endif (LINUX)
#ll_deploy_sharedlibs_command(SLPlugin)
if (WINDOWS)
set_target_properties(SLPlugin
PROPERTIES
LINK_FLAGS "${GOOGLE_PERFTOOLS_LINKER_FLAGS}"
)
endif (WINDOWS)
#ll_deploy_sharedlibs_command(SLPlugin)

3290
indra/newview/CMakeLists.txt
View File

File diff suppressed because it is too large Load Diff

2
indra/newview/res/viewerRes.rc
View File

@@ -154,7 +154,7 @@ BEGIN
BEGIN BEGIN
BLOCK "040904b0" BLOCK "040904b0"
BEGIN BEGIN
VALUE "CompanyName", "Siana Gears" VALUE "CompanyName", "Siana Gearz"
VALUE "FileDescription", "Singularity Viewer" VALUE "FileDescription", "Singularity Viewer"
VALUE "FileVersion", "1.5.0.0" VALUE "FileVersion", "1.5.0.0"
VALUE "InternalName", "Second Life" VALUE "InternalName", "Second Life"

2
indra/newview/res/viewerRes_bc.rc
View File

@@ -154,7 +154,7 @@ BEGIN
BEGIN BEGIN
BLOCK "040904b0" BLOCK "040904b0"
BEGIN BEGIN
VALUE "CompanyName", "Siana Gears" VALUE "CompanyName", "Siana Gearz"
VALUE "FileDescription", "Singularity Viewer" VALUE "FileDescription", "Singularity Viewer"
VALUE "FileVersion", "1.5.0.0" VALUE "FileVersion", "1.5.0.0"
VALUE "InternalName", "Second Life" VALUE "InternalName", "Second Life"

57
indra/newview/viewer_manifest.py
View File

@@ -178,7 +178,7 @@ class WindowsManifest(ViewerManifest):
super(WindowsManifest, self).construct() super(WindowsManifest, self).construct()
# the final exe is complicated because we're not sure where it's coming from, # the final exe is complicated because we're not sure where it's coming from,
# nor do we have a fixed name for the executable # nor do we have a fixed name for the executable
self.path(self.find_existing_file('debug/secondlife-bin.exe', 'releaseSSE2/secondlife-bin.exe', 'relwithdebinfo/secondlife-bin.exe'), dst=self.final_exe()) self.path(src='%s/secondlife-bin.exe' % self.args['configuration'], dst=self.final_exe())
# Plugin host application # Plugin host application
self.path(os.path.join(os.pardir, self.path(os.path.join(os.pardir,
@@ -186,14 +186,14 @@ class WindowsManifest(ViewerManifest):
"SLPlugin.exe") "SLPlugin.exe")
# need to get the kdu dll from any of the build directories as well # need to get the kdu dll from any of the build directories as well
try: #~ try:
self.path(self.find_existing_file('../llkdu/%s/llkdu.dll' % self.args['configuration'], #~ self.path(self.find_existing_file('../llkdu/%s/llkdu.dll' % self.args['configuration'],
'../../libraries/i686-win32/lib/release/llkdu.dll'), #~ '../../libraries/i686-win32/lib/release/llkdu.dll'),
dst='llkdu.dll') #~ dst='llkdu.dll')
pass #~ pass
except: #~ except:
print "Skipping llkdu.dll" #~ print "Skipping llkdu.dll"
pass #~ pass
self.path(src="licenses-win32.txt", dst="licenses.txt") self.path(src="licenses-win32.txt", dst="licenses.txt")
self.path("featuretable.txt") self.path("featuretable.txt")
@@ -269,7 +269,7 @@ class WindowsManifest(ViewerManifest):
#~ self.end_prefix() #~ self.end_prefix()
# For google-perftools tcmalloc allocator. # For google-perftools tcmalloc allocator.
self.path(src="../../libraries/i686-win32/lib/release/libtcmalloc_minimal.dll") self.path("../../libraries/i686-win32/lib/release/libtcmalloc_minimal.dll", dst="libtcmalloc_minimal.dll")
# These need to be installed as a SxS assembly, currently a 'private' assembly. # 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 # See http://msdn.microsoft.com/en-us/library/ms235291(VS.80).aspx
@@ -297,18 +297,8 @@ class WindowsManifest(ViewerManifest):
self.end_prefix() self.end_prefix()
# pull in the crash logger and updater from other projects # pull in the crash logger and updater from other projects
self.path(src=self.find_existing_file( # tag:"crash-logger" here as a cue to the exporter self.path(src='../win_crash_logger/%s/windows-crash-logger.exe' % self.args['configuration'], dst="win_crash_logger.exe")
"../win_crash_logger/debug/windows-crash-logger.exe", self.path(src='../win_updater/%s/windows-updater.exe' % self.args['configuration'], dst="updater.exe")
"../win_crash_logger/release/windows-crash-logger.exe",
"../win_crash_logger/releaseSSE2/windows-crash-logger.exe",
"../win_crash_logger/relwithdebinfo/windows-crash-logger.exe"),
dst="win_crash_logger.exe")
self.path(src=self.find_existing_file(
"../win_updater/debug/windows-updater.exe",
"../win_updater/release/windows-updater.exe",
"../win_updater/releaseSSE2/windows-updater.exe",
"../win_updater/relwithdebinfo/windows-updater.exe"),
dst="updater.exe")
def nsi_file_commands(self, install=True): def nsi_file_commands(self, install=True):
@@ -525,10 +515,7 @@ class DarwinManifest(ViewerManifest):
self.path("../media_plugins/webkit/" + self.args['configuration'] + "/media_plugin_webkit.dylib", "media_plugin_webkit.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("../../libraries/universal-darwin/lib_release/libllqtwebkit.dylib", "libllqtwebkit.dylib")
self.end_prefix("llplugin") self.end_prefix("llplugin")
# skins
self.path("skins")
# Per platform MIME config on the cheap. See SNOW-307 / DEV-41388 # Per platform MIME config on the cheap. See SNOW-307 / DEV-41388
self.path("skins/default/xui/en-us/mime_types_mac.xml", "skins/default/xui/en-us/mime_types.xml") self.path("skins/default/xui/en-us/mime_types_mac.xml", "skins/default/xui/en-us/mime_types.xml")
@@ -754,15 +741,15 @@ class Linux_i686Manifest(LinuxManifest):
# install either the libllkdu we just built, or a prebuilt one, in # install either the libllkdu we just built, or a prebuilt one, in
# decreasing order of preference. for linux package, this goes to bin/ # decreasing order of preference. for linux package, this goes to bin/
try: #~ try:
self.path(self.find_existing_file('../llkdu/libllkdu.so', #~ self.path(self.find_existing_file('../llkdu/libllkdu.so',
'../../libraries/i686-linux/lib_release_client/libllkdu.so'), #~ '../../libraries/i686-linux/lib_release_client/libllkdu.so'),
dst='bin/libllkdu.so') #~ dst='bin/libllkdu.so')
# keep this one to preserve syntax, open source mangling removes previous lines #~ # keep this one to preserve syntax, open source mangling removes previous lines
pass #~ pass
except: #~ except:
print "Skipping libllkdu.so - not found" #~ print "Skipping libllkdu.so - not found"
pass #~ pass
if self.prefix("../../libraries/i686-linux/lib_release_client", dst="lib"): if self.prefix("../../libraries/i686-linux/lib_release_client", dst="lib"):