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

Boost Jam code cleanup - minor stylistic build script changes.

Browse Source 
[SVN r79056]
This commit is contained in:
Jurko Gospodnetić
2012-06-24 12:06:44 +00:00
parent bd1a5eff25
commit 856e76157c
3 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
v2/engine/build.bat
View File

@@ -463,13 +463,17 @@ echo ###
set YYACC_SOURCES=yyacc.c
set MKJAMBASE_SOURCES=mkjambase.c
set BJAM_SOURCES=
set BJAM_SOURCES=%BJAM_SOURCES% command.c compile.c constants.c debug.c execcmd.c execnt.c filent.c function.c glob.c hash.c
set BJAM_SOURCES=%BJAM_SOURCES% hdrmacro.c headers.c jam.c jambase.c jamgram.c lists.c make.c make1.c
set BJAM_SOURCES=%BJAM_SOURCES% object.c option.c output.c parse.c pathunix.c regexp.c
set BJAM_SOURCES=%BJAM_SOURCES% rules.c scan.c search.c subst.c timestamp.c variable.c modules.c
set BJAM_SOURCES=%BJAM_SOURCES% strings.c filesys.c builtins.c md5.c pwd.c class.c w32_getreg.c native.c
set BJAM_SOURCES=%BJAM_SOURCES% modules/set.c modules/path.c modules/regex.c
set BJAM_SOURCES=%BJAM_SOURCES% modules/property-set.c modules/sequence.c modules/order.c
set BJAM_SOURCES=%BJAM_SOURCES% command.c compile.c constants.c debug.c
set BJAM_SOURCES=%BJAM_SOURCES% execcmd.c execnt.c filent.c function.c glob.c
set BJAM_SOURCES=%BJAM_SOURCES% hash.c hdrmacro.c headers.c jam.c jambase.c
set BJAM_SOURCES=%BJAM_SOURCES% jamgram.c lists.c make.c make1.c object.c
set BJAM_SOURCES=%BJAM_SOURCES% option.c output.c parse.c pathunix.c regexp.c
set BJAM_SOURCES=%BJAM_SOURCES% rules.c scan.c search.c subst.c timestamp.c
set BJAM_SOURCES=%BJAM_SOURCES% variable.c modules.c strings.c filesys.c
set BJAM_SOURCES=%BJAM_SOURCES% builtins.c md5.c pwd.c class.c w32_getreg.c
set BJAM_SOURCES=%BJAM_SOURCES% native.c modules/set.c modules/path.c
set BJAM_SOURCES=%BJAM_SOURCES% modules/regex.c modules/property-set.c
set BJAM_SOURCES=%BJAM_SOURCES% modules/sequence.c modules/order.c
set BJAM_UPDATE=
:Check_Update

7
v2/engine/build.jam
View File

@@ -376,7 +376,7 @@ toolset vc11 cl : /Fe /Fe /Fd /Fo : -D
[ opt --debug : /MTd /DEBUG /Z7 /Od /Ob0 /wd4996 ]
-I$(--python-include) -I$(--extra-include)
: kernel32.lib advapi32.lib user32.lib $(--python-lib[1]) ;
# First set the build commands and options according to the
# preset toolset.
toolset = [ MATCH --toolset=(.*) : $(ARGV) ] ;
@@ -710,7 +710,8 @@ SUFEXE ?= "" ;
yacc ?= [ GLOB $(PATH) : yacc$(SUFEXE) ] ;
yacc ?= [ GLOB $(PATH) : bison$(SUFEXE) ] ;
yacc ?= [ GLOB "$(ProgramFiles:J= )\\GnuWin32\\bin" "C:\\Program Files\\GnuWin32\\bin" : bison$(SUFEXE) ] ;
yacc ?= [ GLOB "$(ProgramFiles:J= )\\GnuWin32\\bin"
"C:\\Program Files\\GnuWin32\\bin" : bison$(SUFEXE) ] ;
yacc = $(yacc[1]) ;
switch $(yacc:D=:S=)
{
@@ -778,7 +779,7 @@ rule .jam
{
$(>).exe = [ .exe $(>) : $(jam.source) ] ;
DEPENDS all : $($(>).exe) ;
# Make a copy under the old name.
$(<).exe = $(<:S=$($(>).exe:S)) ;
LOCATE on $($(<).exe) = $(locate-target) ;

11
v2/engine/build.sh
View File

@@ -246,12 +246,11 @@ YYACC_SOURCES="yyacc.c"
MKJAMBASE_SOURCES="mkjambase.c"
BJAM_SOURCES="\
command.c compile.c constants.c debug.c execcmd.c function.c glob.c hash.c\
hdrmacro.c headers.c jam.c jambase.c jamgram.c lists.c make.c make1.c\
object.c option.c output.c parse.c pathunix.c regexp.c\
rules.c scan.c search.c subst.c timestamp.c variable.c modules.c\
strings.c filesys.c builtins.c pwd.c class.c native.c md5.c w32_getreg.c\
modules/set.c modules/path.c modules/regex.c modules/property-set.c\
modules/sequence.c modules/order.c"
hdrmacro.c headers.c jam.c jambase.c jamgram.c lists.c make.c make1.c object.c\
option.c output.c parse.c pathunix.c regexp.c rules.c scan.c search.c subst.c\
timestamp.c variable.c modules.c strings.c filesys.c builtins.c pwd.c class.c\
native.c md5.c w32_getreg.c modules/set.c modules/path.c modules/regex.c\
modules/property-set.c modules/sequence.c modules/order.c"
case $BOOST_JAM_TOOLSET in
mingw)
BJAM_SOURCES="${BJAM_SOURCES} execnt.c filent.c"