diff --git a/README_BUILD_FIRESTORM_LINUX.txt b/README_BUILD_FIRESTORM_LINUX.txt index e8002ff97b..d6f93e6dc2 100755 --- a/README_BUILD_FIRESTORM_LINUX.txt +++ b/README_BUILD_FIRESTORM_LINUX.txt @@ -9,10 +9,14 @@ receive much less help. http://wiki.secondlife.com/wiki/Compiling_the_viewer_(L If you want to use licensed FMOD or KDU build libraries (they are optional) you have to provision these yourself. If you're licensing these with Phoenix/Firestorm, ask for the libraries for fmod and kdu. Put them into: /opt/firestorm + If you're a community builder, you'll need to build these libraries yourself, then change your autobuild.xml file to point to your own versions, or create a different autobuild.xml with your customizations, and use this with autobuild instead of our default autobuild.xml There are some examples of how to build FMOD on the LL Wiki and opensource-dev -mailing list. Ask Arrehn Oberlander about joining "Firestorm Self Compilers" for additional community help. +mailing list. We've created a non-KDU build target to make this easier. Everywhere you see "ReleaseFS" below, use +"ReleaseFS_open" instead. This will perform the same build, using openjpeg instead of KDU. + + To build firestorm: @@ -25,8 +29,8 @@ Other examples: autobuild configure -c ReleaseFS -- --fmod --kdu # configure with fmod, kdu enabled autobuild configure -c ReleaseFS -- --chan Private-Yourname # configure with a custom channel - autobuild build -c ReleaseFS -no-configure # default quick rebuild - autobuild build -c ReleaseFS -no-configure -- --clean # Clean rebuild + autobuild build -c ReleaseFS --no-configure # default quick rebuild + autobuild build -c ReleaseFS --no-configure -- --clean # Clean rebuild Any of the configure options can also be used (and do the same thing) with the build options. diff --git a/README_BUILD_FIRESTORM_MACOSX.txt b/README_BUILD_FIRESTORM_MACOSX.txt index fef11d9cb8..dd4bb08dc0 100755 --- a/README_BUILD_FIRESTORM_MACOSX.txt +++ b/README_BUILD_FIRESTORM_MACOSX.txt @@ -8,10 +8,13 @@ receive much less help. http://wiki.secondlife.com/wiki/Compiling_the_viewer_(M If you want to use licensed FMOD or KDU build libraries (they are optional) you have to provision these yourself. If you're licensing these with Phoenix/Firestorm, ask for the libraries for fmod and kdu. Put them into: /opt/firestorm + If you're a community builder, you'll need to build these libraries yourself, then change your autobuild.xml file to -point to your own versions, or create a different autobuild.xml with your customizations, and use this with autobuild +point to your own versions, or create a different autobuild.xml with your customizations, and use this with autobuild instead of our default autobuild.xml There are some examples of how to build FMOD on the LL Wiki and opensource-dev -mailing list. Ask Arrehn Oberlander about joining "Firestorm Self Compilers" for additional community help. +mailing list. We've created a non-KDU build target to make this easier. Everywhere you see "ReleaseFS" below, use +"ReleaseFS_open" instead. This will perform the same build, using openjpeg instead of KDU. + Additionally, you will need to procure an update vivox build package and place it in: /opt/firestorm @@ -29,8 +32,8 @@ Other examples: autobuild configure -c ReleaseFS -- --fmod --kdu # configure with fmod, kdu enabled autobuild configure -c ReleaseFS -- --chan Private-Yourname # configure with a custom channel - autobuild build -c ReleaseFS -no-configure # default quick rebuild - autobuild build -c ReleaseFS -no-configure -- --clean # Clean rebuild + autobuild build -c ReleaseFS --no-configure # default quick rebuild + autobuild build -c ReleaseFS --no-configure -- --clean # Clean rebuild Any of the configure options can also be used (and do the same thing) with the build options. diff --git a/README_BUILD_FIRESTORM_WIN32.txt b/README_BUILD_FIRESTORM_WIN32.txt index ec43094cd1..e6dc92d524 100755 --- a/README_BUILD_FIRESTORM_WIN32.txt +++ b/README_BUILD_FIRESTORM_WIN32.txt @@ -16,7 +16,9 @@ If you're licensing these with Phoenix/Firestorm, ask for the libraries for fmod If you're a community builder, you'll need to build these libraries yourself, then change your autobuild.xml file to point to your own versions, or create a different autobuild.xml with your customizations, and use this with autobuild instead of our default autobuild.xml There are some examples of how to build FMOD on the LL Wiki and opensource-dev -mailing list. Ask Arrehn Oberlander about joining "Firestorm Self Compilers" for additional community help. +mailing list. We've created a non-KDU build target to make this easier. Everywhere you see "ReleaseFS" below, use +"ReleaseFS_open" instead. This will perform the same build, using openjpeg instead of KDU. + To build firestorm: @@ -35,7 +37,7 @@ Other examples: autobuild configure -c ReleaseFS -- --fmod --kdu # configure with fmod, kdu enabled autobuild configure -c ReleaseFS -- --chan Private-Yourname # configure with a custom channel - autobuild build -c ReleaseFS -no-configure # default quick rebuild + autobuild build -c ReleaseFS --no-configure # default quick rebuild Any of the configure options can also be used (and do the same thing) with the build options. diff --git a/autobuild.xml b/autobuild.xml index d92f5ae72a..3575c03087 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -1678,6 +1678,27 @@ ReleaseFS + ReleaseFS_open + + configure + + arguments + + + + command + bash ../scripts/configure_firestorm.sh + options + + + --config + --version + + + name + ReleaseFS_open + + ReleaseOS configure @@ -1859,6 +1880,7 @@ name Release + ReleaseFS build @@ -1886,6 +1908,33 @@ name ReleaseFS + + ReleaseFS_open + + build + + command + ../scripts/configure_firestorm.sh + options + + --build + --package + --platform darwin + --fmod + + + configure +` + options + + --fmod + --platform darwin + + + name + ReleaseFS_open + + ReleaseOS build @@ -2070,6 +2119,32 @@ ReleaseFS + ReleaseFS_open + + build + + command + ../scripts/configure_firestorm.sh + options + + --build + --platform linux32 + --package + + + configure +` + options + + --fmod + --platform linux32 + + + name + ReleaseFS_open + + + ReleaseOS build @@ -2342,6 +2417,44 @@ ReleaseFS + ReleaseFS_open + + build + + arguments + + Firestorm.sln + + command + msbuild.exe + options + + /p:Configuration=Release + /flp:LogFile=logs\FirestormBuild_win32.log + /flp1:errorsonly;LogFile=logs\FirestormBuild_win32.err + /p:Platform=Win32 + /t:Build + /p:useenv=true + /verbosity:normal + /toolsversion:4.0 + /p:"VCBuildAdditionalOptions= /incremental" + + + configure + + options + + --fmod + --package + --version + --platform win32 + + + name + ReleaseFS_open + + + ReleaseOS build diff --git a/indra/Version b/indra/Version index 750c2d43a4..180023ff6d 100644 --- a/indra/Version +++ b/indra/Version @@ -1 +1 @@ -VERSION_VIEWER=2.6.9 +VERSION_VIEWER=2.6.1 diff --git a/indra/llcommon/llversionserver.h b/indra/llcommon/llversionserver.h index 715a7d6270..e9ef6b2e4e 100644 --- a/indra/llcommon/llversionserver.h +++ b/indra/llcommon/llversionserver.h @@ -30,7 +30,7 @@ const S32 LL_VERSION_MAJOR = 2; const S32 LL_VERSION_MINOR = 6; const S32 LL_VERSION_PATCH = 9; -const S32 LL_VERSION_BUILD = 18325; +const S32 LL_VERSION_BUILD = 18380; const char * const LL_CHANNEL = "Second Life Server"; diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h index 0b390e41ad..5fdf7a3224 100644 --- a/indra/llcommon/llversionviewer.h +++ b/indra/llcommon/llversionviewer.h @@ -30,7 +30,7 @@ const S32 LL_VERSION_MAJOR = 2; const S32 LL_VERSION_MINOR = 6; const S32 LL_VERSION_PATCH = 9; -const S32 LL_VERSION_BUILD = 18325; +const S32 LL_VERSION_BUILD = 18380; const char * const LL_CHANNEL = "Firestorm-private-Romana"; diff --git a/indra/llcommon/res/llcommon.rc b/indra/llcommon/res/llcommon.rc index af8ecf6492..6a14a9d23a 100644 --- a/indra/llcommon/res/llcommon.rc +++ b/indra/llcommon/res/llcommon.rc @@ -24,8 +24,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,6,9,18325 - PRODUCTVERSION 2,6,9,18325 + FILEVERSION 2,6,9,18380 + PRODUCTVERSION 2,6,9,18380 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -42,12 +42,12 @@ BEGIN BEGIN VALUE "CompanyName", "Phoenix Viewer" VALUE "FileDescription", "Phoenix Firestorm Viewer Common Library" - VALUE "FileVersion", "2.6.9.18325" + VALUE "FileVersion", "2.6.9.18380" VALUE "InternalName", "llcommon.dll" VALUE "LegalCopyright", "Copyright © 2010 Phoenix Viewer" VALUE "OriginalFilename", "llcommon.dll" VALUE "ProductName", "Phoenix Firestorm Viewer" - VALUE "ProductVersion", "2.6.9.18325" + VALUE "ProductVersion", "2.6.9.18380" END END BLOCK "VarFileInfo" diff --git a/indra/newview/Info-SecondLife.plist b/indra/newview/Info-SecondLife.plist index 189fbc14a2..2c8a6f7b7a 100644 --- a/indra/newview/Info-SecondLife.plist +++ b/indra/newview/Info-SecondLife.plist @@ -60,7 +60,7 @@ CFBundleVersion - 2.6.9.18325 + 2.6.9.18380 CSResourcesFileMapped diff --git a/scripts/configure_firestorm.sh b/scripts/configure_firestorm.sh index 5d3b370bae..038997463e 100755 --- a/scripts/configure_firestorm.sh +++ b/scripts/configure_firestorm.sh @@ -239,7 +239,7 @@ function getopt() ### getArgs $* -echo -e " Your platform is: $PLATFORM" +echo -e " Your platform is: '$PLATFORM'" echo -e " KDU: `b2a $WANTS_KDU`" echo -e " FMOD: `b2a $WANTS_FMOD`" echo -e " PACKAGE:`b2a $WANTS_PACKAGE`" @@ -257,24 +257,35 @@ CHANNEL=`echo $CHANNEL | sed -e "s/[^a-zA-Z0-9\-]*//g"` # strip out difficult ch if [ \( $WANTS_CLEAN -eq $TRUE \) -a \( $WANTS_BUILD -eq $FALSE \) ] ; then echo "Cleaning $PLATFORM...." - pushd .. - if [ \( $PLATFORM == "darwin" \) -a \( -d build-linux-i686/packages \) ] ; then - mv build-darwin-i386/packages packages + wdir=`pwd` + cd .. + if [ $PLATFORM == "darwin" ] ; then + if [ -d build-darwin-i386/packages ] ; then + mv build-darwin-i386/packages packages + fi rm -rf build-darwin-i386/* - mv packages build-darwin-i386 - elif [ \( $PLATFORM == "win32" \) -a \( -d build-vc100/packages \) ] ; then - echo "deleting work directory..." - mv build-vc100/packages packages - rm -rf build-vc100/* - mv packages build-vc100 - elif [ \( $PLATFORM == "linux32" \) -a \( -d build-linux-i686/packages \) ] ; then - mv build-linux-i686/packages packages - rm -rf build-linux-i686/* - mv packages build-linux-i686 + if [ -d packages ] ; then + mv packages build-darwin-i386/packages + fi + elif [ $PLATFORM == "win32" ] ; then + if [ -d build-vc100/packages ] ; then + mv build-vc100/packages packages + fi + rm -rf build-vc100/* + if [ -d packages ] ; then + mv packages build-vc100/packages + fi + elif [ $PLATFORM == "linux32" ] ; then + if [ -d build-linux-i686/packages ] ; then + mv build-linux-i686/packages packages + fi + rm -rf build-linux-i686/* + if [ -d packages ] ; then + mv packages build-linux-i686/packages + fi fi - find . -name "*.pyc" -exec rm {} \; - popd + cd $wdir fi if [ \( $WANTS_VERSION -eq $TRUE \) -o \( $WANTS_CONFIG -eq $TRUE \) ] ; then @@ -295,19 +306,19 @@ if [ $WANTS_CONFIG -eq $TRUE ] ; then echo "Configuring $PLATFORM..." if [ $WANTS_KDU -eq $TRUE ] ; then - KDU="-DUSE_KDU:BOOL=ON" + KDU="-DUSE_KDU:BOOL=ON -D:INSTALL_PROPRIETARY=TRUE" else - KDU="" + KDU="-USE_KDU:BOOL=OFF" fi if [ $WANTS_FMOD -eq $TRUE ] ; then FMOD="-DFMOD:BOOL=ON" else - FMOD="" + FMOD="-DFMOD:BOOL=OFF" fi if [ $WANTS_PACKAGE -eq $TRUE ] ; then PACKAGE="-DPACKAGE:BOOL=ON" else - PACKAGE="" + PACKAGE="-DPACKAGE:BOOL=OFF" fi if [ $PLATFORM == "darwin" ] ; then TARGET="Xcode" @@ -317,7 +328,7 @@ if [ $WANTS_CONFIG -eq $TRUE ] ; then TARGET="Visual Studio 10" fi - cmake -G "$TARGET" ../indra $FMOD $KDU $PACKAGE -DUNATTENDED:BOOL=ON -DLL_TESTS:BOOL=OFF -DWORD_SIZE:STRING=32 -DINSTALL_PROPRIETARY=TRUE -DCMAKE_BUILD_TYPE:STRING=$BTYPE -DROOT_PROJECT_NAME:STRING=Firestorm | tee $LOG + cmake -G "$TARGET" ../indra $FMOD $KDU $PACKAGE -DUNATTENDED:BOOL=ON -DLL_TESTS:BOOL=OFF -DWORD_SIZE:STRING=32 -DCMAKE_BUILD_TYPE:STRING=$BTYPE -DROOT_PROJECT_NAME:STRING=Firestorm | tee $LOG fi if [ $WANTS_BUILD -eq $TRUE ] ; then