[Boost-commit] svn:boost r55734 - branches/release

Subject: [Boost-commit] svn:boost r55734 - branches/release
From: ghost_at_[hidden]
Date: 2009-08-23 12:17:38

Author: vladimir_prus
Date: 2009-08-23 12:17:37 EDT (Sun, 23 Aug 2009)
New Revision: 55734
URL: http://svn.boost.org/trac/boost/changeset/55734

Log:
Merge: Emit clear error when using --layout=system with --build-type=complete.
Text files modified: 
   branches/release/Jamroot |    11 +++++++++++                             
   1 files changed, 11 insertions(+), 0 deletions(-)

Modified: branches/release/Jamroot
==============================================================================
--- branches/release/Jamroot	(original)
+++ branches/release/Jamroot	2009-08-23 12:17:37 EDT (Sun, 23 Aug 2009)
@@ -295,6 +295,17 @@
 }
 layout-$(layout) = true ;
 
+if $(layout) = system && $(build-type) = complete
+{
+    ECHO "error: Cannot use --layout=system with --build-type complete." ;
+    ECHO "error: Please used either --layout=versioned or --layout=tagged " ;
+    ECHO "error: if you wish to build multiple variants." ;
+    if ! [ modules.peek : NT ] 
+    {        
+        ECHO "error: Note that --layout=system is default on Unix starting with Boost 1.40." ;
+    }    
+    EXIT ;
+}
 
 # Possible stage only location.
 local stage-locate = [ MATCH "^--stagedir=(.*)" : [ modules.peek : ARGV ] ] ;