From 2230b52145ba7b22bea4b365b010016e62c25b58 Mon Sep 17 00:00:00 2001 From: "Andrew A. de Laix" Date: Tue, 11 Jan 2011 16:07:14 -0800 Subject: remove develop.py and references to it (use autobuild instead) --- indra/cmake/CMakeLists.txt | 1 - indra/cmake/LLKDU.cmake | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'indra/cmake') diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt index 3f421b270b..3c7ae50df1 100644 --- a/indra/cmake/CMakeLists.txt +++ b/indra/cmake/CMakeLists.txt @@ -85,7 +85,6 @@ source_group("Shared Rules" FILES ${cmake_SOURCE_FILES}) set(master_SOURCE_FILES ../CMakeLists.txt - ../develop.py ) if (SERVER) diff --git a/indra/cmake/LLKDU.cmake b/indra/cmake/LLKDU.cmake index f5cbad03a6..3a6e746605 100644 --- a/indra/cmake/LLKDU.cmake +++ b/indra/cmake/LLKDU.cmake @@ -1,7 +1,7 @@ # -*- cmake -*- include(Prebuilt) -# USE_KDU can be set when launching cmake or develop.py as an option using the argument -DUSE_KDU:BOOL=ON +# USE_KDU can be set when launching cmake as an option using the argument -DUSE_KDU:BOOL=ON # When building using proprietary binaries though (i.e. having access to LL private servers), we always build with KDU if (INSTALL_PROPRIETARY AND NOT STANDALONE) set(USE_KDU ON) -- cgit v1.3 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) --- autobuild.xml | 40 +++++++++++++++-- indra/cmake/APR.cmake | 12 ++--- indra/cmake/Copy3rdPartyLibs.cmake | 9 ++-- indra/cmake/DBusGlib.cmake | 2 +- indra/cmake/FindAutobuild.cmake | 41 +++++++++++++++++ indra/cmake/FreeType.cmake | 2 +- indra/cmake/GStreamer010Plugin.cmake | 6 +-- indra/cmake/GooglePerfTools.cmake | 6 ++- indra/cmake/Linking.cmake | 51 +++++++++++++--------- indra/cmake/MonoEmbed.cmake | 4 +- indra/cmake/MySQL.cmake | 6 +-- indra/cmake/OpenGL.cmake | 2 +- indra/cmake/OpenSSL.cmake | 2 +- indra/cmake/Prebuilt.cmake | 42 +++++++++++------- indra/cmake/QuickTimePlugin.cmake | 2 +- indra/cmake/UI.cmake | 4 +- indra/cmake/Variables.cmake | 68 ++++++++++++++++------------- indra/media_plugins/webkit/CMakeLists.txt | 4 +- indra/newview/viewer_manifest.py | 6 +-- indra/test_apps/llplugintest/CMakeLists.txt | 4 +- 20 files changed, 206 insertions(+), 107 deletions(-) create mode 100644 indra/cmake/FindAutobuild.cmake (limited to 'indra/cmake') diff --git a/autobuild.xml b/autobuild.xml index 24ac4b2c3a..ff56e7559a 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -853,6 +853,18 @@ kdu platforms + darwin + + archive + + hash + 408f1375f5a4d864cfb47b36c8ab6052 + url + scp:install-packages.lindenlab.com:/local/www/install-packages/doc/kdu-6.4.1-darwin-20110112.tar.bz2 + + name + darwin + windows archive @@ -970,9 +982,9 @@ archive hash - 54e179ff85bce44b65f4f186bf4c14b1 + d3890220418a66607569fe406ebe24c7 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-4.6%2bcookies-darwin-20101013.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-4.7.1-darwin-20110113.tar.bz2 name darwin @@ -1265,7 +1277,7 @@ - vivox + slvoice license_file LICENSES/apr_suite.txt @@ -1299,6 +1311,28 @@ + tut + + license_file + LICENSES/tut.txt + name + tut + platforms + + common + + archive + + hash + 5c6d3e606f027e78f056cb77b20f228e + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/tut-2008-11-30-common-20101001.tar.bz2 + + name + common + + + xmlrpc-epi license_file diff --git a/indra/cmake/APR.cmake b/indra/cmake/APR.cmake index 180504d286..5b31b0d237 100644 --- a/indra/cmake/APR.cmake +++ b/indra/cmake/APR.cmake @@ -38,21 +38,15 @@ else (STANDALONE) set(APR_selector "a") set(APRUTIL_selector "a") endif (LLCOMMON_LINK_SHARED) - set(APR_LIBRARIES - debug ${ARCH_PREBUILT_DIRS_DEBUG}/libapr-1.${APR_selector} - optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libapr-1.${APR_selector} - ) - set(APRUTIL_LIBRARIES - debug ${ARCH_PREBUILT_DIRS_DEBUG}/libaprutil-1.${APRUTIL_selector} - optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libaprutil-1.${APRUTIL_selector} - ) + set(APR_LIBRARIES libapr-1.${APR_selector}) + set(APRUTIL_LIBRARIES libaprutil-1.${APRUTIL_selector}) set(APRICONV_LIBRARIES iconv) else (WINDOWS) set(APR_LIBRARIES apr-1) set(APRUTIL_LIBRARIES aprutil-1) set(APRICONV_LIBRARIES iconv) endif (WINDOWS) - set(APR_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/apr-1) + set(APR_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/apr-1) if (LINUX) if (VIEWER) diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 176ae9787e..55a26cf9ef 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -5,6 +5,7 @@ # VisualStudio. include(CMakeCopyIfDifferent) +include(Linking) ################################################################### # set up platform specific lists of files that need to be copied @@ -135,14 +136,10 @@ elseif(DARWIN) libvivoxplatform.dylib libvivoxsdk.dylib ) - # *TODO - update this to use LIBS_PREBUILT_DIR and LL_ARCH_DIR variables - # or ARCH_PREBUILT_DIRS - set(debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_debug") + set(debug_src_dir "${ARCH_PREBUILT_DIRS_DEBUG}") set(debug_files ) - # *TODO - update this to use LIBS_PREBUILT_DIR and LL_ARCH_DIR variables - # or ARCH_PREBUILT_DIRS - set(release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release") + set(release_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}") set(release_files libapr-1.0.3.7.dylib libapr-1.dylib diff --git a/indra/cmake/DBusGlib.cmake b/indra/cmake/DBusGlib.cmake index cfc4ccd404..33c6343a93 100644 --- a/indra/cmake/DBusGlib.cmake +++ b/indra/cmake/DBusGlib.cmake @@ -10,7 +10,7 @@ elseif (LINUX) use_prebuilt_binary(dbusglib) set(DBUSGLIB_FOUND ON FORCE BOOL) set(DBUSGLIB_INCLUDE_DIRS - ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib-2.0 + ${LIBS_PREBUILT_DIR}/include/glib-2.0 ) # We don't need to explicitly link against dbus-glib itself, because # the viewer probes for the system's copy at runtime. diff --git a/indra/cmake/FindAutobuild.cmake b/indra/cmake/FindAutobuild.cmake new file mode 100644 index 0000000000..45db2b6ed0 --- /dev/null +++ b/indra/cmake/FindAutobuild.cmake @@ -0,0 +1,41 @@ +# -*- cmake -*- +# +# Find the autobuild tool +# +# Output variables: +# +# AUTOBUILD_EXECUTABLE - path to autobuild or pautobuild executable + +# *TODO - if cmake was executed by autobuild, autobuild will have set the AUTOBUILD env var +# update this to check for that case + +IF (NOT AUTOBUILD_EXECUTABLE) + IF(WIN32) + SET(AUTOBUILD_EXE_NAMES autobuild.cmd autobuild.exe) + ELSE(WIN32) + SET(AUTOBUILD_EXE_NAMES autobuild) + ENDIF(WIN32) + + SET(AUTOBUILD_EXECUTABLE) + FIND_PROGRAM( + AUTOBUILD_EXECUTABLE + NAMES ${AUTOBUILD_EXE_NAMES} + PATHS + ENV PATH + ${CMAKE_SOURCE_DIR}/.. + ${CMAKE_SOURCE_DIR}/../.. + ${CMAKE_SOURCE_DIR}/../../.. + PATH_SUFFIXES "/autobuild/bin/" + ) + + IF (AUTOBUILD_EXECUTABLE) + GET_FILENAME_COMPONENT(_autobuild_name ${AUTOBUILD_EXECUTABLE} NAME_WE) + MESSAGE(STATUS "Using autobuild at: ${AUTOBUILD_EXECUTABLE}") + ELSE (AUTOBUILD_EXECUTABLE) + IF (AUTOBUILD_FIND_REQUIRED) + MESSAGE(FATAL_ERROR "Could not find autobuild executable") + ENDIF (AUTOBUILD_FIND_REQUIRED) + ENDIF (AUTOBUILD_EXECUTABLE) + + MARK_AS_ADVANCED(AUTOBUILD_EXECUTABLE) +ENDIF (NOT AUTOBUILD_EXECUTABLE) diff --git a/indra/cmake/FreeType.cmake b/indra/cmake/FreeType.cmake index 5f1aa26e89..43a9d282d0 100644 --- a/indra/cmake/FreeType.cmake +++ b/indra/cmake/FreeType.cmake @@ -9,7 +9,7 @@ else (STANDALONE) use_prebuilt_binary(freetype) if (LINUX) set(FREETYPE_INCLUDE_DIRS - ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include) + ${LIBS_PREBUILT_DIR}/include) else (LINUX) set(FREETYPE_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) endif (LINUX) diff --git a/indra/cmake/GStreamer010Plugin.cmake b/indra/cmake/GStreamer010Plugin.cmake index 0ca432da18..d2d0699bcd 100644 --- a/indra/cmake/GStreamer010Plugin.cmake +++ b/indra/cmake/GStreamer010Plugin.cmake @@ -13,9 +13,9 @@ elseif (LINUX) set(GSTREAMER010_FOUND ON FORCE BOOL) set(GSTREAMER010_PLUGINS_BASE_FOUND ON FORCE BOOL) set(GSTREAMER010_INCLUDE_DIRS - ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/gstreamer-0.10 - ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib-2.0 - ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/libxml2 + ${LIBS_PREBUILT_DIR}/include/gstreamer-0.10 + ${LIBS_PREBUILT_DIR}/include/glib-2.0 + ${LIBS_PREBUILT_DIR}/include/libxml2 ) # We don't need to explicitly link against gstreamer itself, because # LLMediaImplGStreamer probes for the system's copy at runtime. diff --git a/indra/cmake/GooglePerfTools.cmake b/indra/cmake/GooglePerfTools.cmake index 946fc6b375..0ac67fe595 100644 --- a/indra/cmake/GooglePerfTools.cmake +++ b/indra/cmake/GooglePerfTools.cmake @@ -4,7 +4,9 @@ include(Prebuilt) if (STANDALONE) include(FindGooglePerfTools) else (STANDALONE) - use_prebuilt_binary(google) + if(NOT DARWIN) + use_prebuilt_binary(google) + endif() if (WINDOWS) use_prebuilt_binary(google-perftools) set(TCMALLOC_LIBRARIES @@ -17,7 +19,7 @@ else (STANDALONE) set(STACKTRACE_LIBRARIES stacktrace) set(PROFILER_LIBRARIES profiler) set(GOOGLE_PERFTOOLS_INCLUDE_DIR - ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include) + ${LIBS_PREBUILT_DIR}/include) set(GOOGLE_PERFTOOLS_FOUND "YES") endif (LINUX) endif (STANDALONE) diff --git a/indra/cmake/Linking.cmake b/indra/cmake/Linking.cmake index bca99caf2a..07db6ab257 100644 --- a/indra/cmake/Linking.cmake +++ b/indra/cmake/Linking.cmake @@ -1,32 +1,43 @@ # -*- cmake -*- +include(Variables) + + if (NOT STANDALONE) + set(ARCH_PREBUILT_DIRS ${AUTOBUILD_INSTALL_DIR}/lib) + set(ARCH_PREBUILT_DIRS_RELEASE ${AUTOBUILD_INSTALL_DIR}/lib/release) + set(ARCH_PREBUILT_DIRS_DEBUG ${AUTOBUILD_INSTALL_DIR}/lib/debug) if (WINDOWS) - set(ARCH_PREBUILT_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib) - set(ARCH_PREBUILT_DIRS_RELEASE ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib/release) - set(ARCH_PREBUILT_DIRS_DEBUG ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib/debug) - set(SHARED_LIB_STAGING_DIR ${CMAKE_BINARY_DIR}/sharedlibs CACHE FILEPATH "Location of staged DLLs") - set(EXE_STAGING_DIR ${CMAKE_BINARY_DIR}/sharedlibs CACHE FILEPATH "Location of staged executables") + set(SHARED_LIB_STAGING_DIR ${CMAKE_BINARY_DIR}/sharedlibs) + set(EXE_STAGING_DIR ${CMAKE_BINARY_DIR}/sharedlibs) elseif (LINUX) - if (VIEWER) - set(ARCH_PREBUILT_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib_release_client) - else (VIEWER) - set(ARCH_PREBUILT_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib_release) - endif (VIEWER) - set(ARCH_PREBUILT_DIRS_RELEASE ${ARCH_PREBUILT_DIRS}) - set(ARCH_PREBUILT_DIRS_DEBUG ${ARCH_PREBUILT_DIRS}) - set(SHARED_LIB_STAGING_DIR ${CMAKE_BINARY_DIR}/sharedlibs/lib CACHE FILEPATH "Location of staged .sos") - set(EXE_STAGING_DIR ${CMAKE_BINARY_DIR}/sharedlibs/bin CACHE FILEPATH "Location of staged executables") + set(SHARED_LIB_STAGING_DIR ${CMAKE_BINARY_DIR}/sharedlibs/lib) + set(EXE_STAGING_DIR ${CMAKE_BINARY_DIR}/sharedlibs/bin) elseif (DARWIN) - set(ARCH_PREBUILT_DIRS_RELEASE ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib_release) - set(ARCH_PREBUILT_DIRS ${ARCH_PREBUILT_DIRS_RELEASE}) - set(ARCH_PREBUILT_DIRS_DEBUG ${ARCH_PREBUILT_DIRS_RELEASE}) - set(SHARED_LIB_STAGING_DIR ${CMAKE_BINARY_DIR}/sharedlibs CACHE FILEPATH "Location of staged DLLs") - set(EXE_STAGING_DIR "${CMAKE_BINARY_DIR}/sharedlibs/\$(CONFIGURATION)" CACHE FILEPATH "Location of staged executables") + set(SHARED_LIB_STAGING_DIR ${CMAKE_BINARY_DIR}/sharedlibs) + set(EXE_STAGING_DIR "${CMAKE_BINARY_DIR}/sharedlibs/\$(CONFIGURATION)") endif (WINDOWS) endif (NOT STANDALONE) -link_directories(${ARCH_PREBUILT_DIRS}) +# Autobuild packages must provide 'release' versions of libraries, but may provide versions for +# specific build types. AUTOBUILD_LIBS_INSTALL_DIRS lists first the build type directory and then +# the 'release' directory (as a default fallback). +# *NOTE - we have to take special care to use CMAKE_CFG_INTDIR on IDE generators (like mac and +# windows) and CMAKE_BUILD_TYPE on Makefile based generators (like linux). The reason for this is +# that CMAKE_BUILD_TYPE is essentially meaningless at configuration time for IDE generators and +# CMAKE_CFG_INTDIR is meaningless at build time for Makefile generators +if(WINDOWS OR DARWIN) + # the cmake xcode and VS generators implicitly append ${CMAKE_CFG_INTDIR} to the library paths for us + # fortunately both windows and darwin are case insensitive filesystems so this works. + set(AUTOBUILD_LIBS_INSTALL_DIRS "${AUTOBUILD_INSTALL_DIR}/lib/") +else(WINDOWS OR DARWIN) + # else block is for linux and any other makefile based generators + string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_LOWER) + set(AUTOBUILD_LIBS_INSTALL_DIRS ${AUTOBUILD_INSTALL_DIR}/lib/${CMAKE_BUILD_TYPE_LOWER}) +endif(WINDOWS OR DARWIN) + +list(APPEND AUTOBUILD_LIBS_INSTALL_DIRS ${ARCH_PREBUILT_DIRS_RELEASE}) +link_directories(${AUTOBUILD_LIBS_INSTALL_DIRS}) if (LINUX) set(DL_LIBRARY dl) diff --git a/indra/cmake/MonoEmbed.cmake b/indra/cmake/MonoEmbed.cmake index 0f1f23309c..30890aed21 100644 --- a/indra/cmake/MonoEmbed.cmake +++ b/indra/cmake/MonoEmbed.cmake @@ -37,9 +37,9 @@ IF (DARWIN) ELSE (DARWIN) - SET(MONO_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include) + SET(MONO_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include) SET(GLIB_2_0_PLATFORM_INCLUDE_DIR - ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib-2.0) + ${LIBS_PREBUILT_DIR}/include/glib-2.0) SET(GLIB_2_0_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/glib-2.0) INCLUDE_DIRECTORIES( diff --git a/indra/cmake/MySQL.cmake b/indra/cmake/MySQL.cmake index e591fbc3d8..218482449d 100644 --- a/indra/cmake/MySQL.cmake +++ b/indra/cmake/MySQL.cmake @@ -7,7 +7,7 @@ use_prebuilt_binary(mysql) if (LINUX) if (WORD_SIZE EQUAL 32 OR DEBIAN_VERSION STREQUAL "3.1") set(MYSQL_LIBRARIES mysqlclient) - set(MYSQL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include) + set(MYSQL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include) else (WORD_SIZE EQUAL 32 OR DEBIAN_VERSION STREQUAL "3.1") # Use the native MySQL library on a 64-bit system. set(MYSQL_FIND_QUIETLY ON) @@ -16,9 +16,9 @@ if (LINUX) endif (WORD_SIZE EQUAL 32 OR DEBIAN_VERSION STREQUAL "3.1") elseif (WINDOWS) set(MYSQL_LIBRARIES mysqlclient) - set(MYSQL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include) + set(MYSQL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include) elseif (DARWIN) - set(MYSQL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include) + set(MYSQL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include) set(MYSQL_LIBRARIES optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libmysqlclient.a debug ${ARCH_PREBUILT_DIRS_DEBUG}/libmysqlclient.a diff --git a/indra/cmake/OpenGL.cmake b/indra/cmake/OpenGL.cmake index 6a2b6811af..661666f00d 100644 --- a/indra/cmake/OpenGL.cmake +++ b/indra/cmake/OpenGL.cmake @@ -5,5 +5,5 @@ if (NOT STANDALONE) use_prebuilt_binary(GL) # possible glh_linear should have its own .cmake file instead use_prebuilt_binary(glh_linear) - set(GLEXT_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include) + set(GLEXT_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include) endif (NOT STANDALONE) diff --git a/indra/cmake/OpenSSL.cmake b/indra/cmake/OpenSSL.cmake index 81584c09ea..c692b67b49 100644 --- a/indra/cmake/OpenSSL.cmake +++ b/indra/cmake/OpenSSL.cmake @@ -13,7 +13,7 @@ else (STANDALONE) else (WINDOWS) set(OPENSSL_LIBRARIES ssl) endif (WINDOWS) - set(OPENSSL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include) + set(OPENSSL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) endif (STANDALONE) if (LINUX) diff --git a/indra/cmake/Prebuilt.cmake b/indra/cmake/Prebuilt.cmake index a91519278c..9b758b03f0 100644 --- a/indra/cmake/Prebuilt.cmake +++ b/indra/cmake/Prebuilt.cmake @@ -1,33 +1,45 @@ # -*- cmake -*- -include(Python) -include(FindSCP) +include(FindAutobuild) macro (use_prebuilt_binary _binary) - if (NOT STANDALONE) + if (NOT DEFINED STANDALONE_${_binary}) + set(STANDALONE_${_binary} ${STANDALONE}) + endif (NOT DEFINED STANDALONE_${_binary}) + + if (NOT STANDALONE_${_binary}) if(${CMAKE_BINARY_DIR}/temp/sentinel_installed IS_NEWER_THAN ${CMAKE_BINARY_DIR}/temp/${_binary}_installed) if(INSTALL_PROPRIETARY) include(FindSCP) if(DEBUG_PREBUILT) - message("cd ${SCRIPTS_DIR} && ${PYTHON_EXECUTABLE} install.py --install-dir=${CMAKE_SOURCE_DIR}/.. --scp=${SCP_EXECUTABLE} ${_binary}") + message("cd ${CMAKE_SOURCE_DIR} && ${AUTOBUILD_EXECUTABLE} install + --install-dir=${AUTOBUILD_INSTALL_DIR} + #--scp="${SCP_EXECUTABLE}" + --skip-license-check + ${_binary} ") endif(DEBUG_PREBUILT) - execute_process(COMMAND ${PYTHON_EXECUTABLE} - install.py - --install-dir=${CMAKE_SOURCE_DIR}/.. - --scp=${SCP_EXECUTABLE} + execute_process(COMMAND "${AUTOBUILD_EXECUTABLE}" + install + --install-dir=${AUTOBUILD_INSTALL_DIR} + #--scp="${SCP_EXECUTABLE}" + --skip-license-check ${_binary} - WORKING_DIRECTORY ${SCRIPTS_DIR} + WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" RESULT_VARIABLE ${_binary}_installed ) else(INSTALL_PROPRIETARY) if(DEBUG_PREBUILT) - message("cd ${SCRIPTS_DIR} && ${PYTHON_EXECUTABLE} install.py --install-dir=${CMAKE_SOURCE_DIR}/.. ${_binary}") + message("cd ${CMAKE_SOURCE_DIR} && ${AUTOBUILD_EXECUTABLE} install + --install-dir=${AUTOBUILD_INSTALL_DIR} + --skip-license-check + ${_binary} ") endif(DEBUG_PREBUILT) - execute_process(COMMAND ${PYTHON_EXECUTABLE} - install.py - --install-dir=${CMAKE_SOURCE_DIR}/.. + execute_process(COMMAND "${AUTOBUILD_EXECUTABLE}" + install + --install-dir=${AUTOBUILD_INSTALL_DIR} + --skip-license-check ${_binary} - WORKING_DIRECTORY ${SCRIPTS_DIR} + WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" RESULT_VARIABLE ${_binary}_installed ) endif(INSTALL_PROPRIETARY) @@ -40,5 +52,5 @@ macro (use_prebuilt_binary _binary) "Failed to download or unpack prebuilt '${_binary}'." " Process returned ${${_binary}_installed}.") endif (NOT ${_binary}_installed EQUAL 0) - endif (NOT STANDALONE) + endif (NOT STANDALONE_${_binary}) endmacro (use_prebuilt_binary _binary) diff --git a/indra/cmake/QuickTimePlugin.cmake b/indra/cmake/QuickTimePlugin.cmake index 02f432e3c1..012f4e20d8 100644 --- a/indra/cmake/QuickTimePlugin.cmake +++ b/indra/cmake/QuickTimePlugin.cmake @@ -33,7 +33,7 @@ elseif (WINDOWS) endif (DEBUG_QUICKTIME_LIBRARY AND RELEASE_QUICKTIME_LIBRARY) include_directories( - ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/quicktime + ${LIBS_PREBUILT_DIR}/include/quicktime "${QUICKTIME_SDK_DIR}\\CIncludes" ) endif (DARWIN) diff --git a/indra/cmake/UI.cmake b/indra/cmake/UI.cmake index f529f5b644..91e5258fb7 100644 --- a/indra/cmake/UI.cmake +++ b/indra/cmake/UI.cmake @@ -51,11 +51,11 @@ else (STANDALONE) endif (LINUX) include_directories ( - ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include + ${LIBS_PREBUILT_DIR}/include ${LIBS_PREBUILT_DIR}/include ) foreach(include ${${LL_ARCH}_INCLUDES}) - include_directories(${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/${include}) + include_directories(${LIBS_PREBUILT_DIR}/include/${include}) endforeach(include) endif (STANDALONE) diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake index 5dc0cabf03..88cfdfc0b9 100644 --- a/indra/cmake/Variables.cmake +++ b/indra/cmake/Variables.cmake @@ -17,6 +17,10 @@ # Relative and absolute paths to subtrees. +if(NOT DEFINED COMMON_CMAKE_DIR) + set(COMMON_CMAKE_DIR "${CMAKE_SOURCE_DIR}/cmake") +endif(NOT DEFINED COMMON_CMAKE_DIR) + set(LIBS_CLOSED_PREFIX) set(LIBS_OPEN_PREFIX) set(LIBS_SERVER_PREFIX) @@ -26,14 +30,26 @@ set(VIEWER_PREFIX) set(INTEGRATION_TESTS_PREFIX) set(LL_TESTS ON CACHE BOOL "Build and run unit and integration tests (disable for build timing runs to reduce variation") -set(LIBS_CLOSED_DIR ${CMAKE_SOURCE_DIR}/${LIBS_CLOSED_PREFIX}) -set(LIBS_OPEN_DIR ${CMAKE_SOURCE_DIR}/${LIBS_OPEN_PREFIX}) +if(LIBS_CLOSED_DIR) + file(TO_CMAKE_PATH "${LIBS_CLOSED_DIR}" LIBS_CLOSED_DIR) +else(LIBS_CLOSED_DIR) + set(LIBS_CLOSED_DIR ${CMAKE_SOURCE_DIR}/${LIBS_CLOSED_PREFIX}) +endif(LIBS_CLOSED_DIR) +if(LIBS_COMMON_DIR) + file(TO_CMAKE_PATH "${LIBS_COMMON_DIR}" LIBS_COMMON_DIR) +else(LIBS_COMMON_DIR) + set(LIBS_COMMON_DIR ${CMAKE_SOURCE_DIR}/${LIBS_OPEN_PREFIX}) +endif(LIBS_COMMON_DIR) +set(LIBS_OPEN_DIR ${LIBS_COMMON_DIR}) + set(LIBS_SERVER_DIR ${CMAKE_SOURCE_DIR}/${LIBS_SERVER_PREFIX}) set(SCRIPTS_DIR ${CMAKE_SOURCE_DIR}/${SCRIPTS_PREFIX}) set(SERVER_DIR ${CMAKE_SOURCE_DIR}/${SERVER_PREFIX}) set(VIEWER_DIR ${CMAKE_SOURCE_DIR}/${VIEWER_PREFIX}) -set(LIBS_PREBUILT_DIR ${CMAKE_SOURCE_DIR}/../libraries CACHE PATH +set(AUTOBUILD_INSTALL_DIR ${CMAKE_BINARY_DIR}/packages) + +set(LIBS_PREBUILT_DIR ${AUTOBUILD_INSTALL_DIR} CACHE PATH "Location of prebuilt libraries.") if (EXISTS ${CMAKE_SOURCE_DIR}/Server.cmake) @@ -41,6 +57,10 @@ if (EXISTS ${CMAKE_SOURCE_DIR}/Server.cmake) set(INSTALL_PROPRIETARY ON CACHE BOOL "Install proprietary binaries") endif (EXISTS ${CMAKE_SOURCE_DIR}/Server.cmake) +if (NOT CMAKE_BUILD_TYPE) + set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING + "Build type. One of: Debug Release RelWithDebInfo" FORCE) +endif (NOT CMAKE_BUILD_TYPE) if (${CMAKE_SYSTEM_NAME} MATCHES "Windows") set(WINDOWS ON BOOL FORCE) @@ -54,20 +74,19 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") set(LINUX ON BOOl FORCE) # If someone has specified a word size, use that to determine the - # architecture. Otherwise, let the compiler specify the word size. - # Using uname will break under chroots and other cross arch compiles. RC + # architecture. Otherwise, let the architecture specify the word size. if (WORD_SIZE EQUAL 32) set(ARCH i686) elseif (WORD_SIZE EQUAL 64) set(ARCH x86_64) else (WORD_SIZE EQUAL 32) - if(CMAKE_SIZEOF_VOID_P MATCHES 4) - set(ARCH i686) - set(WORD_SIZE 32) - else(CMAKE_SIZEOF_VOID_P MATCHES 4) - set(ARCH x86_64) + execute_process(COMMAND uname -m COMMAND sed s/i.86/i686/ + OUTPUT_VARIABLE ARCH OUTPUT_STRIP_TRAILING_WHITESPACE) + if (ARCH STREQUAL x86_64) set(WORD_SIZE 64) - endif(CMAKE_SIZEOF_VOID_P MATCHES 4) + else (ARCH STREQUAL x86_64) + set(WORD_SIZE 32) + endif (ARCH STREQUAL x86_64) endif (WORD_SIZE EQUAL 32) set(LL_ARCH ${ARCH}_linux) @@ -76,25 +95,12 @@ endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux") if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") set(DARWIN 1) - - # NOTE: If specifying a different SDK with CMAKE_OSX_SYSROOT at configure - # time you should also specify CMAKE_OSX_DEPLOYMENT_TARGET explicitly, - # otherwise CMAKE_OSX_SYSROOT will be overridden here. We can't just check - # for it being unset, as it gets set to the system default :( - - # Default to building against the 10.4 SDK if no deployment target is - # specified. - if (NOT CMAKE_OSX_DEPLOYMENT_TARGET) - # NOTE: setting -isysroot is NOT adequate: http://lists.apple.com/archives/Xcode-users/2007/Oct/msg00696.html - # see http://public.kitware.com/Bug/view.php?id=9959 + poppy - set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.5.sdk) - set(CMAKE_OSX_DEPLOYMENT_TARGET 10.4) - endif (NOT CMAKE_OSX_DEPLOYMENT_TARGET) - - # GCC 4.2 is incompatible with the MacOSX 10.4 SDK - if (${CMAKE_OSX_SYSROOT} MATCHES "10.4u") - set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "4.0") - endif (${CMAKE_OSX_SYSROOT} MATCHES "10.4u") + + # To support a different SDK update these Xcode settings: + set(CMAKE_OSX_DEPLOYMENT_TARGET 10.5) + set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.5.sdk) + set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "4.2") + set(CMAKE_XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT "DWARF with dSYM File") # NOTE: To attempt an i386/PPC Universal build, add this on the configure line: # -DCMAKE_OSX_ARCHITECTURES:STRING='i386;ppc' @@ -125,6 +131,7 @@ set(VIEWER ON CACHE BOOL "Build Second Life viewer.") set(VIEWER_CHANNEL "LindenDeveloper" CACHE STRING "Viewer Channel Name") set(VIEWER_LOGIN_CHANNEL ${VIEWER_CHANNEL} CACHE STRING "Fake login channel for A/B Testing") +set(VERSION_BUILD "0" CACHE STRING "Revision number passed in from the outside") set(STANDALONE OFF CACHE BOOL "Do not use Linden-supplied prebuilt libraries.") if (NOT STANDALONE AND EXISTS ${CMAKE_SOURCE_DIR}/llphysics) @@ -144,3 +151,4 @@ endif (LINUX AND SERVER AND VIEWER) set(USE_PRECOMPILED_HEADERS ON CACHE BOOL "Enable use of precompiled header directives where supported.") source_group("CMake Rules" FILES CMakeLists.txt) + diff --git a/indra/media_plugins/webkit/CMakeLists.txt b/indra/media_plugins/webkit/CMakeLists.txt index 3b1f679540..b36291f0e8 100644 --- a/indra/media_plugins/webkit/CMakeLists.txt +++ b/indra/media_plugins/webkit/CMakeLists.txt @@ -121,8 +121,8 @@ if (DARWIN) add_custom_command( TARGET media_plugin_webkit POST_BUILD # OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/libllqtwebkit.dylib - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/libllqtwebkit.dylib ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/ - DEPENDS media_plugin_webkit ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/libllqtwebkit.dylib + COMMAND ${CMAKE_COMMAND} -E copy ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.dylib ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/ + DEPENDS media_plugin_webkit ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.dylib ) endif (DARWIN) 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") diff --git a/indra/test_apps/llplugintest/CMakeLists.txt b/indra/test_apps/llplugintest/CMakeLists.txt index b4043b0fd9..77789230aa 100644 --- a/indra/test_apps/llplugintest/CMakeLists.txt +++ b/indra/test_apps/llplugintest/CMakeLists.txt @@ -379,8 +379,8 @@ endif (DARWIN OR WINDOWS) if (DARWIN) add_custom_command(TARGET llmediaplugintest POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/libllqtwebkit.dylib ${PLUGINS_DESTINATION_DIR} - DEPENDS ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/libllqtwebkit.dylib + COMMAND ${CMAKE_COMMAND} -E copy ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.dylib ${PLUGINS_DESTINATION_DIR} + DEPENDS ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.dylib ) endif (DARWIN) -- cgit v1.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...) --- .hgignore | 1 + autobuild.xml | 12 ++++++------ indra/cmake/Copy3rdPartyLibs.cmake | 11 ++++------- indra/cmake/GooglePerfTools.cmake | 4 +--- indra/llaudio/CMakeLists.txt | 1 + indra/newview/CMakeLists.txt | 2 +- indra/newview/viewer_manifest.py | 10 +++++----- indra/test_apps/llplugintest/CMakeLists.txt | 12 ++++++------ 8 files changed, 25 insertions(+), 28 deletions(-) (limited to 'indra/cmake') diff --git a/.hgignore b/.hgignore index a5b094788a..dbbf8268a9 100644 --- a/.hgignore +++ b/.hgignore @@ -12,6 +12,7 @@ syntax: glob LICENSES indra/.distcc build-darwin-* +build-vc80/ indra/build-vc[0-9]* indra/CMakeFiles indra/lib/mono/1.0/*.dll diff --git a/autobuild.xml b/autobuild.xml index ff56e7559a..45dba8381d 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -404,9 +404,9 @@ archive hash - 651dd6d4c057e89f989ce0eda447c441 + b9fa0ef683657090ae66663863ebba74 url - scp:install-packages.lindenlab.com:/local/www/install-packages/doc/fmod-3.75-windows-20101008.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/merov_fmod-autobuild/rev/219050/arch/CYGWIN/installer/fmod-3.75-windows-20110113.tar.bz2 name windows @@ -870,9 +870,9 @@ archive hash - f43ffb2217628a38d6004bdad792e7d2 + 0c7b5596c27f511d4957abe35f7f8dee url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/kdu-4.2.1-windows-20100930b.tar.bz2 + scp:install-packages.lindenlab.com:/local/www/install-packages/doc/kdu-6.4.1-windows-20110113.tar.bz2 name windows @@ -1006,9 +1006,9 @@ archive hash - 8bb26542f86cb469b2b56d42258e1bad + 5af0f88e298ea8b6041e29928f520eda url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-windows-qt4.6-20101001a.tar.bz2 + scp:install-packages.lindenlab.com:/local/www/install-packages/doc/llqtwebkit-4.7.1-windows-20110113.tar.bz2 name windows diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 55a26cf9ef..92ebd75006 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -17,7 +17,7 @@ if(WINDOWS) #******************************* # VIVOX - *NOTE: no debug version - set(vivox_src_dir "${CMAKE_SOURCE_DIR}/newview/vivox-runtime/i686-win32") + set(vivox_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}") set(vivox_files SLVoice.exe libsndfile-1.dll @@ -31,9 +31,7 @@ if(WINDOWS) #******************************* # Misc shared libs - # *TODO - update this to use LIBS_PREBUILT_DIR and LL_ARCH_DIR variables - # or ARCH_PREBUILT_DIRS - set(debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug") + set(debug_src_dir "${ARCH_PREBUILT_DIRS_DEBUG}") set(debug_files openjpegd.dll libapr-1.dll @@ -41,14 +39,13 @@ if(WINDOWS) libapriconv-1.dll ) - # *TODO - update this to use LIBS_PREBUILT_DIR and LL_ARCH_DIR variables - # or ARCH_PREBUILT_DIRS - set(release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release") + set(release_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}") set(release_files openjpeg.dll libapr-1.dll libaprutil-1.dll libapriconv-1.dll + dbghelp.dll ) if(USE_GOOGLE_PERFTOOLS) diff --git a/indra/cmake/GooglePerfTools.cmake b/indra/cmake/GooglePerfTools.cmake index 0ac67fe595..133ae14d2f 100644 --- a/indra/cmake/GooglePerfTools.cmake +++ b/indra/cmake/GooglePerfTools.cmake @@ -4,9 +4,6 @@ include(Prebuilt) if (STANDALONE) include(FindGooglePerfTools) else (STANDALONE) - if(NOT DARWIN) - use_prebuilt_binary(google) - endif() if (WINDOWS) use_prebuilt_binary(google-perftools) set(TCMALLOC_LIBRARIES @@ -15,6 +12,7 @@ else (STANDALONE) set(GOOGLE_PERFTOOLS_FOUND "YES") endif (WINDOWS) if (LINUX) + use_prebuilt_binary(google) set(TCMALLOC_LIBRARIES tcmalloc) set(STACKTRACE_LIBRARIES stacktrace) set(PROFILER_LIBRARIES profiler) diff --git a/indra/llaudio/CMakeLists.txt b/indra/llaudio/CMakeLists.txt index 21ec622819..632e5d46e3 100644 --- a/indra/llaudio/CMakeLists.txt +++ b/indra/llaudio/CMakeLists.txt @@ -24,6 +24,7 @@ include_directories( ${VORBIS_INCLUDE_DIRS} ${OPENAL_LIB_INCLUDE_DIRS} ${FREEAULT_LIB_INCLUDE_DIRS} + ${FMOD_INCLUDE_DIR} ) set(llaudio_SOURCE_FILES 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") diff --git a/indra/test_apps/llplugintest/CMakeLists.txt b/indra/test_apps/llplugintest/CMakeLists.txt index 77789230aa..d6203ea026 100644 --- a/indra/test_apps/llplugintest/CMakeLists.txt +++ b/indra/test_apps/llplugintest/CMakeLists.txt @@ -389,7 +389,7 @@ if(WINDOWS) # Plugin test library deploy # # Debug config runtime files required for the plugin test mule - set(plugintest_debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug") + set(plugintest_debug_src_dir "${ARCH_PREBUILT_DIRS_DEBUG}") set(plugintest_debug_files libeay32.dll libglib-2.0-0.dll @@ -412,7 +412,7 @@ if(WINDOWS) set(plugin_test_targets ${plugin_test_targets} ${out_targets}) # Debug config runtime files required for the plugin test mule (Qt image format plugins) - set(plugintest_debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug/imageformats") + set(plugintest_debug_src_dir "${ARCH_PREBUILT_DIRS_DEBUG}/imageformats") set(plugintest_debug_files qgifd4.dll qicod4.dll @@ -430,7 +430,7 @@ if(WINDOWS) set(plugin_test_targets ${plugin_test_targets} ${out_targets}) # Debug config runtime files required for the plugin test mule (Qt codec plugins) - set(plugintest_debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug/codecs") + set(plugintest_debug_src_dir "${ARCH_PREBUILT_DIRS_DEBUG}/codecs") set(plugintest_debug_files qcncodecsd4.dll qjpcodecsd4.dll @@ -446,7 +446,7 @@ if(WINDOWS) set(plugin_test_targets ${plugin_test_targets} ${out_targets}) # Release & ReleaseDebInfo config runtime files required for the plugin test mule - set(plugintest_release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release") + set(plugintest_release_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}") set(plugintest_release_files libeay32.dll libglib-2.0-0.dll @@ -478,7 +478,7 @@ if(WINDOWS) set(plugin_test_targets ${plugin_test_targets} ${out_targets}) # Release & ReleaseDebInfo config runtime files required for the plugin test mule (Qt image format plugins) - set(plugintest_release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release/imageformats") + set(plugintest_release_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}/imageformats") set(plugintest_release_files qgif4.dll qico4.dll @@ -504,7 +504,7 @@ if(WINDOWS) set(plugin_test_targets ${plugin_test_targets} ${out_targets}) # Release & ReleaseDebInfo config runtime files required for the plugin test mule (Qt codec plugins) - set(plugintest_release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release/codecs") + set(plugintest_release_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}/codecs") set(plugintest_release_files qcncodecs4.dll qjpcodecs4.dll -- cgit v1.3 From eb9f19dabdbe80dd047069edc8e1d04e906e7529 Mon Sep 17 00:00:00 2001 From: Boroondas Gupte Date: Mon, 17 Jan 2011 18:52:24 +0100 Subject: VWR-24520: Don't use pkg_check_modules( ... QUIET ) on CMake < 2.8.2 CMake before 2.8.2 doesn't support QUIET for pkg_check_modules(), yet. Credit goes to Aleric, 'cause he told me what to change. --- doc/contributions.txt | 1 + indra/cmake/FindLLQtWebkit.cmake | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'indra/cmake') diff --git a/doc/contributions.txt b/doc/contributions.txt index b6bdc36d46..102c89dc51 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -74,6 +74,7 @@ Aleric Inglewood VWR-14426 VWR-24247 VWR-24252 + VWR-24520 SNOW-84 SNOW-477 SNOW-744 diff --git a/indra/cmake/FindLLQtWebkit.cmake b/indra/cmake/FindLLQtWebkit.cmake index c747ec32a2..4bf5f5cb73 100644 --- a/indra/cmake/FindLLQtWebkit.cmake +++ b/indra/cmake/FindLLQtWebkit.cmake @@ -22,9 +22,9 @@ if (PKG_CONFIG_FOUND) else (LLQtWebkit_FIND_REQUIRED AND LLQtWebkit_FIND_VERSION) set(_PACKAGE_ARGS libllqtwebkit) endif (LLQtWebkit_FIND_REQUIRED AND LLQtWebkit_FIND_VERSION) - if (NOT "${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" VERSION_LESS "2.8") + if (NOT "${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_LESS "2.8.2") # As virtually nobody will have a pkg-config file for this, do this check always quiet. - # Unfortunately cmake 2.8 or higher is required for pkg_check_modules to have a 'QUIET'. + # Unfortunately cmake 2.8.2 or higher is required for pkg_check_modules to have a 'QUIET'. set(_PACKAGE_ARGS ${_PACKAGE_ARGS} QUIET) endif () pkg_check_modules(LLQTWEBKIT ${_PACKAGE_ARGS}) -- cgit v1.3 From 3150fb0021222fe5e39dd45e82c183ccff8013f0 Mon Sep 17 00:00:00 2001 From: jenn Date: Tue, 18 Jan 2011 09:59:34 -0800 Subject: Added entries to autobuild.xml for 'openal_soft' and 'google' libs on linux. These packages have been rebuilt to use the new package layout (thanks alain!). 'openal_soft' was also renamed to use an underscore in its name rather than a dash. --- autobuild.xml | 64 +++++++++++++++++++++++++++++++++++++++++++++--- indra/cmake/OPENAL.cmake | 2 +- 2 files changed, 62 insertions(+), 4 deletions(-) (limited to 'indra/cmake') diff --git a/autobuild.xml b/autobuild.xml index 45dba8381d..dc4335bcb6 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -583,6 +583,30 @@ + google + + name + google + platforms + + linux + + archive + + hash + 7d9d1b6d32ee273df164f7b7d5f29848 + hash_algorithm + md5 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/google-0.0.0-linux-20110114.tar.bz2 + + name + linux + + + version + 0.0.0 + google-perftools license_file @@ -1187,6 +1211,32 @@ + openal_soft + + license_file + LICENSES/OPENAL.txt + name + openal_soft + platforms + + linux + + archive + + hash + fccdca18a950ac9363c6fb39118b80e1 + hash_algorithm + md5 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openal-3ad86a1c-linux-20110114.tar.bz2 + + name + linux + + + version + 3ad86a1c + openjpeg license_file @@ -1614,7 +1664,7 @@ arguments - ..\indra + ../indra options @@ -1634,7 +1684,7 @@ arguments - ..\indra + ../indra options @@ -1653,7 +1703,7 @@ arguments - ..\indra + ../indra options @@ -1664,6 +1714,14 @@ name Release + default + + build + + + name + default + name linux diff --git a/indra/cmake/OPENAL.cmake b/indra/cmake/OPENAL.cmake index d01c680ed1..ed483e5aea 100644 --- a/indra/cmake/OPENAL.cmake +++ b/indra/cmake/OPENAL.cmake @@ -15,7 +15,7 @@ if (OPENAL) pkg_check_modules(OPENAL_LIB REQUIRED openal) pkg_check_modules(FREEALUT_LIB REQUIRED freealut) else (STANDALONE) - use_prebuilt_binary(openal-soft) + use_prebuilt_binary(openal_soft) endif (STANDALONE) set(OPENAL_LIBRARIES openal -- cgit v1.3 From 86acdedc63951705eb718480f060f3c8fc779b34 Mon Sep 17 00:00:00 2001 From: "Andrew A. de Laix" Date: Tue, 18 Jan 2011 13:18:04 -0800 Subject: fix path to prebiuld slvoice libraries on mac and linux. --- indra/cmake/Copy3rdPartyLibs.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/cmake') diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 92ebd75006..2e8bb04db1 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -124,7 +124,7 @@ elseif(DARWIN) set(SHARED_LIB_STAGING_DIR_RELWITHDEBINFO "${SHARED_LIB_STAGING_DIR}/RelWithDebInfo/Resources") set(SHARED_LIB_STAGING_DIR_RELEASE "${SHARED_LIB_STAGING_DIR}/Release/Resources") - set(vivox_src_dir "${CMAKE_SOURCE_DIR}/newview/vivox-runtime/universal-darwin") + set(vivox_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}") set(vivox_files SLVoice libsndfile.dylib @@ -159,7 +159,7 @@ elseif(LINUX) set(SHARED_LIB_STAGING_DIR_RELWITHDEBINFO "${SHARED_LIB_STAGING_DIR}") set(SHARED_LIB_STAGING_DIR_RELEASE "${SHARED_LIB_STAGING_DIR}") - set(vivox_src_dir "${CMAKE_SOURCE_DIR}/newview/vivox-runtime/i686-linux") + set(vivox_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}") set(vivox_files libsndfile.so.1 libortp.so -- cgit v1.3 From 19293991b708b90bbe75c86f7a6b0861d741b57a Mon Sep 17 00:00:00 2001 From: jenn Date: Tue, 18 Jan 2011 16:27:18 -0800 Subject: Added 'slvoice' (vivox) to autobuild.xml for linux. This is version 3.1 of the lib; viewer was using version 3.2, but this version has been rebuilt using the new package layout. Hopefully it will work, though we may need to convert version 3.2 if it does not. Updated Copy3rdParyLibs.cmake paths for linux installation of vivox files. --- autobuild.xml | 14 +++++++++++++- indra/cmake/Copy3rdPartyLibs.cmake | 4 ++-- 2 files changed, 15 insertions(+), 3 deletions(-) (limited to 'indra/cmake') diff --git a/autobuild.xml b/autobuild.xml index 30b1c1cace..f2a8bc10bf 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1330,7 +1330,7 @@ slvoice license_file - LICENSES/apr_suite.txt + LICENSES/slvoice.txt name vivox platforms @@ -1347,6 +1347,18 @@ name darwin + linux + + archive + + hash + 827ebbcddb31516e7e40a37374a52ebf + url + http://viewer-source-downloads.s3.amazonaws.com/install_pkgs/vivox-3.1.0001.8821-linux-20101018.tar.bz2 + + name + linux + windows archive diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 2e8bb04db1..9741d4f890 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -155,9 +155,9 @@ elseif(DARWIN) elseif(LINUX) # linux is weird, multiple side by side configurations aren't supported # and we don't seem to have any debug shared libs built yet anyways... - set(SHARED_LIB_STAGING_DIR_DEBUG "${SHARED_LIB_STAGING_DIR}") + set(SHARED_LIB_STAGING_DIR_DEBUG "${SHARED_LIB_STAGING_DIR}/debug") set(SHARED_LIB_STAGING_DIR_RELWITHDEBINFO "${SHARED_LIB_STAGING_DIR}") - set(SHARED_LIB_STAGING_DIR_RELEASE "${SHARED_LIB_STAGING_DIR}") + set(SHARED_LIB_STAGING_DIR_RELEASE "${SHARED_LIB_STAGING_DIR}/release") set(vivox_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}") set(vivox_files -- cgit v1.3 From 0d6ec39f44f9f32060bb5d02ad9281922a610516 Mon Sep 17 00:00:00 2001 From: jenn Date: Wed, 19 Jan 2011 10:03:51 -0800 Subject: Cmake updates to get llkdu building on linux. Need to rebuild kdu tarball next. --- indra/cmake/Copy3rdPartyLibs.cmake | 8 ++++---- indra/cmake/LLKDU.cmake | 2 +- indra/cmake/run_build_test.py | 0 indra/llkdu/CMakeLists.txt | 10 ++++++++++ indra/llkdu/tests/llimagej2ckdu_test.cpp | 6 +++--- 5 files changed, 18 insertions(+), 8 deletions(-) mode change 100644 => 100755 indra/cmake/run_build_test.py (limited to 'indra/cmake') diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 9741d4f890..3d49f97a2a 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -155,9 +155,9 @@ elseif(DARWIN) elseif(LINUX) # linux is weird, multiple side by side configurations aren't supported # and we don't seem to have any debug shared libs built yet anyways... - set(SHARED_LIB_STAGING_DIR_DEBUG "${SHARED_LIB_STAGING_DIR}/debug") + set(SHARED_LIB_STAGING_DIR_DEBUG "${SHARED_LIB_STAGING_DIR}") set(SHARED_LIB_STAGING_DIR_RELWITHDEBINFO "${SHARED_LIB_STAGING_DIR}") - set(SHARED_LIB_STAGING_DIR_RELEASE "${SHARED_LIB_STAGING_DIR}/release") + set(SHARED_LIB_STAGING_DIR_RELEASE "${SHARED_LIB_STAGING_DIR}") set(vivox_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}") set(vivox_files @@ -170,12 +170,12 @@ elseif(LINUX) ) # *TODO - update this to use LIBS_PREBUILT_DIR and LL_ARCH_DIR variables # or ARCH_PREBUILT_DIRS - set(debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-linux/lib_debug") + set(debug_src_dir "${ARCH_PREBUILT_DIRS_DEBUG}") set(debug_files ) # *TODO - update this to use LIBS_PREBUILT_DIR and LL_ARCH_DIR variables # or ARCH_PREBUILT_DIRS - set(release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-linux/lib_release_client") + set(release_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}") # *FIX - figure out what to do with duplicate libalut.so here -brad set(release_files libapr-1.so.0 diff --git a/indra/cmake/LLKDU.cmake b/indra/cmake/LLKDU.cmake index 3a6e746605..bbbb2df366 100644 --- a/indra/cmake/LLKDU.cmake +++ b/indra/cmake/LLKDU.cmake @@ -14,7 +14,7 @@ if (USE_KDU) else (WINDOWS) set(KDU_LIBRARY libkdu.a) endif (WINDOWS) - set(KDU_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/kdu) + set(KDU_INCLUDE_DIR ${ARCH_PREBUILT_DIRS_RELEASE}/include/kdu) set(LLKDU_INCLUDE_DIRS ${LIBS_OPEN_DIR}/llkdu) set(LLKDU_LIBRARIES llkdu) endif (USE_KDU) diff --git a/indra/cmake/run_build_test.py b/indra/cmake/run_build_test.py old mode 100644 new mode 100755 diff --git a/indra/llkdu/CMakeLists.txt b/indra/llkdu/CMakeLists.txt index 7ed1c6c694..046629b514 100644 --- a/indra/llkdu/CMakeLists.txt +++ b/indra/llkdu/CMakeLists.txt @@ -19,6 +19,7 @@ include_directories( ${LLCOMMON_INCLUDE_DIRS} ${LLIMAGE_INCLUDE_DIRS} ${KDU_INCLUDE_DIR} + ${LLKDU_INCLUDE_DIRS} ${LLMATH_INCLUDE_DIRS} ) @@ -49,6 +50,15 @@ if (USE_KDU) SET(llkdu_TEST_SOURCE_FILES llimagej2ckdu.cpp ) + SET(llkdu_test_additional_HEADER_FILES + llimagej2ckdu.h + llkdumem.h + lltut.h + ) + SET(llkdu_test_additional_INCLUDE_DIRS + ${KDU_INCLUDE_DIR} + ${LLKDU_INCLUDE_DIRS} + ) LL_ADD_PROJECT_UNIT_TESTS(llkdu "${llkdu_TEST_SOURCE_FILES}") endif (LL_TESTS) diff --git a/indra/llkdu/tests/llimagej2ckdu_test.cpp b/indra/llkdu/tests/llimagej2ckdu_test.cpp index 1ccee4bb64..7ac24a969a 100644 --- a/indra/llkdu/tests/llimagej2ckdu_test.cpp +++ b/indra/llkdu/tests/llimagej2ckdu_test.cpp @@ -27,10 +27,10 @@ #include "linden_common.h" // Class to test -#include "../llimagej2ckdu.h" -#include "../llkdumem.h" +#include "llimagej2ckdu.h" +#include "llkdumem.h" // Tut header -#include "../test/lltut.h" +#include "lltut.h" // ------------------------------------------------------------------------------------------- // Stubbing: Declarations required to link and run the class being tested -- cgit v1.3 From 6bd044720e41587eb58c07b225ae82862b69dd4f Mon Sep 17 00:00:00 2001 From: Alain Linden Date: Wed, 19 Jan 2011 14:15:24 -0800 Subject: fix include path for KDU headers --- indra/cmake/LLKDU.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/cmake') diff --git a/indra/cmake/LLKDU.cmake b/indra/cmake/LLKDU.cmake index bbbb2df366..13c2b86e2f 100644 --- a/indra/cmake/LLKDU.cmake +++ b/indra/cmake/LLKDU.cmake @@ -14,7 +14,7 @@ if (USE_KDU) else (WINDOWS) set(KDU_LIBRARY libkdu.a) endif (WINDOWS) - set(KDU_INCLUDE_DIR ${ARCH_PREBUILT_DIRS_RELEASE}/include/kdu) + set(KDU_INCLUDE_DIR ${AUTOBUILD_INSTALL_DIR}/include/kdu) set(LLKDU_INCLUDE_DIRS ${LIBS_OPEN_DIR}/llkdu) set(LLKDU_LIBRARIES llkdu) endif (USE_KDU) -- cgit v1.3 From 60f831151e41ccec184c4c6ecace86491fca36da Mon Sep 17 00:00:00 2001 From: "Mark Palange (Mani)" Date: Thu, 20 Jan 2011 11:03:53 -0800 Subject: Compile flag for wchar_t, boost 1_45 lib update, indra.l include ordering adjustment --- indra/cmake/00-Common.cmake | 4 ++-- indra/cmake/Boost.cmake | 36 +++++++++++++++++------------------ indra/lscript/lscript_compile/indra.l | 5 ++++- install.xml | 4 ++-- 4 files changed, 25 insertions(+), 24 deletions(-) (limited to 'indra/cmake') diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index dbe0cf5cd0..25a1b05d8e 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -61,7 +61,7 @@ if (WINDOWS) /Oy- ) - if(MSVC80 OR MSVC90) + if(MSVC) set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -D_SECURE_STL=0 -D_HAS_ITERATOR_DEBUGGING=0" CACHE STRING "C++ compiler release options" FORCE) @@ -69,7 +69,7 @@ if (WINDOWS) add_definitions( /Zc:wchar_t- ) - endif (MSVC80 OR MSVC90) + endif (MSVC) # Are we using the crummy Visual Studio KDU build workaround? if (NOT VS_DISABLE_FATAL_WARNINGS) diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake index 012d3c2ab2..0b7eb7e99b 100644 --- a/indra/cmake/Boost.cmake +++ b/indra/cmake/Boost.cmake @@ -17,24 +17,8 @@ else (STANDALONE) set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) if (WINDOWS) - set(BOOST_VERSION 1_39) - if (MSVC71) - set(BOOST_PROGRAM_OPTIONS_LIBRARY - optimized libboost_program_options-vc71-mt-s-${BOOST_VERSION} - debug libboost_program_options-vc71-mt-sgd-${BOOST_VERSION}) - set(BOOST_REGEX_LIBRARY - optimized libboost_regex-vc71-mt-s-${BOOST_VERSION} - debug libboost_regex-vc71-mt-sgd-${BOOST_VERSION}) - set(BOOST_SIGNALS_LIBRARY - optimized libboost_signals-vc71-mt-s-${BOOST_VERSION} - debug libboost_signals-vc71-mt-sgd-${BOOST_VERSION}) - set(BOOST_SYSTEM_LIBRARY - optimized libboost_system-vc71-mt-s-${BOOST_VERSION} - debug libboost_system-vc71-mt-sgd-${BOOST_VERSION}) - set(BOOST_FILESYSTEM_LIBRARY - optimized libboost_filesystem-vc71-mt-s-${BOOST_VERSION} - debug libboost_filesystem-vc71-mt-sgd-${BOOST_VERSION}) - else (MSVC71) + set(BOOST_VERSION 1_45) + if(MSVC80) set(BOOST_PROGRAM_OPTIONS_LIBRARY optimized libboost_program_options-vc80-mt-${BOOST_VERSION} debug libboost_program_options-vc80-mt-gd-${BOOST_VERSION}) @@ -50,7 +34,21 @@ else (STANDALONE) set(BOOST_FILESYSTEM_LIBRARY optimized libboost_filesystem-vc80-mt-${BOOST_VERSION} debug libboost_filesystem-vc80-mt-gd-${BOOST_VERSION}) - endif (MSVC71) + else(MSVC80) + # MSVC 10.0 config + set(BOOST_PROGRAM_OPTIONS_LIBRARY + optimized libboost_program_options-vc100-mt + debug libboost_program_options-vc100-mt-gd) + set(BOOST_REGEX_LIBRARY + optimized libboost_regex-vc100-mt + debug libboost_regex-vc100-mt-gd) + set(BOOST_SYSTEM_LIBRARY + optimized libboost_system-vc100-mt + debug libboost_system-vc100-mt-gd) + set(BOOST_FILESYSTEM_LIBRARY + optimized libboost_filesystem-vc100-mt + debug libboost_filesystem-vc100-mt-gd) + endif (MSVC80) elseif (DARWIN) set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-xgcc40-mt) set(BOOST_REGEX_LIBRARY boost_regex-xgcc40-mt) diff --git a/indra/lscript/lscript_compile/indra.l b/indra/lscript/lscript_compile/indra.l index 8fe9f5ed29..188c9e1950 100644 --- a/indra/lscript/lscript_compile/indra.l +++ b/indra/lscript/lscript_compile/indra.l @@ -8,8 +8,11 @@ FS (f|F) %n 4000 %p 5000 +%top { + #include "linden_common.h" +} + %{ -#include "linden_common.h" // Deal with the fact that lex/yacc generates unreachable code #ifdef LL_WINDOWS #pragma warning (disable : 4018) // warning C4018: signed/unsigned mismatch diff --git a/install.xml b/install.xml index 13abaac1c1..c8342ef31e 100644 --- a/install.xml +++ b/install.xml @@ -214,9 +214,9 @@ windows md5sum - 72e6e2eff5d146a107f3059b6c31fb95 + 40b204f6769ee383db35a0585ca035a6 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-windows-20100630.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/palange_3p-test-lib/rev/219285/arch/CYGWIN/installer/boost-1.45.0-windows-20110119.tar.bz2 -- cgit v1.3 From 6dd086794f5cf319fca1736a5803423b58d79d0b Mon Sep 17 00:00:00 2001 From: "Mark Palange (Mani)" Date: Mon, 24 Jan 2011 12:04:49 -0800 Subject: Updated boost lib --- autobuild.xml | 12 ++++++------ indra/cmake/Boost.cmake | 16 ++++++++-------- 2 files changed, 14 insertions(+), 14 deletions(-) (limited to 'indra/cmake') diff --git a/autobuild.xml b/autobuild.xml index 340f774a9e..30e78729dd 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -210,9 +210,9 @@ archive hash - de5559c2c497544b3d0da533390175dc + 98be22c8833aa2bca184b9fa09fbb82b url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-windows-20101001a.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-boost/rev/219456/arch/CYGWIN/installer/boost-1.45.0-windows-20110124.tar.bz2 name windows @@ -1880,7 +1880,7 @@ windows build_directory - build-vc80 + build-vc100 configurations Debug @@ -1908,7 +1908,7 @@ options -G - "Visual Studio 8 2005" + "Visual Studio 10" name @@ -1939,7 +1939,7 @@ options -G - "Visual Studio 8 2005" + "Visual Studio 10" default @@ -1972,7 +1972,7 @@ options -G - "Visual Studio 8 2005" + "Visual Studio 10" name diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake index 0b7eb7e99b..b9c047a764 100644 --- a/indra/cmake/Boost.cmake +++ b/indra/cmake/Boost.cmake @@ -37,17 +37,17 @@ else (STANDALONE) else(MSVC80) # MSVC 10.0 config set(BOOST_PROGRAM_OPTIONS_LIBRARY - optimized libboost_program_options-vc100-mt - debug libboost_program_options-vc100-mt-gd) + optimized libboost_program_options-vc100-mt-${BOOST_VERSION} + debug libboost_program_options-vc100-mt-gd-${BOOST_VERSION}) set(BOOST_REGEX_LIBRARY - optimized libboost_regex-vc100-mt - debug libboost_regex-vc100-mt-gd) + optimized libboost_regex-vc100-mt-${BOOST_VERSION} + debug libboost_regex-vc100-mt-gd-${BOOST_VERSION}) set(BOOST_SYSTEM_LIBRARY - optimized libboost_system-vc100-mt - debug libboost_system-vc100-mt-gd) + optimized libboost_system-vc100-mt-${BOOST_VERSION} + debug libboost_system-vc100-mt-gd-${BOOST_VERSION}) set(BOOST_FILESYSTEM_LIBRARY - optimized libboost_filesystem-vc100-mt - debug libboost_filesystem-vc100-mt-gd) + optimized libboost_filesystem-vc100-mt-${BOOST_VERSION} + debug libboost_filesystem-vc100-mt-gd-${BOOST_VERSION}) endif (MSVC80) elseif (DARWIN) set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-xgcc40-mt) -- cgit v1.3 From 00d9cc90adfb7980a71aec83be150497bc410c12 Mon Sep 17 00:00:00 2001 From: "Mark Palange (Mani)" Date: Wed, 26 Jan 2011 11:13:52 -0800 Subject: Updated Windows build flags to set _SECURE_SCL. Removed some duplicate declarations. --- indra/cmake/00-Common.cmake | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) (limited to 'indra/cmake') diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 25a1b05d8e..15b827b217 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -7,10 +7,10 @@ include(Variables) # Portable compilation flags. set(CMAKE_CXX_FLAGS_DEBUG "-D_DEBUG -DLL_DEBUG=1") set(CMAKE_CXX_FLAGS_RELEASE - "-DLL_RELEASE=1 -DLL_RELEASE_FOR_DOWNLOAD=1 -D_SECURE_SCL=0 -DNDEBUG") + "-DLL_RELEASE=1 -DLL_RELEASE_FOR_DOWNLOAD=1 -DNDEBUG") set(CMAKE_CXX_FLAGS_RELWITHDEBINFO - "-DLL_RELEASE=1 -D_SECURE_SCL=0 -DNDEBUG -DLL_RELEASE_WITH_DEBUG_INFO=1") + "-DLL_RELEASE=1 -DNDEBUG -DLL_RELEASE_WITH_DEBUG_INFO=1") # Configure crash reporting set(RELEASE_CRASH_REPORTING OFF CACHE BOOL "Enable use of crash reporting in release builds") @@ -36,13 +36,13 @@ if (WINDOWS) # Don't build DLLs. set(BUILD_SHARED_LIBS OFF) - set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Od /Zi /MDd /MP" + set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Od /Zi /MDd /MP -D_SCL_SECURE_NO_WARNINGS=1" CACHE STRING "C++ compiler debug options" FORCE) set(CMAKE_CXX_FLAGS_RELWITHDEBINFO - "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Od /Zi /MD /MP /Ob2" + "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Od /Zi /MD /MP /Ob2 -D_SECURE_STL=0" CACHE STRING "C++ compiler release-with-debug options" FORCE) set(CMAKE_CXX_FLAGS_RELEASE - "${CMAKE_CXX_FLAGS_RELEASE} ${LL_CXX_FLAGS} /O2 /Zi /MD /MP /Ob2" + "${CMAKE_CXX_FLAGS_RELEASE} ${LL_CXX_FLAGS} /O2 /Zi /MD /MP /Ob2 -D_SECURE_STL=0 -D_HAS_ITERATOR_DEBUGGING=0" CACHE STRING "C++ compiler release options" FORCE) set(CMAKE_CXX_STANDARD_LIBRARIES "") @@ -59,18 +59,9 @@ if (WINDOWS) /Zc:forScope /nologo /Oy- - ) - - if(MSVC) - set(CMAKE_CXX_FLAGS_RELEASE - "${CMAKE_CXX_FLAGS_RELEASE} -D_SECURE_STL=0 -D_HAS_ITERATOR_DEBUGGING=0" - CACHE STRING "C++ compiler release options" FORCE) - - add_definitions( /Zc:wchar_t- ) - endif (MSVC) - + # Are we using the crummy Visual Studio KDU build workaround? if (NOT VS_DISABLE_FATAL_WARNINGS) add_definitions(/WX) -- cgit v1.3 From f05f2412b2d193b4c767fd30e1e1ef1a3dd404c8 Mon Sep 17 00:00:00 2001 From: Alain Linden Date: Mon, 31 Jan 2011 12:31:36 -0800 Subject: patches to use new jsoncpp lib on windows --- autobuild.xml | 8 ++++---- indra/cmake/JsonCpp.cmake | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'indra/cmake') diff --git a/autobuild.xml b/autobuild.xml index 25c598362c..dc6ccc2817 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -704,9 +704,9 @@ archive hash - 506c870d37b3f7696171e4180c8bf821 + 320972cefe728e668b0dc6356eeda58f url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/google_breakpad-0.0.0-rev599-windows-20110119.tar.bz2 + scp:install-packages.lindenlab.com:/local/www/install-packages/doc/google_breakpad-0.0.0-rev599-windows-20110128.tar.bz2 name windows @@ -908,9 +908,9 @@ archive hash - ac06a8981cf7df3522362850ffb3a531 + 53f1e3ff386daa25ff1e88df4b5c6941 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jsoncpp-svn-r69-windows-20101011.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jsoncpp-0.5.0-windows-20110131.tar.bz2 name windows diff --git a/indra/cmake/JsonCpp.cmake b/indra/cmake/JsonCpp.cmake index 7dd565be7c..5d571e734a 100644 --- a/indra/cmake/JsonCpp.cmake +++ b/indra/cmake/JsonCpp.cmake @@ -11,8 +11,8 @@ else (STANDALONE) use_prebuilt_binary(jsoncpp) if (WINDOWS) set(JSONCPP_LIBRARIES - debug json_vc80d - optimized json_vc80) +# debug json_vc100_libmt + optimized json_vc100_libmt) elseif (DARWIN) set(JSONCPP_LIBRARIES json_mac-universal-gcc_libmt) elseif (LINUX) -- cgit v1.3 From d9a0a04af4d48d8f1e8ef6e70d3d0863689071bd Mon Sep 17 00:00:00 2001 From: Alain Linden Date: Mon, 31 Jan 2011 12:54:57 -0800 Subject: find latest DirectX dirs. --- indra/cmake/DirectX.cmake | 2 ++ indra/llwindow/CMakeLists.txt | 1 + 2 files changed, 3 insertions(+) (limited to 'indra/cmake') diff --git a/indra/cmake/DirectX.cmake b/indra/cmake/DirectX.cmake index 29724ee2fc..b2a18805d4 100644 --- a/indra/cmake/DirectX.cmake +++ b/indra/cmake/DirectX.cmake @@ -3,6 +3,7 @@ if (VIEWER AND WINDOWS) find_path(DIRECTX_INCLUDE_DIR dxdiag.h "$ENV{DXSDK_DIR}/Include" + "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (August 2009)/Include" "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (March 2009)/Include" "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (August 2008)/Include" "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (June 2008)/Include" @@ -24,6 +25,7 @@ if (VIEWER AND WINDOWS) find_path(DIRECTX_LIBRARY_DIR dxguid.lib "$ENV{DXSDK_DIR}/Lib/x86" + "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (August 2009)/Lib/x86" "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (March 2009)/Lib/x86" "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (August 2008)/Lib/x86" "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (June 2008)/Lib/x86" diff --git a/indra/llwindow/CMakeLists.txt b/indra/llwindow/CMakeLists.txt index 4d2677fd91..9d174ef1cd 100644 --- a/indra/llwindow/CMakeLists.txt +++ b/indra/llwindow/CMakeLists.txt @@ -30,6 +30,7 @@ include_directories( ${LLVFS_INCLUDE_DIRS} ${LLWINDOW_INCLUDE_DIRS} ${LLXML_INCLUDE_DIRS} + ${DIRECTX_INCLUDE_DIR} ) set(llwindow_SOURCE_FILES -- cgit v1.3 From 8adcaa147de9e8dabaf6e64fbd8af0ccc61c4519 Mon Sep 17 00:00:00 2001 From: "Andrew A. de Laix" Date: Mon, 31 Jan 2011 15:19:49 -0800 Subject: update mac and linux json libs. --- autobuild.xml | 8 ++++---- indra/cmake/JsonCpp.cmake | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'indra/cmake') diff --git a/autobuild.xml b/autobuild.xml index dc6ccc2817..28e5f23217 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -884,9 +884,9 @@ archive hash - c10c28118c578d0674c1fbe59002d0ab + de8b96120c274e052abb4f692861be46 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jsoncpp-svn-r69-darwin-20101004.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-jsoncpp/rev/220079/arch/Darwin/installer/jsoncpp-0.5.0-darwin-20110131.tar.bz2 name darwin @@ -896,9 +896,9 @@ archive hash - 7e6b2fc7ad4e12d94d01cc49c22c6f67 + db7826354e60fb4ae14bf40258c088af url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jsoncpp-svn-r69-linux-20101013.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-jsoncpp/rev/220079/arch/Linux/installer/jsoncpp-0.5.0-linux-20110131.tar.bz2 name linux diff --git a/indra/cmake/JsonCpp.cmake b/indra/cmake/JsonCpp.cmake index 5d571e734a..d878f70a17 100644 --- a/indra/cmake/JsonCpp.cmake +++ b/indra/cmake/JsonCpp.cmake @@ -14,9 +14,9 @@ else (STANDALONE) # debug json_vc100_libmt optimized json_vc100_libmt) elseif (DARWIN) - set(JSONCPP_LIBRARIES json_mac-universal-gcc_libmt) + set(JSONCPP_LIBRARIES libjson_linux-gcc-4.0.1_libmt) elseif (LINUX) - set(JSONCPP_LIBRARIES jsoncpp) + set(JSONCPP_LIBRARIES libjson_linux-gcc-4.3.2_libmt) endif (WINDOWS) set(JSONCPP_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/jsoncpp) endif (STANDALONE) -- cgit v1.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. --- autobuild.xml | 4 ++-- indra/cmake/JsonCpp.cmake | 2 +- indra/newview/lltranslate.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'indra/cmake') diff --git a/autobuild.xml b/autobuild.xml index dc6ccc2817..60ba91d89a 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -908,9 +908,9 @@ archive hash - 53f1e3ff386daa25ff1e88df4b5c6941 + a668a4ddfe20a078d720d7a4fca205bd url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jsoncpp-0.5.0-windows-20110131.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jsoncpp-0.5.0-windows-20110131a.tar.bz2 name windows diff --git a/indra/cmake/JsonCpp.cmake b/indra/cmake/JsonCpp.cmake index 5d571e734a..27cb22024e 100644 --- a/indra/cmake/JsonCpp.cmake +++ b/indra/cmake/JsonCpp.cmake @@ -18,5 +18,5 @@ else (STANDALONE) elseif (LINUX) set(JSONCPP_LIBRARIES jsoncpp) endif (WINDOWS) - set(JSONCPP_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/jsoncpp) + set(JSONCPP_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/json) endif (STANDALONE) 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.3 From cbffa57351cdbdd189cf8251fdab0b62690fa33a Mon Sep 17 00:00:00 2001 From: Alain Linden Date: Fri, 4 Feb 2011 12:52:36 -0800 Subject: fix linking to llqtwebkit. --- autobuild.xml | 34 ++++++++++++++++++++++++----- indra/cmake/WebKitLibPlugin.cmake | 1 + indra/llcommon/tests/llsdserialize_test.cpp | 2 +- 3 files changed, 31 insertions(+), 6 deletions(-) (limited to 'indra/cmake') diff --git a/autobuild.xml b/autobuild.xml index f8b03b3b75..2f9048cb44 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -606,9 +606,9 @@ archive hash - 1135a4afc4328c68368f550ede28b4dd + ba33d49b86528e1897b9857f245176fb url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glui-2.3.6-windows-freeglut-20101001b.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs//glui-2.36-windows-20110203.tar.bz2 name windows @@ -1066,7 +1066,7 @@ license lgpl license_file - LICENSES/llqtwebkit.txt + LICENSES/LLQTWEBKIT_LICENSE.txt name llqtwebkit platforms @@ -1100,9 +1100,9 @@ archive hash - 77889b3d6aae9419ee973b326337738b + 5744e07b1b775afd259f3916a436c54c url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-4.7.1-windows-20110127a.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-4.7.1-windows-20110204.tar.bz2 name windows @@ -1389,6 +1389,30 @@ + qt + + license + LGPL + license_file + LICENSES/qt.txt + name + qt + platforms + + windows + + archive + + hash + 5ebf518be8ca8913265d791096e21445 + url + file:///cygwin/home/Alain/projects/qt/qt-4.7.1-windows-20110203.tar.bz2 + + name + windows + + + quicktime license diff --git a/indra/cmake/WebKitLibPlugin.cmake b/indra/cmake/WebKitLibPlugin.cmake index 1f5b0f5d84..1cc02c1cac 100644 --- a/indra/cmake/WebKitLibPlugin.cmake +++ b/indra/cmake/WebKitLibPlugin.cmake @@ -35,6 +35,7 @@ else (STANDALONE) endif (STANDALONE) if (WINDOWS) + use_prebuilt_binary(qt) set(WEBKIT_PLUGIN_LIBRARIES debug llqtwebkitd debug QtWebKitd4 diff --git a/indra/llcommon/tests/llsdserialize_test.cpp b/indra/llcommon/tests/llsdserialize_test.cpp index 770443da1d..7b4c7d6a48 100644 --- a/indra/llcommon/tests/llsdserialize_test.cpp +++ b/indra/llcommon/tests/llsdserialize_test.cpp @@ -452,7 +452,7 @@ namespace tut checkRoundTrip(msg + " nested arrays", v); v = LLSD::emptyMap(); - fillmap(v, 10, 6); // 10^6 maps + fillmap(v, 10, 3); // 10^6 maps checkRoundTrip(msg + " many nested maps", v); } -- cgit v1.3 From 66612d334d85c545f43b649adf3e3ffc89185edb Mon Sep 17 00:00:00 2001 From: Alain Linden Date: Mon, 7 Feb 2011 12:56:30 -0800 Subject: there is no mt for vs2010 --- indra/cmake/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/cmake') diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt index 3c7ae50df1..9ef49db07d 100644 --- a/indra/cmake/CMakeLists.txt +++ b/indra/cmake/CMakeLists.txt @@ -29,7 +29,8 @@ set(cmake_SOURCE_FILES FindFMOD.cmake FindGooglePerfTools.cmake FindMono.cmake - FindMT.cmake +# MT deprecated in VS2010 +# FindMT.cmake FindMySQL.cmake FindOpenJPEG.cmake FindXmlRpcEpi.cmake -- cgit v1.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. --- autobuild.xml | 4 +-- indra/cmake/Copy3rdPartyLibs.cmake | 56 ++++++++++++++++++++++++++++++++++++++ indra/newview/viewer_manifest.py | 28 +++++++++++-------- 3 files changed, 74 insertions(+), 14 deletions(-) (limited to 'indra/cmake') diff --git a/autobuild.xml b/autobuild.xml index 72bdefa61b..237ea4ad8d 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1404,9 +1404,9 @@ archive hash - d2c2377438d96a2635ea08fda243f8ab + ad536aebb28e578164f58e3f7b53bbb1 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-qt/rev/220364/arch/CYGWIN/installer/qt-4.7.1-windows-20110204.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-qt/rev/220494/arch/CYGWIN/installer/qt-4.7.1-windows-20110207.tar.bz2 name windows diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 1f6fe6fedf..938cec3800 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -119,6 +119,62 @@ if (MSVC80) set(third_party_targets ${third_party_targets} ${out_targets}) endif (EXISTS ${release_msvc8_redist_path}) +elseif (MSVC_VERSION EQUAL 1600) # VisualStudio 2010 + FIND_PATH(debug_msvc10_redist_path msvcr100d.dll + PATHS + ${MSVC_DEBUG_REDIST_PATH} + [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\10.0\\Setup\\VC;ProductDir]/redist/Debug_NonRedist/x86/Microsoft.VC100.DebugCRT + NO_DEFAULT_PATH + NO_DEFAULT_PATH + ) + + if(EXISTS ${debug_msvc10_redist_path}) + set(debug_msvc10_files + msvcr100d.dll + msvcp100d.dll + ) + + copy_if_different( + ${debug_msvc10_redist_path} + "${SHARED_LIB_STAGING_DIR_DEBUG}" + out_targets + ${debug_msvc10_files} + ) + set(third_party_targets ${third_party_targets} ${out_targets}) + + endif () + + FIND_PATH(release_msvc10_redist_path msvcr100.dll + PATHS + ${MSVC_REDIST_PATH} + [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\10.0\\Setup\\VC;ProductDir]/redist/x86/Microsoft.VC100.CRT + NO_DEFAULT_PATH + NO_DEFAULT_PATH + ) + + if(EXISTS ${release_msvc10_redist_path}) + set(release_msvc10_files + msvcr100.dll + msvcp100.dll + ) + + copy_if_different( + ${release_msvc10_redist_path} + "${SHARED_LIB_STAGING_DIR_RELEASE}" + out_targets + ${release_msvc10_files} + ) + set(third_party_targets ${third_party_targets} ${out_targets}) + + copy_if_different( + ${release_msvc10_redist_path} + "${SHARED_LIB_STAGING_DIR_RELWITHDEBINFO}" + out_targets + ${release_msvc10_files} + ) + set(third_party_targets ${third_party_targets} ${out_targets}) + + endif () endif (MSVC80) elseif(DARWIN) 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.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/cmake/Copy3rdPartyLibs.cmake | 4 ++++ indra/newview/CMakeLists.txt | 2 +- indra/newview/viewer_manifest.py | 16 ++++++++++------ 3 files changed, 15 insertions(+), 7 deletions(-) (limited to 'indra/cmake') diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 938cec3800..0c65229afc 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -37,6 +37,8 @@ if(WINDOWS) libapr-1.dll libaprutil-1.dll libapriconv-1.dll + ssleay32.dll + libeay32.dll ) set(release_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}") @@ -46,6 +48,8 @@ if(WINDOWS) libaprutil-1.dll libapriconv-1.dll dbghelp.dll + ssleay32.dll + libeay32.dll ) if(USE_GOOGLE_PERFTOOLS) 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.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. --- autobuild.xml | 34 +++++----------------------------- indra/cmake/JsonCpp.cmake | 2 +- indra/cmake/WebKitLibPlugin.cmake | 1 - indra/newview/CMakeLists.txt | 15 ++++++--------- indra/newview/viewer_manifest.py | 2 +- 5 files changed, 13 insertions(+), 41 deletions(-) (limited to 'indra/cmake') diff --git a/autobuild.xml b/autobuild.xml index 237ea4ad8d..eaf976ff8f 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -908,9 +908,9 @@ archive hash - a668a4ddfe20a078d720d7a4fca205bd + afff2018e6a887c281b072eecdd9343e url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jsoncpp-0.5.0-windows-20110131a.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-jsoncpp/rev/220579/arch/CYGWIN/installer/jsoncpp-0.5.0-windows-20110208.tar.bz2 name windows @@ -1066,7 +1066,7 @@ license lgpl license_file - LICENSES/LLQTWEBKIT_LICENSE.txt + LICENSES/llqtwebkit.txt name llqtwebkit platforms @@ -1100,9 +1100,9 @@ archive hash - 5744e07b1b775afd259f3916a436c54c + 7865b9c3a5d9f9424af56d5d05b82de9 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-4.7.1-windows-20110204.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/alain_llqtwebkit/rev/220864/arch/CYGWIN/installer/llqtwebkit-4.7.1-windows-20110210.tar.bz2 name windows @@ -1389,30 +1389,6 @@ - qt - - license - LGPL - license_file - LICENSES/qt.txt - name - qt - platforms - - windows - - archive - - hash - ad536aebb28e578164f58e3f7b53bbb1 - url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-qt/rev/220494/arch/CYGWIN/installer/qt-4.7.1-windows-20110207.tar.bz2 - - name - windows - - - quicktime license diff --git a/indra/cmake/JsonCpp.cmake b/indra/cmake/JsonCpp.cmake index 4a129d7115..5e6672ecd4 100644 --- a/indra/cmake/JsonCpp.cmake +++ b/indra/cmake/JsonCpp.cmake @@ -11,7 +11,7 @@ else (STANDALONE) use_prebuilt_binary(jsoncpp) if (WINDOWS) set(JSONCPP_LIBRARIES -# debug json_vc100_libmt + debug json_vc100debug_libmt.lib optimized json_vc100_libmt) elseif (DARWIN) set(JSONCPP_LIBRARIES libjson_linux-gcc-4.0.1_libmt) diff --git a/indra/cmake/WebKitLibPlugin.cmake b/indra/cmake/WebKitLibPlugin.cmake index 1cc02c1cac..1f5b0f5d84 100644 --- a/indra/cmake/WebKitLibPlugin.cmake +++ b/indra/cmake/WebKitLibPlugin.cmake @@ -35,7 +35,6 @@ else (STANDALONE) endif (STANDALONE) if (WINDOWS) - use_prebuilt_binary(qt) set(WEBKIT_PLUGIN_LIBRARIES debug llqtwebkitd debug QtWebKitd4 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.3 From faecf0fe9ac5f15f8364211b095e00a27811dab7 Mon Sep 17 00:00:00 2001 From: Alain Linden Date: Wed, 16 Feb 2011 15:56:31 -0800 Subject: for now, turn off precompiled header usage by default (so Incredibuild will work). --- indra/cmake/Variables.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/cmake') diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake index 88cfdfc0b9..ed5e2dee2d 100644 --- a/indra/cmake/Variables.cmake +++ b/indra/cmake/Variables.cmake @@ -148,7 +148,7 @@ For more information, please see JIRA DEV-14943 - Cmake Linux cannot build both endif (LINUX AND SERVER AND VIEWER) -set(USE_PRECOMPILED_HEADERS ON CACHE BOOL "Enable use of precompiled header directives where supported.") +set(USE_PRECOMPILED_HEADERS OFF CACHE BOOL "Enable use of precompiled header directives where supported.") source_group("CMake Rules" FILES CMakeLists.txt) -- cgit v1.3 From ae1435e8ee63a7d0e6ada77303eb01802580ec8e Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Thu, 17 Feb 2011 21:13:48 -0800 Subject: Autobuild: fix for Mac build using XCode --- indra/cmake/JsonCpp.cmake | 2 +- indra/llcommon/tests/llerror_test.cpp | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'indra/cmake') diff --git a/indra/cmake/JsonCpp.cmake b/indra/cmake/JsonCpp.cmake index 5e6672ecd4..96488360a4 100644 --- a/indra/cmake/JsonCpp.cmake +++ b/indra/cmake/JsonCpp.cmake @@ -14,7 +14,7 @@ else (STANDALONE) debug json_vc100debug_libmt.lib optimized json_vc100_libmt) elseif (DARWIN) - set(JSONCPP_LIBRARIES libjson_linux-gcc-4.0.1_libmt) + set(JSONCPP_LIBRARIES libjson_linux-gcc-4.0.1_libmt.a) elseif (LINUX) set(JSONCPP_LIBRARIES libjson_linux-gcc-4.3.2_libmt) endif (WINDOWS) diff --git a/indra/llcommon/tests/llerror_test.cpp b/indra/llcommon/tests/llerror_test.cpp index 1ef8fc9712..09a20231de 100644 --- a/indra/llcommon/tests/llerror_test.cpp +++ b/indra/llcommon/tests/llerror_test.cpp @@ -48,7 +48,10 @@ namespace { static bool fatalWasCalled; void fatalCall(const std::string&) { fatalWasCalled = true; } +} +namespace tut +{ class TestRecorder : public LLError::Recorder { public: @@ -56,7 +59,7 @@ namespace ~TestRecorder() { LLError::removeRecorder(this); } void recordMessage(LLError::ELevel level, - const std::string& message) + const std::string& message) { mMessages.push_back(message); } @@ -66,12 +69,12 @@ namespace void setWantsTime(bool t) { mWantsTime = t; } bool wantsTime() { return mWantsTime; } - + std::string message(int n) { std::ostringstream test_name; test_name << "testing message " << n << ", not enough messages"; - + tut::ensure(test_name.str(), n < countMessages()); return mMessages[n]; } @@ -82,10 +85,7 @@ namespace bool mWantsTime; }; -} - -namespace tut -{ + struct ErrorTestData { TestRecorder mRecorder; @@ -381,7 +381,7 @@ namespace } typedef std::string (*LogFromFunction)(bool); - void testLogName(TestRecorder& recorder, LogFromFunction f, + void testLogName(tut::TestRecorder& recorder, LogFromFunction f, const std::string& class_name = "") { recorder.clearMessages(); -- cgit v1.3 From 531de7491b0e73031538dbb9f5dc0dbea8e5f8e2 Mon Sep 17 00:00:00 2001 From: squire Date: Mon, 21 Feb 2011 18:57:54 -0800 Subject: Changes windows build and PNG cmake to reflect latests libpng builds --- autobuild.xml | 4 ++-- indra/cmake/PNG.cmake | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'indra/cmake') diff --git a/autobuild.xml b/autobuild.xml index 4518ef06ec..f319f9d852 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1004,9 +1004,9 @@ archive hash - dd0e68bde099def37c6a7527673aa672 + 735a955e6442733e2342ab12c1087488 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libpng-1.2.35-windows-20101001a.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-libpng/rev/221747/arch/CYGWIN/installer/libpng-1.5.1-windows-20110221.tar.bz2 name windows diff --git a/indra/cmake/PNG.cmake b/indra/cmake/PNG.cmake index f6522d9e2f..33fc3e5bac 100644 --- a/indra/cmake/PNG.cmake +++ b/indra/cmake/PNG.cmake @@ -8,6 +8,6 @@ if (STANDALONE) include(FindPNG) else (STANDALONE) use_prebuilt_binary(libpng) - set(PNG_LIBRARIES png12) - set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng12) + set(PNG_LIBRARIES libpng15) + set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng15) endif (STANDALONE) -- cgit v1.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. --- autobuild.xml | 6 +++--- indra/cmake/XmlRpcEpi.cmake | 5 ++++- indra/newview/CMakeLists.txt | 2 ++ 3 files changed, 9 insertions(+), 4 deletions(-) (limited to 'indra/cmake') diff --git a/autobuild.xml b/autobuild.xml index c030ee1117..9b670e5875 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1478,7 +1478,7 @@ license xmlrpc-epi license_file - LICENSES/xmlrpc.txt + LICENSES/xmlrpc-epi.txt name xmlrpc-epi platforms @@ -1512,9 +1512,9 @@ archive hash - ea06e2f1c1ed59a2d2b6cdb6f459d1c0 + 5181d1a8f2516928ac064d72acf164a4 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/xmlrpc-epi-0.51-windows-20101001a.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-xmlrpc-epi/rev/222021/arch/CYGWIN/installer/xmlrpc_epi-0.54.1-windows-20110224.tar.bz2 name windows diff --git a/indra/cmake/XmlRpcEpi.cmake b/indra/cmake/XmlRpcEpi.cmake index 107d1926ba..5bd4848245 100644 --- a/indra/cmake/XmlRpcEpi.cmake +++ b/indra/cmake/XmlRpcEpi.cmake @@ -9,7 +9,10 @@ if (STANDALONE) else (STANDALONE) use_prebuilt_binary(xmlrpc-epi) if (WINDOWS) - set(XMLRPCEPI_LIBRARIES xmlrpcepi) + set(XMLRPCEPI_LIBRARIES + debug xmlrpc-epid + optimized xmlrpc-epi + ) else (WINDOWS) set(XMLRPCEPI_LIBRARIES xmlrpc-epi) endif (WINDOWS) 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.3 From eb3de8543e5580cb353230577f9f6606e71002f2 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Thu, 24 Feb 2011 20:57:34 -0800 Subject: STORM-1023 (was OPEN-4) and STORM-1022 (was OPEN-24) : fmod and kdu changes : cmake changes making possible to use Findxxx when INSTALL_PROPRIETARY is OFF and STANDALONE is OFF too, simplify cmake scripts around INSTALL_PROPRIETARY, add fmodex to FindFMOD --- indra/cmake/FMOD.cmake | 25 +++++++++++++++---------- indra/cmake/FindFMOD.cmake | 2 +- indra/cmake/LLKDU.cmake | 11 ++++++----- indra/cmake/Prebuilt.cmake | 45 ++++++++++++++------------------------------- 4 files changed, 36 insertions(+), 47 deletions(-) (limited to 'indra/cmake') diff --git a/indra/cmake/FMOD.cmake b/indra/cmake/FMOD.cmake index dcf44cd642..6a4322df9b 100644 --- a/indra/cmake/FMOD.cmake +++ b/indra/cmake/FMOD.cmake @@ -1,17 +1,23 @@ # -*- cmake -*- -set(FMOD ON CACHE BOOL "Use FMOD sound library.") +# FMOD can be set when launching the make using the argument -DFMOD:BOOL=ON +# When building using proprietary binaries though (i.e. having access to LL private servers), +# we always build with FMOD. +# Open source devs should use the -DFMOD:BOOL=ON then if they want to build with FMOD, whether +# they are using STANDALONE or not. +if (INSTALL_PROPRIETARY) + set(FMOD ON CACHE BOOL "Use FMOD sound library.") +endif (INSTALL_PROPRIETARY) if (FMOD) - if (STANDALONE) + if (NOT INSTALL_PROPRIETARY) + # This cover the STANDALONE case and the NOT STANDALONE but not using proprietary libraries + # This should then be invoke by all open source devs outside LL set(FMOD_FIND_REQUIRED ON) include(FindFMOD) - else (STANDALONE) - if (INSTALL_PROPRIETARY) - include(Prebuilt) - use_prebuilt_binary(fmod) - endif (INSTALL_PROPRIETARY) - + else (NOT INSTALL_PROPRIETARY) + include(Prebuilt) + use_prebuilt_binary(fmod) if (WINDOWS) set(FMOD_LIBRARY fmod) elseif (DARWIN) @@ -19,8 +25,7 @@ if (FMOD) elseif (LINUX) set(FMOD_LIBRARY fmod-3.75) endif (WINDOWS) - SET(FMOD_LIBRARIES ${FMOD_LIBRARY}) set(FMOD_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include) - endif (STANDALONE) + endif (NOT INSTALL_PROPRIETARY) endif (FMOD) diff --git a/indra/cmake/FindFMOD.cmake b/indra/cmake/FindFMOD.cmake index e60b386027..1ebbc8c96e 100644 --- a/indra/cmake/FindFMOD.cmake +++ b/indra/cmake/FindFMOD.cmake @@ -11,7 +11,7 @@ FIND_PATH(FMOD_INCLUDE_DIR fmod.h PATH_SUFFIXES fmod) -SET(FMOD_NAMES ${FMOD_NAMES} fmod fmodvc fmod-3.75) +SET(FMOD_NAMES ${FMOD_NAMES} fmod fmodvc fmodex fmod-3.75) FIND_LIBRARY(FMOD_LIBRARY NAMES ${FMOD_NAMES} PATH_SUFFIXES fmod diff --git a/indra/cmake/LLKDU.cmake b/indra/cmake/LLKDU.cmake index 13c2b86e2f..e478b01f84 100644 --- a/indra/cmake/LLKDU.cmake +++ b/indra/cmake/LLKDU.cmake @@ -1,13 +1,14 @@ # -*- cmake -*- -include(Prebuilt) # USE_KDU can be set when launching cmake as an option using the argument -DUSE_KDU:BOOL=ON -# When building using proprietary binaries though (i.e. having access to LL private servers), we always build with KDU -if (INSTALL_PROPRIETARY AND NOT STANDALONE) - set(USE_KDU ON) -endif (INSTALL_PROPRIETARY AND NOT STANDALONE) +# When building using proprietary binaries though (i.e. having access to LL private servers), +# we always build with KDU +if (INSTALL_PROPRIETARY) + set(USE_KDU ON CACHE BOOL "Use Kakadu library.") +endif (INSTALL_PROPRIETARY) if (USE_KDU) + include(Prebuilt) use_prebuilt_binary(kdu) if (WINDOWS) set(KDU_LIBRARY kdu.lib) diff --git a/indra/cmake/Prebuilt.cmake b/indra/cmake/Prebuilt.cmake index 9b758b03f0..1b60d176f1 100644 --- a/indra/cmake/Prebuilt.cmake +++ b/indra/cmake/Prebuilt.cmake @@ -11,38 +11,21 @@ macro (use_prebuilt_binary _binary) if(${CMAKE_BINARY_DIR}/temp/sentinel_installed IS_NEWER_THAN ${CMAKE_BINARY_DIR}/temp/${_binary}_installed) if(INSTALL_PROPRIETARY) include(FindSCP) - if(DEBUG_PREBUILT) - message("cd ${CMAKE_SOURCE_DIR} && ${AUTOBUILD_EXECUTABLE} install - --install-dir=${AUTOBUILD_INSTALL_DIR} - #--scp="${SCP_EXECUTABLE}" - --skip-license-check - ${_binary} ") - endif(DEBUG_PREBUILT) - execute_process(COMMAND "${AUTOBUILD_EXECUTABLE}" - install - --install-dir=${AUTOBUILD_INSTALL_DIR} - #--scp="${SCP_EXECUTABLE}" - --skip-license-check - ${_binary} - WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" - RESULT_VARIABLE ${_binary}_installed - ) - else(INSTALL_PROPRIETARY) - if(DEBUG_PREBUILT) - message("cd ${CMAKE_SOURCE_DIR} && ${AUTOBUILD_EXECUTABLE} install - --install-dir=${AUTOBUILD_INSTALL_DIR} - --skip-license-check - ${_binary} ") - endif(DEBUG_PREBUILT) - execute_process(COMMAND "${AUTOBUILD_EXECUTABLE}" - install - --install-dir=${AUTOBUILD_INSTALL_DIR} - --skip-license-check - ${_binary} - WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" - RESULT_VARIABLE ${_binary}_installed - ) endif(INSTALL_PROPRIETARY) + if(DEBUG_PREBUILT) + message("cd ${CMAKE_SOURCE_DIR} && ${AUTOBUILD_EXECUTABLE} install + --install-dir=${AUTOBUILD_INSTALL_DIR} + --skip-license-check + ${_binary} ") + endif(DEBUG_PREBUILT) + execute_process(COMMAND "${AUTOBUILD_EXECUTABLE}" + install + --install-dir=${AUTOBUILD_INSTALL_DIR} + --skip-license-check + ${_binary} + WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" + RESULT_VARIABLE ${_binary}_installed + ) file(WRITE ${CMAKE_BINARY_DIR}/temp/${_binary}_installed "${${_binary}_installed}") else(${CMAKE_BINARY_DIR}/temp/sentinel_installed IS_NEWER_THAN ${CMAKE_BINARY_DIR}/temp/${_binary}_installed) set(${_binary}_installed 0) -- cgit v1.3 From c5aaefe37f9d7e894076dae26245a3d87f74d0ff Mon Sep 17 00:00:00 2001 From: "Andrew A. de Laix" Date: Tue, 1 Mar 2011 13:13:05 -0800 Subject: fix some mac build problems with library name changes with new packaages. --- indra/cmake/CARes.cmake | 5 +---- indra/cmake/JPEG.cmake | 5 +---- indra/cmake/PNG.cmake | 9 +++++++-- 3 files changed, 9 insertions(+), 10 deletions(-) (limited to 'indra/cmake') diff --git a/indra/cmake/CARes.cmake b/indra/cmake/CARes.cmake index 1850b706ac..b0dac5b12f 100644 --- a/indra/cmake/CARes.cmake +++ b/indra/cmake/CARes.cmake @@ -13,10 +13,7 @@ else (STANDALONE) if (WINDOWS) set(CARES_LIBRARIES areslib) elseif (DARWIN) - set(CARES_LIBRARIES - optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libcares.a - debug ${ARCH_PREBUILT_DIRS_DEBUG}/libcares.a - ) + set(CARES_LIBRARIES cares) else (WINDOWS) set(CARES_LIBRARIES cares) endif (WINDOWS) diff --git a/indra/cmake/JPEG.cmake b/indra/cmake/JPEG.cmake index 9514d59f64..0f0bbb9564 100644 --- a/indra/cmake/JPEG.cmake +++ b/indra/cmake/JPEG.cmake @@ -12,10 +12,7 @@ else (STANDALONE) if (LINUX) set(JPEG_LIBRARIES jpeg) elseif (DARWIN) - set(JPEG_LIBRARIES - optimized ${ARCH_PREBUILT_DIRS_RELEASE}/liblljpeg.a - debug ${ARCH_PREBUILT_DIRS_DEBUG}/liblljpeg.a - ) + set(JPEG_LIBRARIES lljpeg) elseif (WINDOWS) set(JPEG_LIBRARIES jpeglib) endif (LINUX) diff --git a/indra/cmake/PNG.cmake b/indra/cmake/PNG.cmake index 33fc3e5bac..86b7267494 100644 --- a/indra/cmake/PNG.cmake +++ b/indra/cmake/PNG.cmake @@ -8,6 +8,11 @@ if (STANDALONE) include(FindPNG) else (STANDALONE) use_prebuilt_binary(libpng) - set(PNG_LIBRARIES libpng15) - set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng15) + if (WINDOWS) + set(PNG_LIBRARIES libpng15) + set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng15) + else() + set(PNG_LIBRARIES png12) + set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng12) + endif() endif (STANDALONE) -- cgit v1.3 From 88f507f9ccae33a3fa9b3706a96af5c87db804b5 Mon Sep 17 00:00:00 2001 From: Alain Linden Date: Tue, 1 Mar 2011 15:32:35 -0800 Subject: fixes to get openal working on windows. --- autobuild.xml | 12 ++++++++++++ indra/cmake/OPENAL.cmake | 14 +++++++++++--- indra/llaudio/llaudioengine_openal.cpp | 2 ++ indra/llaudio/llaudioengine_openal.h | 2 +- 4 files changed, 26 insertions(+), 4 deletions(-) (limited to 'indra/cmake') diff --git a/autobuild.xml b/autobuild.xml index 8dd2f91718..819bc27c1e 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1301,6 +1301,18 @@ name linux + windows + + archive + + hash + 04df406f3e5d04cf176660bdac66c3a1 + url + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-openal/rev/222391/arch/CYGWIN/installer/openal-1.12.854-1.1.0-windows-20110301.tar.bz2 + + name + windows + version 3ad86a1c diff --git a/indra/cmake/OPENAL.cmake b/indra/cmake/OPENAL.cmake index ed483e5aea..a3e1fb924e 100644 --- a/indra/cmake/OPENAL.cmake +++ b/indra/cmake/OPENAL.cmake @@ -9,6 +9,7 @@ else (LINUX) endif (LINUX) if (OPENAL) + set(OPENAL_LIB_INCLUDE_DIRS "${LIBS_PREBUILT_DIR}/include/AL") if (STANDALONE) include(FindPkgConfig) include(FindOpenAL) @@ -17,10 +18,17 @@ if (OPENAL) else (STANDALONE) use_prebuilt_binary(openal_soft) endif (STANDALONE) - set(OPENAL_LIBRARIES - openal - alut + if(WINDOWS) + set(OPENAL_LIBRARIES + OpenAL32 + alut ) + else() + set(OPENAL_LIBRARIES + openal + alut + ) + endif() endif (OPENAL) if (OPENAL) diff --git a/indra/llaudio/llaudioengine_openal.cpp b/indra/llaudio/llaudioengine_openal.cpp index e352045291..34a057dcc0 100644 --- a/indra/llaudio/llaudioengine_openal.cpp +++ b/indra/llaudio/llaudioengine_openal.cpp @@ -32,6 +32,8 @@ #include "lllistener_openal.h" +const float LLAudioEngine_OpenAL::WIND_BUFFER_SIZE_SEC = 0.05f; + LLAudioEngine_OpenAL::LLAudioEngine_OpenAL() : mWindGen(NULL), diff --git a/indra/llaudio/llaudioengine_openal.h b/indra/llaudio/llaudioengine_openal.h index 258febb1a8..6639d9dfe6 100644 --- a/indra/llaudio/llaudioengine_openal.h +++ b/indra/llaudio/llaudioengine_openal.h @@ -67,7 +67,7 @@ class LLAudioEngine_OpenAL : public LLAudioEngine int mNumEmptyWindALBuffers; static const int MAX_NUM_WIND_BUFFERS = 80; - static const float WIND_BUFFER_SIZE_SEC = 0.05f; // 1/20th sec + static const float WIND_BUFFER_SIZE_SEC; // 1/20th sec }; class LLAudioChannelOpenAL : public LLAudioChannel -- cgit v1.3 From 99ba5e2670d04baf641c6d612f253a46f857769e Mon Sep 17 00:00:00 2001 From: Andrew de Laix Date: Wed, 2 Mar 2011 21:28:26 +0000 Subject: revert to old jsoncpp library on linux to fix build. --- autobuild.xml | 4 ++-- indra/cmake/JsonCpp.cmake | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'indra/cmake') diff --git a/autobuild.xml b/autobuild.xml index b522878671..d9bfe77caa 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -896,9 +896,9 @@ archive hash - 20546118096e4828d9f29913ec7d954a + 7e6b2fc7ad4e12d94d01cc49c22c6f67 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-jsoncpp/rev/221698/arch/Linux/installer/jsoncpp-0.5.0-linux-20110219.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jsoncpp-svn-r69-linux-20101013.tar.bz2 name linux diff --git a/indra/cmake/JsonCpp.cmake b/indra/cmake/JsonCpp.cmake index 96488360a4..9024fa92a7 100644 --- a/indra/cmake/JsonCpp.cmake +++ b/indra/cmake/JsonCpp.cmake @@ -16,7 +16,7 @@ else (STANDALONE) elseif (DARWIN) set(JSONCPP_LIBRARIES libjson_linux-gcc-4.0.1_libmt.a) elseif (LINUX) - set(JSONCPP_LIBRARIES libjson_linux-gcc-4.3.2_libmt) + set(JSONCPP_LIBRARIES libjsoncpp.a) endif (WINDOWS) - set(JSONCPP_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/json) + set(JSONCPP_INCLUDE_DIRS "${LIBS_PREBUILT_DIR}/include/jsoncpp" "${LIBS_PREBUILT_DIR}/include/json") endif (STANDALONE) -- cgit v1.3 From 6e97ead181f04c5cb4953e5e3316d7d8caf0a1ec Mon Sep 17 00:00:00 2001 From: Kelly Washington Date: Thu, 3 Mar 2011 12:05:40 -0800 Subject: Add early exit to message template check if it hasn't changed. --- indra/cmake/TemplateCheck.cmake | 6 +++--- scripts/template_verifier.py | 22 +++++++++++++++++++++- 2 files changed, 24 insertions(+), 4 deletions(-) (limited to 'indra/cmake') diff --git a/indra/cmake/TemplateCheck.cmake b/indra/cmake/TemplateCheck.cmake index fa4e387dd5..24805b4214 100644 --- a/indra/cmake/TemplateCheck.cmake +++ b/indra/cmake/TemplateCheck.cmake @@ -5,10 +5,10 @@ include(Python) macro (check_message_template _target) add_custom_command( TARGET ${_target} - POST_BUILD + PRE_LINK COMMAND ${PYTHON_EXECUTABLE} ARGS ${SCRIPTS_DIR}/template_verifier.py - --mode=development --cache_master - COMMENT "Verifying message template" + --mode=development --cache_master ${TEMPLATE_VERIFIER_OPTIONS} + COMMENT "Verifying message template - See http://wiki.secondlife.com/wiki/Template_verifier.py" ) endmacro (check_message_template) diff --git a/scripts/template_verifier.py b/scripts/template_verifier.py index ddb050fbbb..d01750ffc6 100644 --- a/scripts/template_verifier.py +++ b/scripts/template_verifier.py @@ -66,6 +66,7 @@ add_indra_lib_path() import optparse import os import urllib +import hashlib from indra.ipc import compatibility from indra.ipc import tokenstream @@ -233,6 +234,9 @@ http://wiki.secondlife.com/wiki/Template_verifier.py parser.add_option( '-c', '--cache_master', action='store_true', dest='cache_master', default=False, help="""Set to true to attempt use local cached copy of the master template.""") + parser.add_option( + '-f', '--force', action='store_true', dest='force_verification', + default=False, help="""Set to true to skip the sha_1 check and force template verification.""") options, args = parser.parse_args(sysargs) @@ -269,8 +273,18 @@ http://wiki.secondlife.com/wiki/Template_verifier.py print "current:", current_filename current_url = 'file://%s' % current_filename - # retrieve the contents of the local template and check for syntax + # retrieve the contents of the local template current = fetch(current_url) + hexdigest = hashlib.sha1(current).hexdigest() + if not options.force_verification: + # Early exist if the template hasn't changed. + sha_url = "%s.sha1" % current_url + current_sha = fetch(sha_url) + if hexdigest == current_sha: + print "Message template SHA_1 has not changed." + sys.exit(0) + + # and check for syntax current_parsed = llmessage.parseTemplateString(current) if options.cache_master: @@ -301,6 +315,12 @@ http://wiki.secondlife.com/wiki/Template_verifier.py if acceptable: explain("--- PASS ---", compat) + if options.force_verification == False: + print "Updating sha1 to %s" % hexdigest + sha_filename = "%s.sha1" % current_filename + sha_file = open(sha_filename, 'w') + sha_file.write(hexdigest) + sha_file.close() else: explain("*** FAIL ***", compat) return 1 -- cgit v1.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. --- autobuild.xml | 16 ++++++++-------- indra/cmake/APR.cmake | 4 ++-- indra/cmake/Boost.cmake | 10 +++++----- indra/cmake/Copy3rdPartyLibs.cmake | 6 +++--- indra/newview/viewer_manifest.py | 12 ++++++------ 5 files changed, 24 insertions(+), 24 deletions(-) (limited to 'indra/cmake') diff --git a/autobuild.xml b/autobuild.xml index 5851fc3221..17bb0e91ce 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -138,9 +138,9 @@ archive hash - 577e89e72a6df485ee0c42ef7bfd8c34 + e6caaeea16131e1f2343ecd7765e3147 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ares-1.7.1-darwin-20101004.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-ares/rev/220963/arch/Darwin/installer/ares-1.7.1-darwin-20110217.tar.bz2 name darwin @@ -186,9 +186,9 @@ archive hash - 3a8b4bc2ea3dde26c2a7e1481f039864 + d98078791ce345bf6168ce9ba53ca2d7 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-darwin-20101004.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-boost/rev/222752/arch/Darwin/installer/boost-1.45.0-darwin-20110304.tar.bz2 name darwin @@ -354,9 +354,9 @@ archive hash - 594e0d61d115ab06ca11bc84d374d23a + 180e03d0be1f1acfc3244e78742d7bef url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/expat-1.95.8-darwin-20101004.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-expat/rev/221695/arch/Darwin/installer/expat-2.0.1-darwin-20110218.tar.bz2 name darwin @@ -498,9 +498,9 @@ archive hash - 753021e66345612b4fc77c711b426f11 + 3e7e133f1fa61d9acabdf01f5494209e url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/freetype-2.3.9-darwin-20101004.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-freetype/rev/222716/arch/Darwin/installer/freetype-2.4.4-darwin-20110304.tar.bz2 name darwin diff --git a/indra/cmake/APR.cmake b/indra/cmake/APR.cmake index 5b31b0d237..daafa00fe2 100644 --- a/indra/cmake/APR.cmake +++ b/indra/cmake/APR.cmake @@ -32,8 +32,8 @@ else (STANDALONE) ) elseif (DARWIN) if (LLCOMMON_LINK_SHARED) - set(APR_selector "0.3.7.dylib") - set(APRUTIL_selector "0.3.8.dylib") + set(APR_selector "0.dylib") + set(APRUTIL_selector "0.dylib") else (LLCOMMON_LINK_SHARED) set(APR_selector "a") set(APRUTIL_selector "a") diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake index b9c047a764..67dc9f0891 100644 --- a/indra/cmake/Boost.cmake +++ b/indra/cmake/Boost.cmake @@ -50,11 +50,11 @@ else (STANDALONE) debug libboost_filesystem-vc100-mt-gd-${BOOST_VERSION}) endif (MSVC80) elseif (DARWIN) - set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-xgcc40-mt) - set(BOOST_REGEX_LIBRARY boost_regex-xgcc40-mt) - set(BOOST_SIGNALS_LIBRARY boost_signals-xgcc40-mt) - set(BOOST_SYSTEM_LIBRARY boost_system-xgcc40-mt) - set(BOOST_FILESYSTEM_LIBRARY boost_filesystem-xgcc40-mt) + set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options) + set(BOOST_REGEX_LIBRARY boost_regex) +# set(BOOST_SIGNALS_LIBRARY boost_signals) + set(BOOST_SYSTEM_LIBRARY boost_system) + set(BOOST_FILESYSTEM_LIBRARY boost_filesystem) elseif (LINUX) set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-gcc41-mt) set(BOOST_REGEX_LIBRARY boost_regex-gcc41-mt) diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 0c65229afc..43b0347aa9 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -200,11 +200,11 @@ elseif(DARWIN) ) set(release_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}") set(release_files - libapr-1.0.3.7.dylib + libapr-1.0.dylib libapr-1.dylib - libaprutil-1.0.3.8.dylib + libaprutil-1.0.dylib libaprutil-1.dylib - libexpat.0.5.0.dylib + libexpat.1.5.2.dylib libexpat.dylib libllqtwebkit.dylib libndofdev.dylib 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.3 From 4745d124c8d8b4725d8313311d9e8e4b9bf172ee Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Fri, 4 Mar 2011 22:56:15 -0800 Subject: STORM-1023 : allow non standalone and non install prebuilt to use local fmod package path in autobuild.xml --- indra/cmake/FMOD.cmake | 40 ++++++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 16 deletions(-) mode change 100644 => 100755 indra/cmake/FMOD.cmake (limited to 'indra/cmake') diff --git a/indra/cmake/FMOD.cmake b/indra/cmake/FMOD.cmake old mode 100644 new mode 100755 index 6a4322df9b..cb5124812d --- a/indra/cmake/FMOD.cmake +++ b/indra/cmake/FMOD.cmake @@ -10,22 +10,30 @@ if (INSTALL_PROPRIETARY) endif (INSTALL_PROPRIETARY) if (FMOD) - if (NOT INSTALL_PROPRIETARY) - # This cover the STANDALONE case and the NOT STANDALONE but not using proprietary libraries - # This should then be invoke by all open source devs outside LL + if (STANDALONE) + # In that case, we use the version of the library installed on the system set(FMOD_FIND_REQUIRED ON) include(FindFMOD) - else (NOT INSTALL_PROPRIETARY) - include(Prebuilt) - use_prebuilt_binary(fmod) - if (WINDOWS) - set(FMOD_LIBRARY fmod) - elseif (DARWIN) - set(FMOD_LIBRARY fmod) - elseif (LINUX) - set(FMOD_LIBRARY fmod-3.75) - endif (WINDOWS) - SET(FMOD_LIBRARIES ${FMOD_LIBRARY}) - set(FMOD_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include) - endif (NOT INSTALL_PROPRIETARY) + else (STANDALONE) + if (FMOD_LIBRARY AND FMOD_INCLUDE_DIR) + # If the path have been specified in the arguments, use that + set(FMOD_LIBRARIES ${FMOD_LIBRARY}) + MESSAGE(STATUS "Using FMOD path: ${FMOD_LIBRARIES}, ${FMOD_INCLUDE_DIR}") + else (FMOD_LIBRARY AND FMOD_INCLUDE_DIR) + # If not, we're going to try to get the package listed in autobuild.xml + # Note: if you're not using INSTALL_PROPRIETARY, the package URL should be local (file:/// URL) + # as accessing the private LL location will fail if you don't have the credential + include(Prebuilt) + use_prebuilt_binary(fmod) + if (WINDOWS) + set(FMOD_LIBRARY fmod) + elseif (DARWIN) + set(FMOD_LIBRARY fmod) + elseif (LINUX) + set(FMOD_LIBRARY fmod-3.75) + endif (WINDOWS) + set(FMOD_LIBRARIES ${FMOD_LIBRARY}) + set(FMOD_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include) + endif (FMOD_LIBRARY AND FMOD_INCLUDE_DIR) + endif (STANDALONE) endif (FMOD) -- cgit v1.3 From 33927b8451bde10feeda0fc3d3c478b79ef2e0e2 Mon Sep 17 00:00:00 2001 From: "Andrew A. de Laix" Date: Mon, 7 Mar 2011 11:44:51 -0800 Subject: update libpng and jpeglib archives for mac. --- autobuild.xml | 8 ++++---- indra/cmake/JPEG.cmake | 2 +- indra/cmake/PNG.cmake | 3 +++ 3 files changed, 8 insertions(+), 5 deletions(-) (limited to 'indra/cmake') diff --git a/autobuild.xml b/autobuild.xml index f808339a49..37388a8fa4 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -836,9 +836,9 @@ archive hash - d94de5a98492018144b95a8022ed4e44 + 71bd6efbf508e1f2e7d98a6195a93e9e url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jpeglib-6b-darwin-20101004.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-jpeglib/rev/222232/arch/Darwin/installer/jpeglib-8c-darwin-20110228.tar.bz2 name darwin @@ -980,9 +980,9 @@ archive hash - 4aa623811aff42df702e8d3fdd848ac3 + 6fe1adf12d98bce9111f60ee762007b9 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libpng-1.2.35-darwin-20101004.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-libpng/rev/221851/arch/Darwin/installer/libpng-1.5.1-darwin-20110222.tar.bz2 name darwin diff --git a/indra/cmake/JPEG.cmake b/indra/cmake/JPEG.cmake index 0f0bbb9564..4f99efd602 100644 --- a/indra/cmake/JPEG.cmake +++ b/indra/cmake/JPEG.cmake @@ -12,7 +12,7 @@ else (STANDALONE) if (LINUX) set(JPEG_LIBRARIES jpeg) elseif (DARWIN) - set(JPEG_LIBRARIES lljpeg) + set(JPEG_LIBRARIES jpeg) elseif (WINDOWS) set(JPEG_LIBRARIES jpeglib) endif (LINUX) diff --git a/indra/cmake/PNG.cmake b/indra/cmake/PNG.cmake index 86b7267494..60f749869a 100644 --- a/indra/cmake/PNG.cmake +++ b/indra/cmake/PNG.cmake @@ -11,6 +11,9 @@ else (STANDALONE) if (WINDOWS) set(PNG_LIBRARIES libpng15) set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng15) + elseif(DARWIN) + set(PNG_LIBRARIES png15) + set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng15) else() set(PNG_LIBRARIES png12) set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng12) -- cgit v1.3 From d9715317b17152c445f6c5933fbeb2c1e0900bba Mon Sep 17 00:00:00 2001 From: "Andrew A. de Laix" Date: Mon, 7 Mar 2011 14:54:50 -0800 Subject: update openSSL archive usage for darwin. --- autobuild.xml | 4 ++-- indra/cmake/OpenSSL.cmake | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/cmake') diff --git a/autobuild.xml b/autobuild.xml index 0736a6afca..aa3414efc5 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1244,9 +1244,9 @@ archive hash - 9cf8e84cb91996616cf627ad18c85442 + facee34b8bd57ad602157e65a5af1a49 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openSSL-0.9.8l-darwin-20101004.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-openssl/rev/220986/arch/Darwin/installer/openssl-0.9.8q-darwin-20110211.tar.bz2 name darwin diff --git a/indra/cmake/OpenSSL.cmake b/indra/cmake/OpenSSL.cmake index c692b67b49..5982ee9a49 100644 --- a/indra/cmake/OpenSSL.cmake +++ b/indra/cmake/OpenSSL.cmake @@ -19,5 +19,5 @@ endif (STANDALONE) if (LINUX) set(CRYPTO_LIBRARIES crypto) elseif (DARWIN) - set(CRYPTO_LIBRARIES llcrypto) + set(CRYPTO_LIBRARIES crypto) endif (LINUX) -- cgit v1.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). --- autobuild.xml | 34 +++++++++++++++++++++++++++++----- indra/cmake/BerkeleyDB.cmake | 3 ++- indra/cmake/Copy3rdPartyLibs.cmake | 2 +- indra/cmake/LLWindow.cmake | 2 +- indra/newview/viewer_manifest.py | 5 ++++- 5 files changed, 37 insertions(+), 9 deletions(-) (limited to 'indra/cmake') diff --git a/autobuild.xml b/autobuild.xml index 513cb76b5f..59d72cb9b6 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -66,9 +66,9 @@ archive hash - 1bd5be9e91ae1ae4a1cfa7649890f72b + 69ae3b1c9cdb0ebc0d0e1ac8413e3eb7 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/SDL-1.2.12-linux-20101001.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-sdl/rev/223253/arch/Linux/installer/SDL-1.2.14-linux-20110309.tar.bz2 name linux @@ -102,9 +102,9 @@ archive hash - ae785a90f124aa572515fc7b97efc671 + ff62946c518a247c86e1066c1e9a5855 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/apr_suite-1.2.8-linux-20100930.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-apr/rev/223260/arch/Linux/installer/apr_suite-1.4.2-linux-20110309.tar.bz2 name linux @@ -267,6 +267,30 @@ + db + + license + bsd + license_file + LICENSES/db.txt + name + db + platforms + + linux + + archive + + hash + 8f57c413e0786681cbcb9ed2fb8a6d37 + url + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-db/rev/223263/arch/Linux/installer/db-5.1.25-linux-20110309.tar.bz2 + + name + linux + + + dbghelp license @@ -1977,7 +2001,7 @@ /build "/cfg=Release|Win32" - "/CL_ADD=/m:1" + "/CL_ADD=/m:1" configure diff --git a/indra/cmake/BerkeleyDB.cmake b/indra/cmake/BerkeleyDB.cmake index e3ca0fd77d..57b53f46ff 100644 --- a/indra/cmake/BerkeleyDB.cmake +++ b/indra/cmake/BerkeleyDB.cmake @@ -8,7 +8,8 @@ if (STANDALONE) else (STANDALONE) if (LINUX) # Need to add dependency pthread explicitely to support ld.gold. - set(DB_LIBRARIES db-4.2 pthread) + use_prebuilt_binary(db) + set(DB_LIBRARIES db-5.1 pthread) else (LINUX) set(DB_LIBRARIES db-4.2) endif (LINUX) diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 43b0347aa9..81ce7852ff 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -245,7 +245,7 @@ elseif(LINUX) libatk-1.0.so libbreakpad_client.so.0 libcrypto.so.0.9.7 - libdb-4.2.so + libdb-5.1.so libexpat.so libexpat.so.1 libgmock_main.so diff --git a/indra/cmake/LLWindow.cmake b/indra/cmake/LLWindow.cmake index a5b9cf47a4..b4bb9a078a 100644 --- a/indra/cmake/LLWindow.cmake +++ b/indra/cmake/LLWindow.cmake @@ -18,7 +18,7 @@ else (STANDALONE) use_prebuilt_binary(SDL) set (SDL_FOUND TRUE) set (SDL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/i686-linux) - set (SDL_LIBRARY SDL) + set (SDL_LIBRARY SDL directfb fusion direct) endif (LINUX AND VIEWER) endif (STANDALONE) 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.3 From acec15e723c066efc6eb1e38c98b7af4e9993809 Mon Sep 17 00:00:00 2001 From: Andrew de Laix Date: Thu, 10 Mar 2011 17:53:15 +0000 Subject: update boost archive usage for linux. --- autobuild.xml | 4 ++-- indra/cmake/Boost.cmake | 9 +-------- 2 files changed, 3 insertions(+), 10 deletions(-) (limited to 'indra/cmake') diff --git a/autobuild.xml b/autobuild.xml index 0e7a6b8ee3..c85a273a99 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -198,9 +198,9 @@ archive hash - cb7cbafb06b878adf423db314b1787df + a34e7fffdb94a6a4d8a2966b1f216da3 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-linux-20100929a.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-boost/rev/223302/arch/Linux/installer/boost-1.45.0-linux-20110310.tar.bz2 name linux diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake index 67dc9f0891..2135f0584c 100644 --- a/indra/cmake/Boost.cmake +++ b/indra/cmake/Boost.cmake @@ -49,17 +49,10 @@ else (STANDALONE) optimized libboost_filesystem-vc100-mt-${BOOST_VERSION} debug libboost_filesystem-vc100-mt-gd-${BOOST_VERSION}) endif (MSVC80) - elseif (DARWIN) + elseif (DARWIN OR LINUX) set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options) set(BOOST_REGEX_LIBRARY boost_regex) -# set(BOOST_SIGNALS_LIBRARY boost_signals) set(BOOST_SYSTEM_LIBRARY boost_system) set(BOOST_FILESYSTEM_LIBRARY boost_filesystem) - elseif (LINUX) - set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-gcc41-mt) - set(BOOST_REGEX_LIBRARY boost_regex-gcc41-mt) - set(BOOST_SIGNALS_LIBRARY boost_signals-gcc41-mt) - set(BOOST_SYSTEM_LIBRARY boost_system-gcc41-mt) - set(BOOST_FILESYSTEM_LIBRARY boost_filesystem-gcc41-mt) endif (WINDOWS) endif (STANDALONE) -- cgit v1.3 From 4a8e5d9df9c21884d172741d3a5aec7d94f3914f Mon Sep 17 00:00:00 2001 From: Andrew de Laix Date: Thu, 10 Mar 2011 21:51:13 +0000 Subject: update dbusglib archive for linux. --- autobuild.xml | 6 +++--- indra/cmake/DBusGlib.cmake | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'indra/cmake') diff --git a/autobuild.xml b/autobuild.xml index df0e8047e4..d5ee780629 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -320,7 +320,7 @@ license AFL2.1 license_file - LICENSES/dbusglib.txt + LICENSES/dbus-glib.txt name dbusglib platforms @@ -330,9 +330,9 @@ archive hash - bb9734fb6ae797e3fa34af1a4ef1ee7d + 94b058b9a81114dc4567bd78e4335425 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/dbusglib-linux-20101013.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/dbus_glib-0.76-linux-20110310.tar.bz2 name linux diff --git a/indra/cmake/DBusGlib.cmake b/indra/cmake/DBusGlib.cmake index 33c6343a93..83c08d3350 100644 --- a/indra/cmake/DBusGlib.cmake +++ b/indra/cmake/DBusGlib.cmake @@ -10,7 +10,7 @@ elseif (LINUX) use_prebuilt_binary(dbusglib) set(DBUSGLIB_FOUND ON FORCE BOOL) set(DBUSGLIB_INCLUDE_DIRS - ${LIBS_PREBUILT_DIR}/include/glib-2.0 + ${LIBS_PREBUILT_DIR}/include/dbus ) # We don't need to explicitly link against dbus-glib itself, because # the viewer probes for the system's copy at runtime. -- cgit v1.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/cmake/CMakeLists.txt | 3 --- indra/cmake/ELFIO.cmake | 19 ------------------- indra/newview/CMakeLists.txt | 3 --- indra/newview/viewer_manifest.py | 1 - 4 files changed, 26 deletions(-) delete mode 100644 indra/cmake/ELFIO.cmake (limited to 'indra/cmake') diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt index 9ef49db07d..89c1c3691a 100644 --- a/indra/cmake/CMakeLists.txt +++ b/indra/cmake/CMakeLists.txt @@ -20,7 +20,6 @@ set(cmake_SOURCE_FILES CSharpMacros.cmake DBusGlib.cmake DirectX.cmake - ELFIO.cmake EXPAT.cmake FindAPR.cmake FindBerkeleyDB.cmake @@ -29,8 +28,6 @@ set(cmake_SOURCE_FILES FindFMOD.cmake FindGooglePerfTools.cmake FindMono.cmake -# MT deprecated in VS2010 -# FindMT.cmake FindMySQL.cmake FindOpenJPEG.cmake FindXmlRpcEpi.cmake diff --git a/indra/cmake/ELFIO.cmake b/indra/cmake/ELFIO.cmake deleted file mode 100644 index e51993b0f7..0000000000 --- a/indra/cmake/ELFIO.cmake +++ /dev/null @@ -1,19 +0,0 @@ -# -*- cmake -*- -include(Prebuilt) - -set(ELFIO_FIND_QUIETLY ON) - -if (STANDALONE) - include(FindELFIO) -elseif (LINUX) - use_prebuilt_binary(elfio) - set(ELFIO_LIBRARIES ELFIO) - set(ELFIO_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include) - set(ELFIO_FOUND "YES") -endif (STANDALONE) - -if (ELFIO_FOUND) - add_definitions(-DLL_ELFBIN=1) -else (ELFIO_FOUND) - set(ELFIO_INCLUDE_DIR "") -endif (ELFIO_FOUND) 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.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. --- autobuild.xml | 4 ++-- indra/cmake/Copy3rdPartyLibs.cmake | 1 + indra/newview/viewer_manifest.py | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) (limited to 'indra/cmake') diff --git a/autobuild.xml b/autobuild.xml index 89dcadbcce..c326023c51 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -474,9 +474,9 @@ archive hash - 9ebba6e0a1730992fa0643566f4e23cf + d8b08b657247566bde5fd853c7622478 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/fontconfig-2.2.3-linux-20100930.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-fontconfig/rev/223389/arch/Linux/installer/fontconfig-2.8.0-linux-20110311.tar.bz2 name linux diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 81ce7852ff..c942fafabd 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -261,6 +261,7 @@ elseif(LINUX) libtcmalloc.so libuuid.so.1 libssl.so.0.9.7 + libfontconfig.so.1.4.4 ) if (FMOD) 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.3 From fcdd82af83093a0e62200be7b1fc44e96fd76d57 Mon Sep 17 00:00:00 2001 From: Andrew de Laix Date: Fri, 11 Mar 2011 23:50:00 +0000 Subject: update libpng archive for linux. --- autobuild.xml | 4 ++-- indra/cmake/PNG.cmake | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'indra/cmake') diff --git a/autobuild.xml b/autobuild.xml index ab98824d56..b5c4894841 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1016,9 +1016,9 @@ archive hash - adeeca61be1b8f47ce85660c8c20a904 + 0681ab7e1988dfdbdad7dd9edb7760ee url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libpng-1.2.35-linux-20100929.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-libpng/rev/221851/arch/Linux/installer/libpng-1.5.1-linux-20110223.tar.bz2 name linux diff --git a/indra/cmake/PNG.cmake b/indra/cmake/PNG.cmake index 60f749869a..913c575672 100644 --- a/indra/cmake/PNG.cmake +++ b/indra/cmake/PNG.cmake @@ -15,7 +15,7 @@ else (STANDALONE) set(PNG_LIBRARIES png15) set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng15) else() - set(PNG_LIBRARIES png12) - set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng12) + set(PNG_LIBRARIES png15) + set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng15) endif() endif (STANDALONE) -- cgit v1.3 From c41d9949d797312626d44c639766b285111d608b Mon Sep 17 00:00:00 2001 From: Andrew de Laix Date: Mon, 14 Mar 2011 20:01:31 +0000 Subject: update llqtwebkit usage. --- autobuild.xml | 4 ++-- indra/cmake/WebKitLibPlugin.cmake | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'indra/cmake') diff --git a/autobuild.xml b/autobuild.xml index b5c4894841..2848a7e0f7 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1112,9 +1112,9 @@ archive hash - c05a33ee8b6f253b5a744596dfc3707d + f53e2a255d4c4039203de3e4640a2d41 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-linux-qt4.6-20101013.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llqtwebkit/rev/223655/arch/Linux/installer/llqtwebkit-4.7.1-linux-20110314.tar.bz2 name linux diff --git a/indra/cmake/WebKitLibPlugin.cmake b/indra/cmake/WebKitLibPlugin.cmake index 1f5b0f5d84..8fb717cdb8 100644 --- a/indra/cmake/WebKitLibPlugin.cmake +++ b/indra/cmake/WebKitLibPlugin.cmake @@ -62,10 +62,6 @@ elseif (LINUX) else (STANDALONE) set(WEBKIT_PLUGIN_LIBRARIES llqtwebkit - - qgif - qjpeg - QtWebKit QtOpenGL QtNetwork -- cgit v1.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. --- autobuild.xml | 6 +++--- indra/cmake/Copy3rdPartyLibs.cmake | 4 ++-- indra/newview/viewer_manifest.py | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'indra/cmake') diff --git a/autobuild.xml b/autobuild.xml index cdc724f571..02da077faa 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1258,7 +1258,7 @@ license openSSL license_file - LICENSES/openSSL.txt + LICENSES/openssl.txt name openSSL platforms @@ -1280,9 +1280,9 @@ archive hash - 511cf1c200efe587552b8225dd361dbb + cc159598ef3fcd34fd33a8a0ef846165 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openSSL-0.9.7c-linux-20100930.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-openssl/rev/223711/arch/Linux/installer/openssl-0.9.8q-linux-20110314.tar.bz2 name linux diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index c942fafabd..f1584ff0c4 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -244,7 +244,7 @@ elseif(LINUX) libaprutil-1.so.0 libatk-1.0.so libbreakpad_client.so.0 - libcrypto.so.0.9.7 + libcrypto.so.0.9.8 libdb-5.1.so libexpat.so libexpat.so.1 @@ -260,7 +260,7 @@ elseif(LINUX) libstacktrace.so libtcmalloc.so libuuid.so.1 - libssl.so.0.9.7 + libssl.so.0.9.8 libfontconfig.so.1.4.4 ) 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.3 From 72fd8c2ec428cea667af6fdb360d8f68f6af6d6d Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Mon, 14 Mar 2011 23:57:57 -0700 Subject: Fix Mac Json cmake script --- indra/cmake/JsonCpp.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/cmake') diff --git a/indra/cmake/JsonCpp.cmake b/indra/cmake/JsonCpp.cmake index 9024fa92a7..644b417e17 100644 --- a/indra/cmake/JsonCpp.cmake +++ b/indra/cmake/JsonCpp.cmake @@ -14,7 +14,7 @@ else (STANDALONE) debug json_vc100debug_libmt.lib optimized json_vc100_libmt) elseif (DARWIN) - set(JSONCPP_LIBRARIES libjson_linux-gcc-4.0.1_libmt.a) + set(JSONCPP_LIBRARIES libjson_darwin_libmt.a) elseif (LINUX) set(JSONCPP_LIBRARIES libjsoncpp.a) endif (WINDOWS) -- cgit v1.3 From 1de3c1e127706ebc6a16f152635d456dcd59c17f Mon Sep 17 00:00:00 2001 From: Andrew de Laix Date: Tue, 15 Mar 2011 18:12:43 +0000 Subject: update jsoncpp archive on linux. --- autobuild.xml | 4 ++-- indra/cmake/JsonCpp.cmake | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/cmake') diff --git a/autobuild.xml b/autobuild.xml index e060cc1bd6..6dfa7671d3 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -920,9 +920,9 @@ archive hash - 7e6b2fc7ad4e12d94d01cc49c22c6f67 + 840cd9455638c0ea52c613cfddd07d5b url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jsoncpp-svn-r69-linux-20101013.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-jsoncpp/rev/223959/arch/Linux/installer/jsoncpp-0.5.0-linux-20110315.tar.bz2 name linux diff --git a/indra/cmake/JsonCpp.cmake b/indra/cmake/JsonCpp.cmake index 9024fa92a7..499b00fb44 100644 --- a/indra/cmake/JsonCpp.cmake +++ b/indra/cmake/JsonCpp.cmake @@ -16,7 +16,7 @@ else (STANDALONE) elseif (DARWIN) set(JSONCPP_LIBRARIES libjson_linux-gcc-4.0.1_libmt.a) elseif (LINUX) - set(JSONCPP_LIBRARIES libjsoncpp.a) + set(JSONCPP_LIBRARIES libjson_linux-gcc-4.1.3_libmt.a) endif (WINDOWS) set(JSONCPP_INCLUDE_DIRS "${LIBS_PREBUILT_DIR}/include/jsoncpp" "${LIBS_PREBUILT_DIR}/include/json") endif (STANDALONE) -- cgit v1.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. --- autobuild.xml | 4 ++-- indra/cmake/Copy3rdPartyLibs.cmake | 2 +- indra/newview/viewer_manifest.py | 4 +++- 3 files changed, 6 insertions(+), 4 deletions(-) (limited to 'indra/cmake') diff --git a/autobuild.xml b/autobuild.xml index 8e6ad226f3..11ffd12123 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1052,9 +1052,9 @@ archive hash - 2b64ea42d54583ab82f4936ce6ea2a3c + 873e8e99d29711df2efa30646dca1795 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libuuid-linux-20100930.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-libuuid/rev/223995/arch/Linux/installer/uuid-1.6.2-linux-20110315.tar.bz2 name linux diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index f1584ff0c4..169502731d 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -259,7 +259,7 @@ elseif(LINUX) libssl.so libstacktrace.so libtcmalloc.so - libuuid.so.1 + libuuid.so.16.0.22 libssl.so.0.9.8 libfontconfig.so.1.4.4 ) 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.3 From 38bdbbd01921e008a5882739992fd8139ec9e1fb Mon Sep 17 00:00:00 2001 From: Andrew de Laix Date: Wed, 16 Mar 2011 16:06:47 +0000 Subject: rename google archive for linux to google-perftools and update to latest. --- autobuild.xml | 28 +++++++--------------------- indra/cmake/Copy3rdPartyLibs.cmake | 2 +- indra/cmake/GooglePerfTools.cmake | 3 +-- 3 files changed, 9 insertions(+), 24 deletions(-) (limited to 'indra/cmake') diff --git a/autobuild.xml b/autobuild.xml index 11ffd12123..6bf06212a9 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -639,12 +639,14 @@ - google + google-perftools license - mit + bsd + license_file + LICENSES/google-perftools.txt name - google + google-perftools platforms linux @@ -652,29 +654,13 @@ archive hash - 7d9d1b6d32ee273df164f7b7d5f29848 - hash_algorithm - md5 + cf513fc2eec4a414cc804cf408932a45 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/google-0.0.0-linux-20110114.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-google-perftools/rev/224046/arch/Linux/installer/google_perftools-1.7-linux-20110315.tar.bz2 name linux - - version - 0.0.0 - - google-perftools - - license - bsd - license_file - LICENSES/google.txt - name - google-perftools - platforms - windows archive diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 169502731d..e2b7d3b888 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -257,8 +257,8 @@ elseif(LINUX) libopenal.so libopenjpeg.so libssl.so - libstacktrace.so libtcmalloc.so + libuuid.so.16 libuuid.so.16.0.22 libssl.so.0.9.8 libfontconfig.so.1.4.4 diff --git a/indra/cmake/GooglePerfTools.cmake b/indra/cmake/GooglePerfTools.cmake index 133ae14d2f..6c784a3a76 100644 --- a/indra/cmake/GooglePerfTools.cmake +++ b/indra/cmake/GooglePerfTools.cmake @@ -12,9 +12,8 @@ else (STANDALONE) set(GOOGLE_PERFTOOLS_FOUND "YES") endif (WINDOWS) if (LINUX) - use_prebuilt_binary(google) + use_prebuilt_binary(google-perftools) set(TCMALLOC_LIBRARIES tcmalloc) - set(STACKTRACE_LIBRARIES stacktrace) set(PROFILER_LIBRARIES profiler) set(GOOGLE_PERFTOOLS_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include) -- cgit v1.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. --- autobuild.xml | 24 ------------------------ indra/cmake/Copy3rdPartyLibs.cmake | 1 - indra/newview/CMakeLists.txt | 3 --- indra/newview/viewer_manifest.py | 4 ---- indra/win_crash_logger/llcrashloggerwindows.cpp | 1 - 5 files changed, 33 deletions(-) (limited to 'indra/cmake') diff --git a/autobuild.xml b/autobuild.xml index 06f37044e9..76cec04ab0 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -291,30 +291,6 @@ - dbghelp - - license - MSDTW - license_file - LICENSES/dbghelp.txt - name - dbghelp - platforms - - windows - - archive - - hash - c5d28b13ce16a46f2e35eb133f7d92e8 - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/dbghelp-6.11.1.404-windows-20101011.tar.bz2 - - name - windows - - - dbusglib license diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index e2b7d3b888..4698116022 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -47,7 +47,6 @@ if(WINDOWS) libapr-1.dll libaprutil-1.dll libapriconv-1.dll - dbghelp.dll ssleay32.dll libeay32.dll ) 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': diff --git a/indra/win_crash_logger/llcrashloggerwindows.cpp b/indra/win_crash_logger/llcrashloggerwindows.cpp index 354b7e6cc3..51ff754c27 100644 --- a/indra/win_crash_logger/llcrashloggerwindows.cpp +++ b/indra/win_crash_logger/llcrashloggerwindows.cpp @@ -34,7 +34,6 @@ #include "boost/tokenizer.hpp" -#include "dbghelp.h" #include "indra_constants.h" // CRASH_BEHAVIOR_ASK, CRASH_SETTING_NAME #include "llerror.h" #include "llfile.h" -- cgit v1.3 From 8468670583db601c5feb683de6b27caf74744e45 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Fri, 18 Mar 2011 16:47:43 -0700 Subject: Autobuild : Fix merge snaffu in Json cmake file --- indra/cmake/JsonCpp.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/cmake') diff --git a/indra/cmake/JsonCpp.cmake b/indra/cmake/JsonCpp.cmake index 53801a5737..499b00fb44 100644 --- a/indra/cmake/JsonCpp.cmake +++ b/indra/cmake/JsonCpp.cmake @@ -14,7 +14,7 @@ else (STANDALONE) debug json_vc100debug_libmt.lib optimized json_vc100_libmt) elseif (DARWIN) - set(JSONCPP_LIBRARIES libjson_darwin_libmt.a) + set(JSONCPP_LIBRARIES libjson_linux-gcc-4.0.1_libmt.a) elseif (LINUX) set(JSONCPP_LIBRARIES libjson_linux-gcc-4.1.3_libmt.a) endif (WINDOWS) -- cgit v1.3 From 6ec5177667cb63acff03347e3eb9c6a503822de9 Mon Sep 17 00:00:00 2001 From: Boroondas Gupte Date: Sat, 19 Mar 2011 21:07:09 +0100 Subject: OPEN-39: include Tut.cmake for integration tests (fixes "bitpack_test.o: No such file or directory" on standalone) --- doc/contributions.txt | 1 + indra/cmake/LLAddBuildTest.cmake | 1 + 2 files changed, 2 insertions(+) (limited to 'indra/cmake') diff --git a/doc/contributions.txt b/doc/contributions.txt index f33af2599d..e8e428bf41 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -176,6 +176,7 @@ Blakar Ogre blino Nakamura VWR-17 Boroondas Gupte + OPEN-39 SNOW-278 SNOW-503 SNOW-510 diff --git a/indra/cmake/LLAddBuildTest.cmake b/indra/cmake/LLAddBuildTest.cmake index 62b764bb30..97300491cc 100644 --- a/indra/cmake/LLAddBuildTest.cmake +++ b/indra/cmake/LLAddBuildTest.cmake @@ -1,6 +1,7 @@ # -*- cmake -*- include(LLTestCommand) include(GoogleMock) +include(Tut) MACRO(LL_ADD_PROJECT_UNIT_TESTS project sources) # Given a project name and a list of sourcefiles (with optional properties on each), -- cgit v1.3 From 616b0a25686b0ffbc5a995a26f27d5f46efc7024 Mon Sep 17 00:00:00 2001 From: "alain@945battery-guestA-183.lindenlab.com" Date: Wed, 23 Mar 2011 10:44:39 -0700 Subject: Updated linux llqtwekit archive and fixed media webkit build and loading (fix CHOP-545). --- autobuild.xml | 4 ++-- indra/cmake/WebKitLibPlugin.cmake | 2 +- indra/media_plugins/webkit/media_plugin_webkit.cpp | 4 +++- 3 files changed, 6 insertions(+), 4 deletions(-) (limited to 'indra/cmake') diff --git a/autobuild.xml b/autobuild.xml index 425a5d37c3..c6c087a6c3 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1074,9 +1074,9 @@ archive hash - f53e2a255d4c4039203de3e4640a2d41 + ed7d6cb66e6fcd6dbac41aabe6a0d0c8 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-4.7.1-linux-20110314.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llqtwebkit/rev/224858/arch/Linux/installer/llqtwebkit-4.7.1-linux-20110323.tar.bz2 name linux diff --git a/indra/cmake/WebKitLibPlugin.cmake b/indra/cmake/WebKitLibPlugin.cmake index 8fb717cdb8..6e8f6cec7f 100644 --- a/indra/cmake/WebKitLibPlugin.cmake +++ b/indra/cmake/WebKitLibPlugin.cmake @@ -67,7 +67,7 @@ elseif (LINUX) QtNetwork QtGui QtCore - + jscore jpeg fontconfig X11 diff --git a/indra/media_plugins/webkit/media_plugin_webkit.cpp b/indra/media_plugins/webkit/media_plugin_webkit.cpp index d6f8ae3e16..e24ee6629e 100644 --- a/indra/media_plugins/webkit/media_plugin_webkit.cpp +++ b/indra/media_plugins/webkit/media_plugin_webkit.cpp @@ -1231,7 +1231,9 @@ void MediaPluginWebKit::receiveMessage(const char *message_string) std::string url = message_in.getValue("url"); if ( 404 == code ) // browser lib only supports 404 right now { - LLQtWebKit::getInstance()->set404RedirectUrl( mBrowserWindowId, url ); +#if LLQTWEBKIT_API_VERSION < 8 + LLQtWebKit::getInstance()->set404RedirectUrl( mBrowserWindowId, url ); +#endif }; } else if(message_name == "set_user_agent") -- cgit v1.3 From 2f190297f0ff37452b3e966c0878e14a6aacc41b Mon Sep 17 00:00:00 2001 From: Andrew de Laix Date: Wed, 30 Mar 2011 20:12:37 +0000 Subject: remove lib requirement not in current llqtwebkit linux archive. --- indra/cmake/WebKitLibPlugin.cmake | 1 - 1 file changed, 1 deletion(-) (limited to 'indra/cmake') diff --git a/indra/cmake/WebKitLibPlugin.cmake b/indra/cmake/WebKitLibPlugin.cmake index 6e8f6cec7f..b599982afb 100644 --- a/indra/cmake/WebKitLibPlugin.cmake +++ b/indra/cmake/WebKitLibPlugin.cmake @@ -67,7 +67,6 @@ elseif (LINUX) QtNetwork QtGui QtCore - jscore jpeg fontconfig X11 -- cgit v1.3 From 926e506d0ad67e4ba9370efae60f5641c932b672 Mon Sep 17 00:00:00 2001 From: Andrew de Laix Date: Thu, 31 Mar 2011 16:17:12 +0000 Subject: d'oh, forgot to add back some q libs to the build when reverting to older linux package; here they are. --- indra/cmake/WebKitLibPlugin.cmake | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/cmake') diff --git a/indra/cmake/WebKitLibPlugin.cmake b/indra/cmake/WebKitLibPlugin.cmake index b599982afb..0f5a81c020 100644 --- a/indra/cmake/WebKitLibPlugin.cmake +++ b/indra/cmake/WebKitLibPlugin.cmake @@ -67,6 +67,8 @@ elseif (LINUX) QtNetwork QtGui QtCore + qgif + qjpeg jpeg fontconfig X11 -- cgit v1.3 From 44ad672b9e0a5ba1eef3ef7c71da3eb887f4fe0a Mon Sep 17 00:00:00 2001 From: "Christian Goetze (CG)" Date: Thu, 31 Mar 2011 15:43:47 -0700 Subject: Apply server side code to message template verification onto the viewer tree. --- build.sh | 5 ++++- indra/cmake/TemplateCheck.cmake | 2 +- indra/cmake/Variables.cmake | 2 ++ scripts/template_verifier.py | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) (limited to 'indra/cmake') diff --git a/build.sh b/build.sh index 1c28f5a255..92c2222c73 100755 --- a/build.sh +++ b/build.sh @@ -53,6 +53,8 @@ pre_build() local build_dir="$2" begin_section "Pre$variant" #export PATH="/cygdrive/c/Program Files/Microsoft Visual Studio 8/Common7/IDE/:$PATH" + [ -n "$master_message_template_checkout" ] && [ -r "$master_message_template_checkout/message_template.msg" ]\ + && template_verifier_master_url="-DTEMPLATE_VERIFIER_MASTER_URL=file://$master_message_template_checkout/message_template.msg" python develop.py \ --incredibuild \ --unattended \ @@ -67,7 +69,8 @@ pre_build() -DLOCALIZESETUP:BOOL=ON \ -DPACKAGE:BOOL=ON \ -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE \ - -DLL_TESTS:BOOL="$run_tests" + -DLL_TESTS:BOOL="$run_tests" \ + -DTEMPLATE_VERIFIER_OPTIONS:STRING="$template_verifier_options" $template_verifier_master_url end_section "Pre$variant" } diff --git a/indra/cmake/TemplateCheck.cmake b/indra/cmake/TemplateCheck.cmake index 24805b4214..2fada2eda9 100644 --- a/indra/cmake/TemplateCheck.cmake +++ b/indra/cmake/TemplateCheck.cmake @@ -8,7 +8,7 @@ macro (check_message_template _target) PRE_LINK COMMAND ${PYTHON_EXECUTABLE} ARGS ${SCRIPTS_DIR}/template_verifier.py - --mode=development --cache_master ${TEMPLATE_VERIFIER_OPTIONS} + --mode=development --cache_master --master_url=${TEMPLATE_VERIFIER_MASTER_URL} ${TEMPLATE_VERIFIER_OPTIONS} COMMENT "Verifying message template - See http://wiki.secondlife.com/wiki/Template_verifier.py" ) endmacro (check_message_template) diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake index 5dc0cabf03..0d7156b91d 100644 --- a/indra/cmake/Variables.cmake +++ b/indra/cmake/Variables.cmake @@ -41,6 +41,8 @@ if (EXISTS ${CMAKE_SOURCE_DIR}/Server.cmake) set(INSTALL_PROPRIETARY ON CACHE BOOL "Install proprietary binaries") endif (EXISTS ${CMAKE_SOURCE_DIR}/Server.cmake) +set(TEMPLATE_VERIFIER_OPTIONS "" CACHE STRING "Options for scripts/template_verifier.py") +set(TEMPLATE_VERIFIER_MASTER_URL "http://bitbucket.org/lindenlab/master-message-template/raw/tip/message_template.msg" CACHE STRING "Location of the master message template") if (${CMAKE_SYSTEM_NAME} MATCHES "Windows") set(WINDOWS ON BOOL FORCE) diff --git a/scripts/template_verifier.py b/scripts/template_verifier.py index 113607e02a..b44410cdd8 100644 --- a/scripts/template_verifier.py +++ b/scripts/template_verifier.py @@ -229,7 +229,7 @@ http://wiki.secondlife.com/wiki/Template_verifier.py """) parser.add_option( '-u', '--master_url', type='string', dest='master_url', - default='http://secondlife.com/app/message_template/master_message_template.msg', + default='http://bitbucket.org/lindenlab/master-message-template/raw/tip/message_template.msg', help="""The url of the master message template.""") parser.add_option( '-c', '--cache_master', action='store_true', dest='cache_master', -- cgit v1.3