[Boost-commit] svn:boost r86519 - in branches/release: . tools tools/build tools/build/v2 tools/build/v2/build

Subject: [Boost-commit] svn:boost r86519 - in branches/release: . tools tools/build tools/build/v2 tools/build/v2/build
From: jhunold_at_[hidden]
Date: 2013-10-29 13:19:33

Author: jhunold
Date: 2013-10-29 13:19:33 EDT (Tue, 29 Oct 2013)
New Revision: 86519
URL: http://svn.boost.org/trac/boost/changeset/86519

Log:
Merge 84402 from ^/trunk

  ------------------------------------------------------------------------
  r84402 | jhunold | 2013-05-21 14:23:20 +0200 (Di, 21 Mai 2013) | 4 lines
  
  Fix: cache file loading and saving must use native paths
  
  Fixes caching at least on Windows platform
  
  ------------------------------------------------------------------------

Properties modified: 
   branches/release/   (props changed)
   branches/release/tools/   (props changed)
   branches/release/tools/build/   (props changed)
   branches/release/tools/build/v2/   (props changed)
Text files modified: 
   branches/release/tools/build/v2/build/config-cache.jam |     5 +++--                                   
   1 files changed, 3 insertions(+), 2 deletions(-)

Modified: branches/release/tools/build/v2/build/config-cache.jam
==============================================================================
--- branches/release/tools/build/v2/build/config-cache.jam	Tue Oct 29 13:18:12 2013	(r86518)
+++ branches/release/tools/build/v2/build/config-cache.jam	2013-10-29 13:19:33 EDT (Tue, 29 Oct 2013)	(r86519)
@@ -23,7 +23,8 @@
 {
     if $(.cache-file)
     {
-        local target = <new-cache-file>$(.cache-file) ;
+        local cache-file-native = [ path.native $(.cache-file) ] ;
+        local target = <new-cache-file>$(cache-file-native) ;
         local contents = "# Automatically generated by Boost.Build.\n# Do not edit.\n\nmodule config-cache {\n" ;
         for local var in $(.all-vars)
         {
@@ -54,7 +55,7 @@
     {
         errors.error duplicate load of cache file ;
     }
-    cache-file = $(cache-file) ;
+    cache-file = [ path.native $(cache-file) ] ;
     if [ path.exists $(cache-file) ] && ! ( --reconfigure in [ modules.peek : ARGV ] )
     {
         include <old-cache-file>$(cache-file) ;