| OLD | NEW | 
|---|
| 1 """engine.SCons.Variables | 1 """engine.SCons.Variables | 
| 2 | 2 | 
| 3 This file defines the Variables class that is used to add user-friendly | 3 This file defines the Variables class that is used to add user-friendly | 
| 4 customizable variables to an SCons build. | 4 customizable variables to an SCons build. | 
| 5 """ | 5 """ | 
| 6 | 6 | 
| 7 # | 7 # | 
| 8 # Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 The SCons Foundat
     ion | 8 # Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 The SCons Foundat
     ion | 
| 9 # | 9 # | 
| 10 # Permission is hereby granted, free of charge, to any person obtaining | 10 # Permission is hereby granted, free of charge, to any person obtaining | 
| 11 # a copy of this software and associated documentation files (the | 11 # a copy of this software and associated documentation files (the | 
| 12 # "Software"), to deal in the Software without restriction, including | 12 # "Software"), to deal in the Software without restriction, including | 
| 13 # without limitation the rights to use, copy, modify, merge, publish, | 13 # without limitation the rights to use, copy, modify, merge, publish, | 
| 14 # distribute, sublicense, and/or sell copies of the Software, and to | 14 # distribute, sublicense, and/or sell copies of the Software, and to | 
| 15 # permit persons to whom the Software is furnished to do so, subject to | 15 # permit persons to whom the Software is furnished to do so, subject to | 
| 16 # the following conditions: | 16 # the following conditions: | 
| 17 # | 17 # | 
| 18 # The above copyright notice and this permission notice shall be included | 18 # The above copyright notice and this permission notice shall be included | 
| 19 # in all copies or substantial portions of the Software. | 19 # in all copies or substantial portions of the Software. | 
| 20 # | 20 # | 
| 21 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY | 21 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY | 
| 22 # KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE | 22 # KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE | 
| 23 # WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | 23 # WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | 
| 24 # NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE | 24 # NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE | 
| 25 # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION | 25 # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION | 
| 26 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION | 26 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION | 
| 27 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | 27 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | 
| 28 # | 28 # | 
| 29 | 29 | 
| 30 __revision__ = "src/engine/SCons/Variables/__init__.py 3603 2008/10/10 05:46:45 
     scons" | 30 __revision__ = "src/engine/SCons/Variables/__init__.py 3842 2008/12/20 22:59:52 
     scons" | 
| 31 | 31 | 
| 32 import os.path | 32 import os.path | 
| 33 import string | 33 import string | 
| 34 import sys | 34 import sys | 
| 35 | 35 | 
| 36 import SCons.Environment | 36 import SCons.Environment | 
| 37 import SCons.Errors | 37 import SCons.Errors | 
| 38 import SCons.Util | 38 import SCons.Util | 
| 39 import SCons.Warnings | 39 import SCons.Warnings | 
| 40 | 40 | 
| (...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 295     format_ = '\n%s: %s\n    default: %s\n    actual: %s\n    aliases: %s\n' | 295     format_ = '\n%s: %s\n    default: %s\n    actual: %s\n    aliases: %s\n' | 
| 296 | 296 | 
| 297     def FormatVariableHelpText(self, env, key, help, default, actual, aliases=[]
     ): | 297     def FormatVariableHelpText(self, env, key, help, default, actual, aliases=[]
     ): | 
| 298         # Don't display the key name itself as an alias. | 298         # Don't display the key name itself as an alias. | 
| 299         aliases = filter(lambda a, k=key: a != k, aliases) | 299         aliases = filter(lambda a, k=key: a != k, aliases) | 
| 300         if len(aliases)==0: | 300         if len(aliases)==0: | 
| 301             return self.format % (key, help, default, actual) | 301             return self.format % (key, help, default, actual) | 
| 302         else: | 302         else: | 
| 303             return self.format_ % (key, help, default, actual, aliases) | 303             return self.format_ % (key, help, default, actual, aliases) | 
| 304 | 304 | 
| OLD | NEW | 
|---|