Update of /cvsroot/boost/boost/tools/build/v2/tools
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv18868
Modified Files:
msvc.jam
Log Message:
- New "cc-compile" rule in msvc.jam to reduce code duplication in actions
- Minor whitespace fixes in msvc.jam:
- tabs > spaces
- trailing whitespace has been removed
Index: msvc.jam
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/v2/tools/msvc.jam,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- msvc.jam 25 Jun 2006 10:06:30 -0000 1.84
+++ msvc.jam 29 Jun 2006 21:50:00 -0000 1.85
@@ -355,12 +355,12 @@
{
flags msvc.link .MT $(cond) :
$(command[$(i)])$(manifest-tool) -nologo ;
}
- else
- {
+ else
+ {
flags msvc.link .MT $(cond) : $(manifest-tool) -nologo ;
- }
+ }
}
- }
+ }
# Set version-specific flags
configure-version-specific $(version) : $(condition) ;
@@ -577,41 +577,44 @@
flags msvc.compile PCH_HEADER <pch>on : <pch-header> ;
flags msvc.compile PCH_FILE <pch>on : <pch-file> ;
-rule compile.c ( targets + : sources * : properties * )
+local rule cc-compile ( targets + : sources * : rsp-content * : suffix * )
{
- DEPENDS $(<) : [ on $(<) return $(PCH_HEADER) ] ;
- DEPENDS $(<) : [ on $(<) return $(PCH_FILE) ] ;
+ CC_RSPLINE on $(<) = [ on $(<) return -U$(UNDEFS) $(CFLAGS) $(C++FLAGS)
$(OPTIONS) -c $(nl)-D$(DEFINES) $(nl)"-I$(INCLUDES)" -Yu"$(PCH_HEADER:D=)" ] ;
}
-rule compile.c++ ( targets + : sources * : properties * )
+actions cc-compile
{
- DEPENDS $(<) : [ on $(<) return $(PCH_HEADER) ] ;
- DEPENDS $(<) : [ on $(<) return $(PCH_FILE) ] ;
+ $(.CC) @"@($(<[1]:W).rsp:E="$(>)"$(nl) -Fo"$(<[1]:W)"$(nl) $(CC_RSPLINE))"
}
-rule compile.pch ( targets + : sources * : properties * )
+local rule cc-compile-c-c++ ( targets + : sources * : lang-opt )
{
- DEPENDS $(<) : [ on $(<) return $(PCH_SOURCE) ] ;
+ DEPENDS $(<) : [ on $(<) return $(PCH_HEADER) ] ;
+ DEPENDS $(<) : [ on $(<) return $(PCH_FILE) ] ;
+ cc-compile $(targets) : $(sources)
+ : [ on $(<) return "$(>)"$(nl) $(CC_RSPLINE) ]
+ : [ on $(<) return $(lang-opt) -Fp"$(PCH_FILE:W)" ] ;
}
-
# The actions differ only by explicit selection of input language
-actions compile.c bind PCH_HEADER PCH_FILE
+rule compile.c ( targets + : sources * : properties * )
{
- $(.CC) -TC -U$(UNDEFS) $(CFLAGS) $(OPTIONS)
@"@($(<[1]:W).rsp:E=$(nl)"$(>)" $(nl)-D$(DEFINES) $(nl)"-I$(INCLUDES)")" -c
-Fo"$(<[1]:W)" -Yu"$(PCH_HEADER:D=)" -Fp"$(PCH_FILE:W)"
+ cc-compile-c-c++ $(<) : $(>) : -TC ;
}
-actions compile.c++ bind PCH_HEADER PCH_FILE
+rule compile.c++ ( targets + : sources * : properties * )
{
- $(.CC) -TP -U$(UNDEFS) $(CFLAGS) $(C++FLAGS) $(OPTIONS)
@"@($(<[1]:W).rsp:E=$(nl)"$(>)" $(nl)-D$(DEFINES) $(nl)"-I$(INCLUDES)")" -c
-Fo"$(<[1]:W)" -Yu"$(PCH_HEADER:D=)" -Fp"$(PCH_FILE:W)"
+ cc-compile-c-c++ $(<) : $(>) : -TP ;
}
-actions compile.pch bind PCH_SOURCE
+rule compile.pch ( targets + : sources * : properties * )
{
- $(.CC) -TP -U$(UNDEFS) $(CFLAGS) $(C++FLAGS) $(OPTIONS)
@"@($(<[1]:W).rsp:E=$(nl)"$(PCH_SOURCE:W)" $(nl)-D$(DEFINES)
$(nl)"-I$(INCLUDES)")" -c -Fo"$(<[1]:W)" /Yc"$(>[1]:D=)" -Fp"$(<[2]:W)"
+ DEPENDS $(<) : [ on $(<) return $(PCH_SOURCE) ] ;
+ cc-compile $(<) : $(>)
+ : [ on $(<) return $(nl)"$(PCH_SOURCE:W)" $(CC_RSPLINE) ]
+ : [ on $(<) return -Yc"$(>[1]:D=)" -TP -Fp"$(<[2]:W)" ] ;
}
-
actions compile.rc
{
$(.RC) -l 0x409 -U$(UNDEFS) -D$(DEFINES) -I"$(INCLUDES)" -fo "$(<:W)"
"$(>:W)"
@@ -718,7 +721,7 @@
if exist "$(<[1]).manifest" (
$(.MT) -manifest "$(<[1]).manifest" "-outputresource:$(<[1]);1"
)
- }
+ }
actions link.dll bind DEF_FILE
{
@@ -726,7 +729,7 @@
if exist "$(<[1]).manifest" (
$(.MT) -manifest "$(<[1]).manifest" "-outputresource:$(<[1]);2"
)
- }
+ }
}
else
{
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
