[Boost-commit] svn:boost r62403 - trunk/tools/build/v2/tools

Subject: [Boost-commit] svn:boost r62403 - trunk/tools/build/v2/tools
From: steven_at_[hidden]
Date: 2010-06-03 11:29:24

Author: steven_watanabe
Date: 2010-06-03 11:29:23 EDT (Thu, 03 Jun 2010)
New Revision: 62403
URL: http://svn.boost.org/trac/boost/changeset/62403

Log:
Try to make sure that the paths for xsltproc are correct for a cygwin build of bjam.
Text files modified: 
   trunk/tools/build/v2/tools/boostbook.jam |     3 ++-                                     
   trunk/tools/build/v2/tools/xsltproc.jam  |    18 +++++++++++++++++-                      
   2 files changed, 19 insertions(+), 2 deletions(-)

Modified: trunk/tools/build/v2/tools/boostbook.jam
==============================================================================
--- trunk/tools/build/v2/tools/boostbook.jam	(original)
+++ trunk/tools/build/v2/tools/boostbook.jam	2010-06-03 11:29:23 EDT (Thu, 03 Jun 2010)
@@ -330,7 +330,8 @@
     {
         if [ os.name ] = CYGWIN
         {
-            result = [ path.make $(path:W) ] ;
+            local native-path = [ path.native $(path) ] ;
+            result = [ path.make $(native-path:W) ] ;
         }
     }
     return [ regex.replace $(result) " " "%20" ] ;

Modified: trunk/tools/build/v2/tools/xsltproc.jam
==============================================================================
--- trunk/tools/build/v2/tools/xsltproc.jam	(original)
+++ trunk/tools/build/v2/tools/xsltproc.jam	2010-06-03 11:29:23 EDT (Thu, 03 Jun 2010)
@@ -55,7 +55,7 @@
                       [ path.join [ path.parent $(file) ] xsltproc ] ] ;
         if [ os.name ] = CYGWIN
         {
-            cygdir = $(dir:W) ;
+            dir = $(dir:W) ;
         }
         local command =
             "\"$(xsltproc)\" \"$(dir)\\test.xsl\" \"$(dir)\\test.xml\" 2>&1" ;
@@ -120,6 +120,11 @@
         CATALOG = [ common.variable-setting-command XML_CATALOG_FILES : $(catalog:T) ] ;
     }
 
+    if [ os.on-windows ] && ! [ is-cygwin ]
+    {
+        action = $(action).windows ;
+    }
+
     $(action) $(target) : $(source) ;
 }
 
@@ -135,6 +140,11 @@
     return [ .xsltproc $(target) : $(source) $(stylesheet) : $(properties) : $(dirname) : xslt-xsltproc-dir ] ;
 }
 
+actions xslt-xsltproc.windows
+{
+    $(CATALOG) "$(NAME:E=xsltproc)" $(FLAGS) --xinclude -o "$(<)" "$(STYLESHEET:W)" "$(>:W)"
+}
+
 
 actions xslt-xsltproc bind STYLESHEET
 {
@@ -142,6 +152,12 @@
 }
 
 
+actions xslt-xsltproc-dir.windows bind STYLESHEET
+{
+    $(CATALOG) "$(NAME:E=xsltproc)" $(FLAGS) --xinclude -o "$(<:D)/" "$(STYLESHEET:W)" "$(>:W)"
+}
+
+
 actions xslt-xsltproc-dir bind STYLESHEET
 {
     $(CATALOG) "$(NAME:E=xsltproc)" $(FLAGS) --xinclude -o "$(<:D)/" "$(STYLESHEET:T)" "$(>:T)"