Darwin config and manifest

Fri, 14 Jan 2011 16:53:49 -0800

author
Mark Palange <palange@lindenlab.com>
date
Fri, 14 Jan 2011 16:53:49 -0800
changeset 6
84d1f7811a8b
parent 4
5972e99cfce7
child 7
ea1df115253d

Darwin config and manifest

autobuild.xml file | annotate | diff | revisions
build-cmd.sh file | annotate | diff | revisions
     1.1 --- a/autobuild.xml	Fri Jan 14 15:33:40 2011 -0800
     1.2 +++ b/autobuild.xml	Fri Jan 14 16:53:49 2011 -0800
     1.3 @@ -59,7 +59,8 @@
     1.4            </map>
     1.5            <key>manifest</key>
     1.6            <array>
     1.7 -            <string>lib/libz.a</string>
     1.8 +            <string>lib/release/*.a</string>
     1.9 +            <string>lib/debug/*.a</string>
    1.10            </array>
    1.11            <key>name</key>
    1.12            <string>darwin</string>
     2.1 --- a/build-cmd.sh	Fri Jan 14 15:33:40 2011 -0800
     2.2 +++ b/build-cmd.sh	Fri Jan 14 16:53:49 2011 -0800
     2.3 @@ -44,6 +44,7 @@
     2.4  top="$(pwd)"
     2.5  cd "$BOOST_SOURCE_DIR"
     2.6  stage="$(pwd)/stage"
     2.7 +BOOST_BJAM_OPTIONS="--with-program_options --with-regex --with-date_time --with-filesystem"
     2.8  
     2.9  case "$AUTOBUILD_PLATFORM" in
    2.10      "windows")
    2.11 @@ -54,7 +55,7 @@
    2.12  	mkdir -p "$stage_debug"
    2.13  
    2.14  	cmd.exe /C bootstrap.bat
    2.15 -	./bjam --toolset=msvc-10.0 --with-program_options --with-regex --with-date_time --with-filesystem stage 
    2.16 +	./bjam --toolset=msvc-10.0 $BOOST_BJAM_OPTIONS stage
    2.17  	mv "$stage_lib/libboost_program_options-vc100-mt.lib" "$stage_release"
    2.18  	mv "$stage_lib/libboost_regex-vc100-mt.lib" "$stage_release"
    2.19  	mv "$stage_lib/libboost_date_time-vc100-mt.lib" "$stage_release"
    2.20 @@ -68,11 +69,26 @@
    2.21  	mv "$stage_lib/libboost_system-vc100-mt-gd.lib" "$stage_debug"
    2.22          ;;
    2.23      "darwin")
    2.24 -        ./configure --prefix="$stage"
    2.25 -        make
    2.26 -        make install
    2.27 -	mkdir -p "$stage/include/zlib"
    2.28 -	mv "$stage/include/"*.h "$stage/include/zlib/"
    2.29 +	stage_lib="$stage/lib"
    2.30 +	./bootstrap.sh --prefix=$(pwd)
    2.31 +
    2.32 +	./bjam toolset=darwin variant=release $BOOST_BJAM_OPTIONS stage
    2.33 +	stage_release="$stage_lib/release"
    2.34 +	mkdir -p "$stage_release"
    2.35 +	mv "$stage_lib/libboost_program_options.a" "$stage_release"
    2.36 +	mv "$stage_lib/libboost_regex.a" "$stage_release"
    2.37 +	mv "$stage_lib/libboost_date_time.a" "$stage_release"
    2.38 +	mv "$stage_lib/libboost_filesystem.a" "$stage_release"
    2.39 +	mv "$stage_lib/libboost_system.a" "$stage_release"
    2.40 +
    2.41 +	./bjam toolset=darwin variant=debug $BOOST_BJAM_OPTIONS stage
    2.42 +	stage_debug="$stage/lib/debug"
    2.43 +	mkdir -p "$stage_debug"
    2.44 +	mv "$stage_lib/libboost_program_options.a" "$stage_debug"
    2.45 +	mv "$stage_lib/libboost_regex.a" "$stage_debug"
    2.46 +	mv "$stage_lib/libboost_date_time.a" "$stage_debug"
    2.47 +	mv "$stage_lib/libboost_filesystem.a" "$stage_debug"
    2.48 +	mv "$stage_lib/libboost_system.a" "$stage_debug"
    2.49          ;;
    2.50      "linux")
    2.51          CFLAGS="-m32" CXXFLAGS="-m32" ./configure --prefix="$stage"

mercurial