diff --git a/build_macosx.sh b/build_macosx.sh new file mode 100755 index 0000000000..63f432bc17 --- /dev/null +++ b/build_macosx.sh @@ -0,0 +1,52 @@ +#!/bin/bash + +### +### Constants +### + +TRUE=0 # Map the shell's idea of truth to a variable for better documentation +FALSE=1 +LOG="`pwd`/logs/build_macosx.log" + +### +### Global Variables +### + +WANTS_CLEAN=$TRUE +WANTS_CONFIG=$TRUE +WANTS_BUILD=$TRUE +WANTS_PACKAGE=$TRUE + +### +### Helper Functions +### + +if [ "$1" == "--rebuild" ] ; then + WANTS_CLEAN=$FALSE + WANTS_CONFIG=$FALSE +fi + +### +### Main Logic +### + + +pushd indra +if [ $WANTS_CLEAN -eq $TRUE ] ; then + ./develop.py clean + find . -name "*.pyc" -exec rm {} \; +fi + +if [ $WANTS_CONFIG -eq $TRUE ] ; then + mkdir -p ../logs > /dev/null 2>&1 + ./develop.py -t Release | tee $LOG + mkdir -p /Users/unencrypted/code/firestorm/indra/build-darwin-i386/newview/Release/Firestorm.app # work around LL bug +fi + +if [ $WANTS_BUILD -eq $TRUE ] ; then + echo "Building in progress... Check $LOG for verbose status" + # -sdk macosx10.6 + xcodebuild -project build-darwin-i386/SecondLife.xcodeproj -alltargets -configuration Release GCC_OPTIMIZATION_LEVEL=3 ARCHS=i386 GCC_ENABLE_SSE3_EXTENSIONS=YES 2>&1 | tee $LOG | grep -e "make.*Error " + echo "Complete" +fi +popd diff --git a/indra/cmake/FMOD.cmake b/indra/cmake/FMOD.cmake index 96434e38fa..dbd78c9de2 100644 --- a/indra/cmake/FMOD.cmake +++ b/indra/cmake/FMOD.cmake @@ -1,24 +1,64 @@ -# -*- cmake -*- - -set(FMOD ON CACHE BOOL "Use FMOD sound library.") - -if (FMOD) - if (STANDALONE) - set(FMOD_FIND_REQUIRED ON) - include(FindFMOD) - else (STANDALONE) - 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 (STANDALONE) -endif (FMOD) +# -*- cmake -*- + +include(Linking) + +if(INSTALL_PROPRIETARY) + include(Prebuilt) + use_prebuilt_binary(fmod) +endif(INSTALL_PROPRIETARY) + +find_library(FMOD_LIBRARY_RELEASE + NAMES fmod fmodvc fmod-3.75 + PATHS + ${ARCH_PREBUILT_DIRS_RELEASE} + ) + +find_library(FMOD_LIBRARY_DEBUG + NAMES fmod fmodvc fmod-3.75 + PATHS + ${ARCH_PREBUILT_DIRS_DEBUG} + ) + +if (FMOD_LIBRARY_RELEASE AND FMOD_LIBRARY_DEBUG) + set(FMOD_LIBRARY + debug ${FMOD_LIBRARY_DEBUG} + optimized ${FMOD_LIBRARY_RELEASE}) +elseif (FMOD_LIBRARY_RELEASE) + set(FMOD_LIBRARY ${FMOD_LIBRARY_RELEASE}) +endif (FMOD_LIBRARY_RELEASE AND FMOD_LIBRARY_DEBUG) + +if (NOT FMOD_LIBRARY) + set(FMOD_SDK_DIR CACHE PATH "Path to the FMOD SDK.") + if (FMOD_SDK_DIR) + find_library(FMOD_LIBRARY + NAMES fmodvc fmod-3.75 fmod + PATHS + ${FMOD_SDK_DIR}/api/lib + ${FMOD_SDK_DIR}/api + ${FMOD_SDK_DIR}/lib + ${FMOD_SDK_DIR} + ) + endif (FMOD_SDK_DIR) +endif (NOT FMOD_LIBRARY) + +find_path(FMOD_INCLUDE_DIR fmod.h + ${LIBS_PREBUILT_DIR}/include + ${FMOD_SDK_DIR}/api/inc + ${FMOD_SDK_DIR}/inc + ${FMOD_SDK_DIR} + ) + +if (FMOD_LIBRARY AND FMOD_INCLUDE_DIR) + set(FMOD ON CACHE BOOL "Use closed source FMOD sound library.") +else (FMOD_LIBRARY AND FMOD_INCLUDE_DIR) + set(FMOD_LIBRARY "") + set(FMOD_INCLUDE_DIR "") + if (FMOD) + message(STATUS "No support for FMOD audio (need to set FMOD_SDK_DIR?)") + endif (FMOD) + set(FMOD OFF CACHE BOOL "Use closed source FMOD sound library.") +endif (FMOD_LIBRARY AND FMOD_INCLUDE_DIR) + +if (FMOD) + message(STATUS "Building with FMOD audio support") +endif (FMOD) diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake index 230e228c62..39b2b3dc74 100644 --- a/indra/cmake/Variables.cmake +++ b/indra/cmake/Variables.cmake @@ -1,6 +1,6 @@ # -*- cmake -*- # -# Definitions of variables used throughout the Second Life build +# Definitions of variables used throughout the build # process. # # Platform variables: @@ -121,7 +121,7 @@ endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") # Default deploy grid set(GRID agni CACHE STRING "Target Grid") -set(VIEWER ON CACHE BOOL "Build Second Life viewer.") +set(VIEWER ON CACHE BOOL "Build Firestorm 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") diff --git a/indra/lib/python/indra/util/llmanifest.py b/indra/lib/python/indra/util/llmanifest.py index c33a03034a..3093cd2d82 100644 --- a/indra/lib/python/indra/util/llmanifest.py +++ b/indra/lib/python/indra/util/llmanifest.py @@ -99,7 +99,7 @@ def get_channel(srctree): DEFAULT_SRCTREE = os.path.dirname(sys.argv[0]) -DEFAULT_CHANNEL = 'Second Life Release' +DEFAULT_CHANNEL = 'Firestorm Development' ARGUMENTS=[ dict(name='actions', diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h index bd65ce8573..f4aa86630d 100644 --- a/indra/llcommon/llversionviewer.h +++ b/indra/llcommon/llversionviewer.h @@ -30,8 +30,8 @@ const S32 LL_VERSION_MAJOR = 2; const S32 LL_VERSION_MINOR = 2; const S32 LL_VERSION_PATCH = 1; -const S32 LL_VERSION_BUILD = 0; +const S32 LL_VERSION_BUILD = 12; -const char * const LL_CHANNEL = "Second Life Developer"; +const char * const LL_CHANNEL = "Firestorme Developer"; #endif diff --git a/indra/llvfs/lldir.cpp b/indra/llvfs/lldir.cpp index 938fb008c9..c4eca0d26c 100644 --- a/indra/llvfs/lldir.cpp +++ b/indra/llvfs/lldir.cpp @@ -253,7 +253,7 @@ std::string LLDir::buildSLOSCacheDir() const } else { - res = getOSCacheDir() + mDirDelimiter + "SecondLife"; + res = getOSCacheDir() + mDirDelimiter + "Firestorm"; } return res; } diff --git a/indra/llvfs/lldir_mac.cpp b/indra/llvfs/lldir_mac.cpp index b41b0ec5dd..2f94971ab7 100644 --- a/indra/llvfs/lldir_mac.cpp +++ b/indra/llvfs/lldir_mac.cpp @@ -117,7 +117,7 @@ LLDir_Mac::LLDir_Mac() CFStringRef stringRef = NULL; OSStatus error = noErr; FSRef fileRef; - CFStringRef secondLifeString = CFSTR("SecondLife"); + CFStringRef secondLifeString = CFSTR("Firestorm"); mainBundleRef = CFBundleGetMainBundle(); @@ -193,7 +193,7 @@ LLDir_Mac::LLDir_Mac() if (error == noErr) { FSRefToLLString(&cacheDirRef, mOSCacheDir); - (void)CFCreateDirectory(&cacheDirRef, CFSTR("SecondLife"),NULL); + (void)CFCreateDirectory(&cacheDirRef, CFSTR("Firestorm"),NULL); } // mOSUserAppDir diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index bf885e5934..1a5754c708 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -577,7 +577,7 @@ set(viewer_SOURCE_FILES pipeline.cpp ) -set(VIEWER_BINARY_NAME "secondlife-bin" CACHE STRING +set(VIEWER_BINARY_NAME "firestorm-bin" CACHE STRING "The name of the viewer executable to create.") if (LINUX) @@ -1745,16 +1745,16 @@ if (LINUX) endif (LINUX) if (DARWIN) - set(product "Second Life") + set(product "Firestorm") set_target_properties( ${VIEWER_BINARY_NAME} PROPERTIES OUTPUT_NAME "${product}" MACOSX_BUNDLE_INFO_STRING "info string - localize me" MACOSX_BUNDLE_ICON_FILE "secondlife.icns" - MACOSX_BUNDLE_GUI_IDENTIFIER "Second Life" + MACOSX_BUNDLE_GUI_IDENTIFIER "Firestorm" MACOSX_BUNDLE_LONG_VERSION_STRING "ververver" - MACOSX_BUNDLE_BUNDLE_NAME "Second Life" + MACOSX_BUNDLE_BUNDLE_NAME "Firestorm" MACOSX_BUNDLE_SHORT_VERSION_STRING "asdf" MACOSX_BUNDLE_BUNDLE_VERSION "asdf" MACOSX_BUNDLE_COPYRIGHT "copyright linden lab 2007 - localize me and run me through a legal wringer" @@ -1818,7 +1818,7 @@ if (PACKAGE) if (DARWIN) set(VIEWER_DIST_DIR "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${product}.app") set(VIEWER_SYMBOL_FILE "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/secondlife-symbols-darwin.tar.bz2") - set(VIEWER_EXE_GLOBS "'Second Life' SLPlugin") + set(VIEWER_EXE_GLOBS "'Firestorm' SLPlugin") set(VIEWER_LIB_GLOB "*.dylib") endif (DARWIN) if (LINUX) diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 6861f02bfb..5af198fdcf 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -564,7 +564,7 @@ class DarwinManifest(ViewerManifest): def construct(self): # copy over the build result (this is a no-op if run within the xcode script) - self.path(self.args['configuration'] + "/Second Life.app", dst="") + self.path(self.args['configuration'] + "/Firestorm.app", dst="") if self.prefix(src="", dst="Contents"): # everything goes in Contents self.path("Info-SecondLife.plist", dst="Info.plist") @@ -705,20 +705,20 @@ class DarwinManifest(ViewerManifest): if ("package" in self.args['actions'] or "unpacked" in self.args['actions']): self.run_command('strip -S %(viewer_binary)r' % - { 'viewer_binary' : self.dst_path_of('Contents/MacOS/Second Life')}) + { 'viewer_binary' : self.dst_path_of('Contents/MacOS/Firestorm')}) def package_finish(self): - channel_standin = 'Second Life Viewer 2' # hah, our default channel is not usable on its own + channel_standin = 'Firestorm' # hah, our default channel is not usable on its own if not self.default_channel(): channel_standin = self.channel() - imagename="SecondLife_" + '_'.join(self.args['version']) + imagename="Firestorm_" + '_'.join(self.args['version']) # MBW -- If the mounted volume name changes, it breaks the .DS_Store's background image and icon positioning. # If we really need differently named volumes, we'll need to create multiple DS_Store file images, or use some other trick. - volname="Second Life Installer" # DO NOT CHANGE without understanding comment above + volname="Firestorm Installer" # DO NOT CHANGE without understanding comment above if self.default_channel(): if not self.default_grid():