Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r70616 - in trunk/tools/build/v2: . build engine
From: ghost_at_[hidden]
Date: 2011-03-27 06:30:34


Author: vladimir_prus
Date: 2011-03-27 06:30:33 EDT (Sun, 27 Mar 2011)
New Revision: 70616
URL: http://svn.boost.org/trac/boost/changeset/70616

Log:
Set version to 2010.04-svn, and eliminate separate engine version.

Text files modified:
   trunk/tools/build/v2/build-system.jam | 7 ++++---
   trunk/tools/build/v2/build/version.jam | 36 +++++++++++++++++++++++++++---------
   trunk/tools/build/v2/engine/patchlevel.h | 16 ++++++++--------
   3 files changed, 39 insertions(+), 20 deletions(-)

Modified: trunk/tools/build/v2/build-system.jam
==============================================================================
--- trunk/tools/build/v2/build-system.jam (original)
+++ trunk/tools/build/v2/build-system.jam 2011-03-27 06:30:33 EDT (Sun, 27 Mar 2011)
@@ -543,14 +543,15 @@
 #
 ################################################################################
 
-{
+{
     if --version in $(.argv)
     {
         version.print ;
         EXIT ;
     }
-
-
+
+ version.verify-engine-version ;
+
     load-configuration-files ;
 
     local extra-properties ;

Modified: trunk/tools/build/v2/build/version.jam
==============================================================================
--- trunk/tools/build/v2/build/version.jam (original)
+++ trunk/tools/build/v2/build/version.jam 2011-03-27 06:30:33 EDT (Sun, 27 Mar 2011)
@@ -6,27 +6,45 @@
 import errors ;
 import numbers ;
 
+major = "2011" ;
+minor = "04" ;
 
 rule boost-build ( )
 {
- return "V2 (Milestone 12)" ;
+ return "$(major).$(minor)-svn" ;
 }
 
-
-rule jam ( )
+rule print ( )
 {
- local v = [ modules.peek : JAM_VERSION ] ;
- return $(v:J=.) ;
+ if [ verify-engine-version ]
+ {
+ ECHO "Boost.Build" [ boost-build ] ;
+ }
 }
 
-
-rule print ( )
+rule verify-engine-version ( )
 {
- ECHO "Boost.Build" [ boost-build ] ;
- ECHO "Boost.Jam" [ jam ] ;
+ local v = [ modules.peek : JAM_VERSION ] ;
+
+ if $(v[1]) != $(major) || $(v[2]) != $(minor)
+ {
+ local argv = [ modules.peek : ARGV ] ;
+ local e = $(argv[1]) ;
+ local l = [ modules.binding version ] ;
+ l = $(l:D) ;
+ l = $(l:D) ;
+ ECHO "warning: mismatched versions of Boost.Build engine and core" ;
+ ECHO "warning: Boost.Build engine ($(e)) is $(v:J=.)" ;
+ ECHO "warning: Boost.Build core (at $(l)) is" [ boost-build ] ;
+ }
+ else
+ {
+ return true ;
+ }
 }
 
 
+
 # Utility rule for testing whether all elements in a sequence are equal to 0.
 #
 local rule is-all-zeroes ( sequence * )

Modified: trunk/tools/build/v2/engine/patchlevel.h
==============================================================================
--- trunk/tools/build/v2/engine/patchlevel.h (original)
+++ trunk/tools/build/v2/engine/patchlevel.h 2011-03-27 06:30:33 EDT (Sun, 27 Mar 2011)
@@ -7,11 +7,11 @@
 /* Keep JAMVERSYM in sync with VERSION. */
 /* It can be accessed as $(JAMVERSION) in the Jamfile. */
 
-#define VERSION_MAJOR 3
-#define VERSION_MINOR 1
-#define VERSION_PATCH 19
-#define VERSION_MAJOR_SYM "03"
-#define VERSION_MINOR_SYM "1"
-#define VERSION_PATCH_SYM "19"
-#define VERSION "3.1.19"
-#define JAMVERSYM "JAMVERSION=3.1"
+#define VERSION_MAJOR 2011
+#define VERSION_MINOR 04
+#define VERSION_PATCH 0
+#define VERSION_MAJOR_SYM "2011"
+#define VERSION_MINOR_SYM "04"
+#define VERSION_PATCH_SYM "00"
+#define VERSION "2011.4"
+#define JAMVERSYM "JAMVERSION=2011.4"


Boost-Commit 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