|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r68592 - in trunk/tools/build/v2: . engine engine/boehm_gc engine/debian engine/modules engine/src
From: ghost_at_[hidden]
Date: 2011-02-01 03:16:48
Author: vladimir_prus
Date: 2011-02-01 03:16:47 EST (Tue, 01 Feb 2011)
New Revision: 68592
URL: http://svn.boost.org/trac/boost/changeset/68592
Log:
Kill 'engine/src', moving all content to 'engine'.
Added:
trunk/tools/build/v2/engine/Jambase
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/Jambase
trunk/tools/build/v2/engine/boehm_gc/
- copied from r68590, /trunk/tools/build/v2/engine/src/boehm_gc/
trunk/tools/build/v2/engine/boost-jam.spec
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/boost-jam.spec
trunk/tools/build/v2/engine/build.bat
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/build.bat
trunk/tools/build/v2/engine/build.jam
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/build.jam
trunk/tools/build/v2/engine/build.sh
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/build.sh
trunk/tools/build/v2/engine/build_vms.com
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/build_vms.com
trunk/tools/build/v2/engine/builtins.c
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/builtins.c
trunk/tools/build/v2/engine/builtins.h
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/builtins.h
trunk/tools/build/v2/engine/bump_version.py
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/bump_version.py
trunk/tools/build/v2/engine/class.c
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/class.c
trunk/tools/build/v2/engine/class.h
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/class.h
trunk/tools/build/v2/engine/command.c
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/command.c
trunk/tools/build/v2/engine/command.h
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/command.h
trunk/tools/build/v2/engine/compile.c
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/compile.c
trunk/tools/build/v2/engine/compile.h
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/compile.h
trunk/tools/build/v2/engine/debian/
- copied from r68590, /trunk/tools/build/v2/engine/src/debian/
trunk/tools/build/v2/engine/debug.c
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/debug.c
trunk/tools/build/v2/engine/debug.h
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/debug.h
trunk/tools/build/v2/engine/execcmd.h
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/execcmd.h
trunk/tools/build/v2/engine/execmac.c
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/execmac.c
trunk/tools/build/v2/engine/execnt.c
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/execnt.c
trunk/tools/build/v2/engine/execunix.c
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/execunix.c
trunk/tools/build/v2/engine/execvms.c
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/execvms.c
trunk/tools/build/v2/engine/expand.c
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/expand.c
trunk/tools/build/v2/engine/expand.h
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/expand.h
trunk/tools/build/v2/engine/filemac.c
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/filemac.c
trunk/tools/build/v2/engine/filent.c
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/filent.c
trunk/tools/build/v2/engine/fileos2.c
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/fileos2.c
trunk/tools/build/v2/engine/filesys.c
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/filesys.c
trunk/tools/build/v2/engine/filesys.h
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/filesys.h
trunk/tools/build/v2/engine/fileunix.c
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/fileunix.c
trunk/tools/build/v2/engine/filevms.c
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/filevms.c
trunk/tools/build/v2/engine/frames.c
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/frames.c
trunk/tools/build/v2/engine/frames.h
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/frames.h
trunk/tools/build/v2/engine/glob.c
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/glob.c
trunk/tools/build/v2/engine/hash.c
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/hash.c
trunk/tools/build/v2/engine/hash.h
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/hash.h
trunk/tools/build/v2/engine/hcache.c
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/hcache.c
trunk/tools/build/v2/engine/hcache.h
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/hcache.h
trunk/tools/build/v2/engine/hdrmacro.c
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/hdrmacro.c
trunk/tools/build/v2/engine/hdrmacro.h
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/hdrmacro.h
trunk/tools/build/v2/engine/headers.c
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/headers.c
trunk/tools/build/v2/engine/headers.h
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/headers.h
trunk/tools/build/v2/engine/jam.c
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/jam.c
trunk/tools/build/v2/engine/jam.h
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/jam.h
trunk/tools/build/v2/engine/jambase.c
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/jambase.c
trunk/tools/build/v2/engine/jambase.h
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/jambase.h
trunk/tools/build/v2/engine/jamgram.c
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/jamgram.c
trunk/tools/build/v2/engine/jamgram.h
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/jamgram.h
trunk/tools/build/v2/engine/jamgram.y
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/jamgram.y
trunk/tools/build/v2/engine/jamgram.yy
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/jamgram.yy
trunk/tools/build/v2/engine/jamgramtab.h
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/jamgramtab.h
trunk/tools/build/v2/engine/lists.c
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/lists.c
trunk/tools/build/v2/engine/lists.h
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/lists.h
trunk/tools/build/v2/engine/make.c
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/make.c
trunk/tools/build/v2/engine/make.h
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/make.h
trunk/tools/build/v2/engine/make1.c
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/make1.c
trunk/tools/build/v2/engine/md5.c
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/md5.c
trunk/tools/build/v2/engine/md5.h
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/md5.h
trunk/tools/build/v2/engine/mem.c
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/mem.c
trunk/tools/build/v2/engine/mem.h
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/mem.h
trunk/tools/build/v2/engine/mkjambase.c
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/mkjambase.c
trunk/tools/build/v2/engine/modules/
- copied from r68590, /trunk/tools/build/v2/engine/src/modules/
trunk/tools/build/v2/engine/modules.c
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/modules.c
trunk/tools/build/v2/engine/modules.h
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/modules.h
trunk/tools/build/v2/engine/native.c
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/native.c
trunk/tools/build/v2/engine/native.h
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/native.h
trunk/tools/build/v2/engine/newstr.c
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/newstr.c
trunk/tools/build/v2/engine/newstr.h
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/newstr.h
trunk/tools/build/v2/engine/option.c
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/option.c
trunk/tools/build/v2/engine/option.h
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/option.h
trunk/tools/build/v2/engine/output.c
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/output.c
trunk/tools/build/v2/engine/output.h
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/output.h
trunk/tools/build/v2/engine/parse.c
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/parse.c
trunk/tools/build/v2/engine/parse.h
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/parse.h
trunk/tools/build/v2/engine/patchlevel.h
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/patchlevel.h
trunk/tools/build/v2/engine/pathmac.c
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/pathmac.c
trunk/tools/build/v2/engine/pathsys.h
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/pathsys.h
trunk/tools/build/v2/engine/pathunix.c
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/pathunix.c
trunk/tools/build/v2/engine/pathvms.c
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/pathvms.c
trunk/tools/build/v2/engine/pwd.c
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/pwd.c
trunk/tools/build/v2/engine/pwd.h
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/pwd.h
trunk/tools/build/v2/engine/regexp.c
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/regexp.c
trunk/tools/build/v2/engine/regexp.h
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/regexp.h
trunk/tools/build/v2/engine/rules.c
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/rules.c
trunk/tools/build/v2/engine/rules.h
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/rules.h
trunk/tools/build/v2/engine/scan.c
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/scan.c
trunk/tools/build/v2/engine/scan.h
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/scan.h
trunk/tools/build/v2/engine/search.c
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/search.c
trunk/tools/build/v2/engine/search.h
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/search.h
trunk/tools/build/v2/engine/strings.c
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/strings.c
trunk/tools/build/v2/engine/strings.h
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/strings.h
trunk/tools/build/v2/engine/subst.c
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/subst.c
trunk/tools/build/v2/engine/timestamp.c
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/timestamp.c
trunk/tools/build/v2/engine/timestamp.h
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/timestamp.h
trunk/tools/build/v2/engine/variable.c
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/variable.c
trunk/tools/build/v2/engine/variable.h
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/variable.h
trunk/tools/build/v2/engine/w32_getreg.c
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/w32_getreg.c
trunk/tools/build/v2/engine/yyacc.c
- copied unchanged from r68590, /trunk/tools/build/v2/engine/src/yyacc.c
Removed:
trunk/tools/build/v2/engine/src/
Text files modified:
trunk/tools/build/v2/bootstrap.bat | 14 +++++++-------
trunk/tools/build/v2/bootstrap.sh | 10 +++++-----
2 files changed, 12 insertions(+), 12 deletions(-)
Modified: trunk/tools/build/v2/bootstrap.bat
==============================================================================
--- trunk/tools/build/v2/bootstrap.bat (original)
+++ trunk/tools/build/v2/bootstrap.bat 2011-02-01 03:16:47 EST (Tue, 01 Feb 2011)
@@ -6,20 +6,20 @@
REM (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
ECHO Bootstrapping the build engine
-if exist ".\engine\src\bin.ntx86\bjam.exe" del engine\src\bin.ntx86\bjam.exe
-if exist ".\engine\src\bin.ntx86_64\bjam.exe" del engine\src\bin.ntx86_64\bjam.exe
-cd engine\src
+if exist ".\engine\bin.ntx86\bjam.exe" del engine\bin.ntx86\bjam.exe
+if exist ".\engine\bin.ntx86_64\bjam.exe" del engine\bin.ntx86_64\bjam.exe
+cd engine
call .\build.bat %* > ..\..\bootstrap.log
@ECHO OFF
cd ..\..
-if exist ".\engine\src\bin.ntx86\bjam.exe" (
- copy .\engine\src\bin.ntx86\bjam.exe . > nul
+if exist ".\engine\bin.ntx86\bjam.exe" (
+ copy .\engine\bin.ntx86\bjam.exe . > nul
goto :bjam_built)
-if exist ".\engine\src\bin.ntx86_64\bjam.exe" (
- copy .\engine\src\bin.ntx86_64\bjam.exe . > nul
+if exist ".\engine\bin.ntx86_64\bjam.exe" (
+ copy .\engine\bin.ntx86_64\bjam.exe . > nul
goto :bjam_built)
goto :bjam_failure
Modified: trunk/tools/build/v2/bootstrap.sh
==============================================================================
--- trunk/tools/build/v2/bootstrap.sh (original)
+++ trunk/tools/build/v2/bootstrap.sh 2011-02-01 03:16:47 EST (Tue, 01 Feb 2011)
@@ -55,7 +55,7 @@
# Determine the toolset, if not already decided
if test "x$TOOLSET" = x; then
- guessed_toolset=`$my_dir/engine/src/build.sh --guess-toolset`
+ guessed_toolset=`$my_dir/engine/build.sh --guess-toolset`
case $guessed_toolset in
acc | darwin | gcc | como | mipspro | pathscale | pgi | qcc | vacpp )
TOOLSET=$guessed_toolset
@@ -96,7 +96,7 @@
if test "x$BJAM" = x; then
echo -n "Bootstrapping the build engine with toolset $TOOLSET... "
pwd=`pwd`
- (cd "$my_dir/engine/src" && ./build.sh "$TOOLSET") > bootstrap.log 2>&1
+ (cd "$my_dir/engine" && ./build.sh "$TOOLSET") > bootstrap.log 2>&1
if [ $? -ne 0 ]; then
echo
echo "Failed to bootstrap the build engine"
@@ -104,9 +104,9 @@
exit 1
fi
cd "$pwd"
- arch=`cd $my_dir/engine/src && ./bootstrap/jam0 -d0 -f build.jam --toolset=$TOOLSET --toolset-root= --show-locate-target && cd ..`
- BJAM="$my_dir/engine/src/$arch/bjam"
- echo "engine/src/$arch/bjam"
+ 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"
+ echo "engine/$arch/bjam"
cp "$BJAM" .
fi
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk