Adding in "ReleaseFS_open' autobuild target for non-kdu builds. Documentation & cleaning fixes.
Arrehn
parent
92e8080753
commit
2676fe01d3
|
|
@ -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.
|
||||
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
||||
|
|
|
|||
113
autobuild.xml
113
autobuild.xml
|
|
@ -1678,6 +1678,27 @@
|
|||
<string>ReleaseFS</string>
|
||||
</map>
|
||||
|
||||
<key>ReleaseFS_open</key>
|
||||
<map>
|
||||
<key>configure</key>
|
||||
<map>
|
||||
<key>arguments</key>
|
||||
<array>
|
||||
<string></string>
|
||||
</array>
|
||||
<key>command</key>
|
||||
<string>bash ../scripts/configure_firestorm.sh</string>
|
||||
<key>options</key>
|
||||
<array>
|
||||
<string></string>
|
||||
<string>--config</string>
|
||||
<string>--version</string>
|
||||
</array>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>ReleaseFS_open</string>
|
||||
</map>
|
||||
|
||||
<key>ReleaseOS</key>
|
||||
<map>
|
||||
<key>configure</key>
|
||||
|
|
@ -1859,6 +1880,7 @@
|
|||
<key>name</key>
|
||||
<string>Release</string>
|
||||
</map>
|
||||
|
||||
<key>ReleaseFS</key>
|
||||
<map>
|
||||
<key>build</key>
|
||||
|
|
@ -1886,6 +1908,33 @@
|
|||
<key>name</key>
|
||||
<string>ReleaseFS</string>
|
||||
</map>
|
||||
|
||||
<key>ReleaseFS_open</key>
|
||||
<map>
|
||||
<key>build</key>
|
||||
<map>
|
||||
<key>command</key>
|
||||
<string>../scripts/configure_firestorm.sh</string>
|
||||
<key>options</key>
|
||||
<array>
|
||||
<string>--build</string>
|
||||
<string>--package</string>
|
||||
<string>--platform darwin</string>
|
||||
<string>--fmod</string>
|
||||
</array>
|
||||
</map>
|
||||
<key>configure</key>
|
||||
` <map>
|
||||
<key>options</key>
|
||||
<array>
|
||||
<string>--fmod</string>
|
||||
<string>--platform darwin</string>
|
||||
</array>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>ReleaseFS_open</string>
|
||||
</map>
|
||||
|
||||
<key>ReleaseOS</key>
|
||||
<map>
|
||||
<key>build</key>
|
||||
|
|
@ -2070,6 +2119,32 @@
|
|||
<string>ReleaseFS</string>
|
||||
</map>
|
||||
|
||||
<key>ReleaseFS_open</key>
|
||||
<map>
|
||||
<key>build</key>
|
||||
<map>
|
||||
<key>command</key>
|
||||
<string>../scripts/configure_firestorm.sh</string>
|
||||
<key>options</key>
|
||||
<array>
|
||||
<string>--build</string>
|
||||
<string>--platform linux32</string>
|
||||
<string>--package</string>
|
||||
</array>
|
||||
</map>
|
||||
<key>configure</key>
|
||||
` <map>
|
||||
<key>options</key>
|
||||
<array>
|
||||
<string>--fmod</string>
|
||||
<string>--platform linux32</string>
|
||||
</array>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>ReleaseFS_open</string>
|
||||
</map>
|
||||
|
||||
|
||||
<key>ReleaseOS</key>
|
||||
<map>
|
||||
<key>build</key>
|
||||
|
|
@ -2342,6 +2417,44 @@
|
|||
<string>ReleaseFS</string>
|
||||
</map>
|
||||
|
||||
<key>ReleaseFS_open</key>
|
||||
<map>
|
||||
<key>build</key>
|
||||
<map>
|
||||
<key>arguments</key>
|
||||
<array>
|
||||
<string>Firestorm.sln</string>
|
||||
</array>
|
||||
<key>command</key>
|
||||
<string>msbuild.exe</string>
|
||||
<key>options</key>
|
||||
<array>
|
||||
<string>/p:Configuration=Release</string>
|
||||
<string>/flp:LogFile=logs\FirestormBuild_win32.log</string>
|
||||
<string>/flp1:errorsonly;LogFile=logs\FirestormBuild_win32.err</string>
|
||||
<string>/p:Platform=Win32</string>
|
||||
<string>/t:Build</string>
|
||||
<string>/p:useenv=true</string>
|
||||
<string>/verbosity:normal</string>
|
||||
<string>/toolsversion:4.0</string>
|
||||
<string>/p:"VCBuildAdditionalOptions= /incremental"</string>
|
||||
</array>
|
||||
</map>
|
||||
<key>configure</key>
|
||||
<map>
|
||||
<key>options</key>
|
||||
<array>
|
||||
<string>--fmod</string>
|
||||
<string>--package</string>
|
||||
<string>--version</string>
|
||||
<string>--platform win32</string>
|
||||
</array>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>ReleaseFS_open</string>
|
||||
</map>
|
||||
|
||||
|
||||
<key>ReleaseOS</key>
|
||||
<map>
|
||||
<key>build</key>
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
VERSION_VIEWER=2.6.9
|
||||
VERSION_VIEWER=2.6.1
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@
|
|||
</dict>
|
||||
</array>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>2.6.9.18325</string>
|
||||
<string>2.6.9.18380</string>
|
||||
<key>CSResourcesFileMapped</key>
|
||||
<true/>
|
||||
</dict>
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in New Issue