|
Boost-Build : |
From: Jurko GospodnetiÄ (jurko.gospodnetic_at_[hidden])
Date: 2008-06-30 07:56:56
Hi Rene.
> I've lost track of the rest of the conversation so if you are going to
> make changes to msvc.jam for the cygwin bash shell case, please pass
> them by me first.
Here's a patch correcting Cygwin shell related issues mentioned in
this thread as well as in 'absolute include path for bjam with msvc in
cygwin'.
Could you please check it and say it its ok to commit?
It fixes the shell invocation incantation used in the cygwin shell as
well as correctly transforms include paths used on command lines when
invoking msvc tools to native Windows instead of cygwin paths.
Best regards,
Jurko GospodnetiÄ
Index: tools/build/v2/tools/msvc.jam
===================================================================
--- tools/build/v2/tools/msvc.jam (revision 46894)
+++ tools/build/v2/tools/msvc.jam (working copy)
@@ -388,7 +388,7 @@
if ! [ os.name ] in NT
{
setup-prefix = "cmd.exe /S /C call " ;
- setup-suffix = " >nul \"&&\" " ;
+ setup-suffix = " \">nul\" \"&&\" " ;
}
for local c in $(cpu)
@@ -794,7 +794,7 @@
rule get-rspline ( target : lang-opt )
{
- CC_RSPLINE on $(target) = [ on $(target) return $(lang-opt) -U$(UNDEFS) $(CFLAGS) $(C++FLAGS) $(OPTIONS) -c $(nl)-D$(DEFINES) $(nl)\"-I$(INCLUDES)\" ] ;
+ CC_RSPLINE on $(target) = [ on $(target) return $(lang-opt) -U$(UNDEFS) $(CFLAGS) $(C++FLAGS) $(OPTIONS) -c $(nl)-D$(DEFINES) $(nl)\"-I$(INCLUDES:W)\" ] ;
}
@@ -879,7 +879,7 @@
actions compile.rc
{
- $(.RC) -l 0x409 -U$(UNDEFS) -D$(DEFINES) -I"$(INCLUDES)" -fo "$(<:W)" "$(>:W)"
+ $(.RC) -l 0x409 -U$(UNDEFS) -D$(DEFINES) -I"$(INCLUDES:W)" -fo "$(<:W)" "$(>:W)"
}
@@ -889,7 +889,7 @@
actions compile.idl
{
- $(.IDL) /nologo @"@($(<[1]:W).rsp:E=$(nl)"$(>:W)" $(nl)-D$(DEFINES) $(nl)"-I$(INCLUDES)" $(nl)-U$(UNDEFS) $(nl)$(MIDLFLAGS) $(nl)/tlb "$(<[1]:W)" $(nl)/h "$(<[2]:W)" $(nl)/iid "$(<[3]:W)" $(nl)/proxy "$(<[4]:W)" $(nl)/dlldata "$(<[5]:W)")"
+ $(.IDL) /nologo @"@($(<[1]:W).rsp:E=$(nl)"$(>:W)" $(nl)-D$(DEFINES) $(nl)"-I$(INCLUDES:W)" $(nl)-U$(UNDEFS) $(nl)$(MIDLFLAGS) $(nl)/tlb "$(<[1]:W)" $(nl)/h "$(<[2]:W)" $(nl)/iid "$(<[3]:W)" $(nl)/proxy "$(<[4]:W)" $(nl)/dlldata "$(<[5]:W)")"
$(TOUCH_FILE) "$(<[4]:W)"
$(TOUCH_FILE) "$(<[5]:W)"
}
Boost-Build 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