boost/build
2
0
Fork 0
mirror of https://github.com/boostorg/build.git synced 2026-02-15 00:52:16 +00:00
Code Issues Projects Releases Wiki Activity

Install both "b2" and "bjam".

Browse Source 
[SVN r70624]
This commit is contained in:
Vladimir Prus
2011-03-27 11:28:55 +00:00
parent fa23f3a5c1
commit 024fdef13d
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
v2/Jamroot.jam
View File

@@ -15,7 +15,7 @@ if [ os.on-windows ]
package.install boost-build-engine boost-build
: # properties
: # binaries
bjam$(ext)
b2$(ext) bjam$(ext)
;
local e1 = [ path.glob-tree $(SELF)/example : * : . .svn ] ;

8
v2/bootstrap.bat
View File

@@ -14,11 +14,13 @@ call .\build.bat %* > ..\..\bootstrap.log
@ECHO OFF
cd ..
if exist ".\engine\bin.ntx86\bjam.exe" (
if exist ".\engine\bin.ntx86\b2.exe" (
copy .\engine\bin.ntx86\b2.exe . > nul
copy .\engine\bin.ntx86\bjam.exe . > nul
goto :bjam_built)
if exist ".\engine\bin.ntx86_64\bjam.exe" (
if exist ".\engine\bin.ntx86_64\b2.exe" (
copy .\engine\bin.ntx86_64\b2.exe . > nul
copy .\engine\bin.ntx86_64\bjam.exe . > nul
goto :bjam_built)
@@ -29,7 +31,7 @@ goto :bjam_failure
ECHO.
ECHO Bootstrapping is done. To build, run:
ECHO.
ECHO .\bjam --prefix=DIR install
ECHO .\b2 --prefix=DIR install
ECHO.
goto :end

5
v2/bootstrap.sh
View File

@@ -105,15 +105,16 @@ if test "x$BJAM" = x; then
fi
cd "$pwd"
arch=`cd $my_dir/engine && ./bootstrap/jam0 -d0 -f build.jam --toolset=$TOOLSET --toolset-root= --show-locate-target && cd ..`
BJAM="$my_dir/engine/$arch/bjam"
BJAM="$my_dir/engine/$arch/b2"
echo "engine/$arch/bjam"
cp "$BJAM" .
cp "$my_dir/engine/$arch/bjam" .
fi
cat << EOF
Bootstrapping is done. To build and install, run:
./bjam install --prefix=<DIR>
./b2 install --prefix=<DIR>
EOF