Updated windows build scritp and autobuild manifest

Fri, 14 Jan 2011 14:25:03 -0800

author
Mark Palange (Mani) <palange@lindenlab.com>
date
Fri, 14 Jan 2011 14:25:03 -0800
changeset 2
9d5907e78bde
parent 1
5d2fab2fd055
child 3
d030c0164d9c

Updated windows build scritp and autobuild manifest

autobuild.xml file | annotate | diff | revisions
build-cmd.sh file | annotate | diff | revisions
     1.1 --- a/autobuild.xml	Wed Jan 12 16:44:39 2011 -0800
     1.2 +++ b/autobuild.xml	Fri Jan 14 14:25:03 2011 -0800
     1.3 @@ -37,6 +37,7 @@
     1.4            <key>manifest</key>
     1.5            <array>
     1.6              <string>LICENSES/boost.txt</string>
     1.7 +            <string>include/boost/*</string>
     1.8            </array>
     1.9            <key>name</key>
    1.10            <string>common</string>
    1.11 @@ -102,8 +103,8 @@
    1.12            </map>
    1.13            <key>manifest</key>
    1.14            <array>
    1.15 -            <string>lib/debug/zlibd.lib</string>
    1.16 -            <string>lib/release/zlib.lib</string>
    1.17 +            <string>lib/release/*.lib</string>
    1.18 +            <string>lib/debug/*.lib</string>
    1.19            </array>
    1.20            <key>name</key>
    1.21            <string>windows</string>
     2.1 --- a/build-cmd.sh	Wed Jan 12 16:44:39 2011 -0800
     2.2 +++ b/build-cmd.sh	Fri Jan 14 14:25:03 2011 -0800
     2.3 @@ -26,16 +26,20 @@
     2.4  eval "$("$AUTOBUILD" source_environment)"
     2.5  set -x
     2.6  
     2.7 -fetch_archive "$BOOST_URL" "$BOOST_ARCHIVE" "$BOOST_MD5"
     2.8 -extract "$BOOST_ARCHIVE"
     2.9 +#if [ -f "$BOOST_SOURCE_DIR" ] ; then
    2.10 +    fetch_archive "$BOOST_URL" "$BOOST_ARCHIVE" "$BOOST_MD5"
    2.11 +    extract "$BOOST_ARCHIVE"
    2.12 +#fi
    2.13  
    2.14  # Add boost coroutine to the linden lab boost build
    2.15  COROUTINE_TAR=boost-coroutine-2009-12-01.tar.gz
    2.16  tar xzf "$COROUTINE_TAR"
    2.17 -cd boost-coroutine
    2.18 -patch -p1 < "boost-coroutine-2009-12-01.patch"
    2.19 -patch -p1 < "boost-coroutine-linden.patch"
    2.20 -cp -rv boost/coroutine "$BOOST_SOURCE_DIR/boost/coroutine"
    2.21 +cd boost-coroutine 
    2.22 +# disabled patching - the patches are applied in the archive.
    2.23 +# patch -p1 < "../boost-coroutine-2009-12-01.patch"
    2.24 +# patch -p1 < "../boost-coroutine-linden.patch"
    2.25 +cp -rv boost/coroutine "../$BOOST_SOURCE_DIR/boost"
    2.26 +cd ..
    2.27  
    2.28  top="$(pwd)"
    2.29  cd "$BOOST_SOURCE_DIR"
    2.30 @@ -43,8 +47,25 @@
    2.31  
    2.32  case "$AUTOBUILD_PLATFORM" in
    2.33      "windows")
    2.34 +	stage_lib="$stage/lib"
    2.35 +	stage_release="$stage_lib/release"
    2.36 +	stage_debug="$stage/lib/debug"
    2.37 +	mkdir -p "$stage_release"
    2.38 +	mkdir -p "$stage_debug"
    2.39 +
    2.40  	cmd.exe /C bootstrap.bat
    2.41 -	./bjam --toolset=msvc-10.0 --with-program_options --with-regex --with-python --with-signals stage 
    2.42 +	./bjam --toolset=msvc-10.0 --with-program_options --with-regex --with-date_time --with-filesystem stage 
    2.43 +	mv "$stage_lib/libboost_program_options-vc100-mt.lib" "$stage_release"
    2.44 +	mv "$stage_lib/libboost_regex-vc100-mt.lib" "$stage_release"
    2.45 +	mv "$stage_lib/libboost_date_time-vc100-mt.lib" "$stage_release"
    2.46 +	mv "$stage_lib/libboost_filesystem-vc100-mt.lib" "$stage_release"
    2.47 +	mv "$stage_lib/libboost_system-vc100-mt.lib" "$stage_release"
    2.48 +
    2.49 +	mv "$stage_lib/libboost_program_options-vc100-mt-gd.lib" "$stage_debug"
    2.50 +	mv "$stage_lib/libboost_regex-vc100-mt-gd.lib" "$stage_debug"
    2.51 +	mv "$stage_lib/libboost_date_time-vc100-mt-gd.lib" "$stage_debug"
    2.52 +	mv "$stage_lib/libboost_filesystem-vc100-mt-gd.lib" "$stage_debug"
    2.53 +	mv "$stage_lib/libboost_filesystem-vc100-mt-gd.lib" "$stage_debug"
    2.54          ;;
    2.55      "darwin")
    2.56          ./configure --prefix="$stage"

mercurial