FWGS/waf
2
0
Fork 0
mirror of https://gitlab.com/ita1024/waf.git synced 2024-12-23 01:35:08 +01:00
Code Issues Projects Releases Wiki Activity

Remove Options.platform and Options.cmds

Browse Source
This commit is contained in:
Thomas Nagy 2016-06-25 13:55:13 +02:00
parent 3c132ad97a
commit a2ca4b6dab
No known key found for this signature in database
GPG Key ID: 67A565EDFDF90E64
2 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ChangeLog
View File

@ -39,16 +39,19 @@ NEW IN WAF 1.9
* API changes: * API changes:
- The minimum Python version required is Python 2.5 - The minimum Python version required is Python 2.5
- Add Task.get_cwd() - Add Task.get_cwd()
- Remove the duplicate split() functions from Utils
- Remove the command called "update" - Remove the command called "update"
- Remove Utils.nogc - Remove unused variables and functions:
- Remove Configure.err_handler - TaskBase.attr()
- Remove TaskBase.attr() which was never used - Build.POST_BOTH
- Remove Build.POST_BOTH which was never used - Options.platform
- Remove Task.dep_vars as it is never used (define Task.vars on instances if necessary) - Options.cmds
- Task.dep_vars (define Task.vars on instances if necessary)
- Utils.nogc
- Configure.err_handler
- All duplicate split() functions from Utils
- Remove the unused attribute 'mac_resources', use 'mac_files' instead (see demos/mac_app) - Remove the unused attribute 'mac_resources', use 'mac_files' instead (see demos/mac_app)
- Remove qt4 and kde4 from the default modules - Remove qt4 and kde4 from the default modules
- Refactored msvc.py - Refactor msvc.py
- Task.sig_vars, Task.sig_explit_deps and Task.sig_implicit_deps return None - Task.sig_vars, Task.sig_explit_deps and Task.sig_implicit_deps return None
- Use relative paths in apply_incpaths by default (and absolute ones when paths cross drives) - Use relative paths in apply_incpaths by default (and absolute ones when paths cross drives)
- Modify Utils.run_once so that it accepts a list of *args - Modify Utils.run_once so that it accepts a list of *args

30
waflib/Options.py
View File

@ -1,30 +1,21 @@
#!/usr/bin/env python #!/usr/bin/env python
# encoding: utf-8 # encoding: utf-8
# Scott Newton, 2005 (scottn) # Scott Newton, 2005 (scottn)
# Thomas Nagy, 2006-2010 (ita) # Thomas Nagy, 2006-2016 (ita)
""" """
Support for waf command-line options Support for waf command-line options
Provides default command-line options, Provides default and command-line options, as well the command
as well as custom ones, used by the ``options`` wscript function. that reads the ``options`` wscript function.
""" """
import os, tempfile, optparse, sys, re import os, tempfile, optparse, sys, re
from waflib import Logs, Utils, Context, Errors from waflib import Logs, Utils, Context, Errors
cmds = 'distclean configure build install clean uninstall check dist distcheck'.split()
"""
Constant representing the default waf commands displayed in::
$ waf --help
"""
options = {} options = {}
""" """
A dictionary representing the command-line options:: A global dictionary representing the command-line options::
$ waf --foo=bar $ waf --foo=bar
@ -32,18 +23,21 @@ A dictionary representing the command-line options::
commands = [] commands = []
""" """
List of commands to execute extracted from the command-line. This list is consumed during the execution, see :py:func:`waflib.Scripting.run_commands`. List of commands to execute extracted from the command-line. This list
is consumed during the execution by :py:func:`waflib.Scripting.run_commands`.
""" """
envvars = [] envvars = []
""" """
List of environment variable declarations placed after the Waf executable name. List of environment variable declarations placed after the Waf executable name.
These are detected by searching for "=" in the rest arguments. These are detected by searching for "=" in the remaining arguments.
You probably do not want to use this.
""" """
lockfile = os.environ.get('WAFLOCK', '.lock-waf_%s_build' % sys.platform) lockfile = os.environ.get('WAFLOCK', '.lock-waf_%s_build' % sys.platform)
platform = Utils.unversioned_sys_platform() """
Name of the lock file that marks a project as configured
"""
class opt_parser(optparse.OptionParser): class opt_parser(optparse.OptionParser):
""" """
@ -133,7 +127,7 @@ class OptionsContext(Context.Context):
default_prefix = getattr(Context.g_module, 'default_prefix', os.environ.get('PREFIX')) default_prefix = getattr(Context.g_module, 'default_prefix', os.environ.get('PREFIX'))
if not default_prefix: if not default_prefix:
if platform == 'win32': if Utils.unversioned_sys_platform() == 'win32':
d = tempfile.gettempdir() d = tempfile.gettempdir()
default_prefix = d[0].upper() + d[1:] default_prefix = d[0].upper() + d[1:]
# win32 preserves the case, but gettempdir does not # win32 preserves the case, but gettempdir does not