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

Merge feature.jam changes into Python

Browse Source 
[SVN r56046]
This commit is contained in:
Vladimir Prus
2009-09-05 12:59:39 +00:00
parent 4ccf00b9a7
commit cb0f935cdb
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
v2/build/feature.py
View File

@@ -1,6 +1,6 @@
# Status: mostly ported.
# TODO: carry over tests.
# Base revision: 40480
# Base revision: 56043
#
# Copyright 2001, 2002, 2003 Dave Abrahams
# Copyright 2002, 2006 Rene Rivera
@@ -128,7 +128,17 @@ def set_default (feature, value):
feature = add_grist (feature)
f = __all_features [feature]
attributes = f['attributes']
bad_attribute = None
if "free" in attributes:
bad_attribute = "free"
elif "optional" in attributes:
bad_attribute = "optional"
if bad_attribute:
raise InvalidValue ("%s property %s cannot have a default" % (bad_attribute, feature))
if isinstance(value, list):
value = value[0]
@@ -370,7 +380,8 @@ def validate_value_string (feature, value_string):
values = [value_string]
if f['subfeatures']:
values = value_string.split('-')
if not value_string in f['subfeatures']:
values = value_string.split('-')
# An empty value is allowed for optional features
if not values[0] in f['values'] and \