boost/build
2
0
Fork 0
mirror of https://github.com/boostorg/build.git synced 2026-02-16 01:12:13 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
[SVN r70616]
This commit is contained in:
Vladimir Prus
2011-03-27 10:30:33 +00:00
parent af27fd2f70
commit e585f3a6b6
3 changed files with 41 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
v2/build-system.jam
View File

@@ -543,14 +543,15 @@ local rule should-clean-project ( project )
#
################################################################################
{
{
if --version in $(.argv)
{
version.print ;
EXIT ;
}
version.verify-engine-version ;
load-configuration-files ;
local extra-properties ;

40
v2/build/version.jam
View File

@@ -6,26 +6,44 @@
import errors ;
import numbers ;
major = "2011" ;
minor = "04" ;
rule boost-build ( )
{
return "V2 (Milestone 12)" ;
return "$(major).$(minor)-svn" ;
}
rule jam ( )
{
local v = [ modules.peek : JAM_VERSION ] ;
return $(v:J=.) ;
}
rule print ( )
{
ECHO "Boost.Build" [ boost-build ] ;
ECHO "Boost.Jam" [ jam ] ;
if [ verify-engine-version ]
{
ECHO "Boost.Build" [ boost-build ] ;
}
}
rule verify-engine-version ( )
{
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.
#

16
v2/engine/patchlevel.h
View File

@@ -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"