diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-30 22:17:36 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-30 22:17:36 +0000 |
| commit | 7ef735ae2811757a4883f1664fd5f8ab9773b477 (patch) | |
| tree | ee914997913fcda6b8dedd29089245056c18fedf /third_party/scons/scons-local/SCons/Builder.py | |
| parent | 08cfdbb67a38a68eeb2e6e5a6a32e84148aea39d (diff) | |
| download | chromium_src-7ef735ae2811757a4883f1664fd5f8ab9773b477.zip chromium_src-7ef735ae2811757a4883f1664fd5f8ab9773b477.tar.gz chromium_src-7ef735ae2811757a4883f1664fd5f8ab9773b477.tar.bz2 | |
Update to SCons 1.2.0.
Review URL: http://codereview.chromium.org/17024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7511 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/scons/scons-local/SCons/Builder.py')
| -rw-r--r-- | third_party/scons/scons-local/SCons/Builder.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/third_party/scons/scons-local/SCons/Builder.py b/third_party/scons/scons-local/SCons/Builder.py index 141d9d9..97aabb4 100644 --- a/third_party/scons/scons-local/SCons/Builder.py +++ b/third_party/scons/scons-local/SCons/Builder.py @@ -98,7 +98,7 @@ There are the following methods for internal use within this module: # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Builder.py 3603 2008/10/10 05:46:45 scons" +__revision__ = "src/engine/SCons/Builder.py 3842 2008/12/20 22:59:52 scons" import UserDict import UserList @@ -232,7 +232,7 @@ def Builder(**kw): if kw.has_key('generator'): if kw.has_key('action'): raise UserError, "You must not specify both an action and a generator." - kw['action'] = SCons.Action.CommandGeneratorAction(kw['generator']) + kw['action'] = SCons.Action.CommandGeneratorAction(kw['generator'], {}) del kw['generator'] elif kw.has_key('action'): source_ext_match = kw.get('source_ext_match', 1) @@ -240,7 +240,7 @@ def Builder(**kw): del kw['source_ext_match'] if SCons.Util.is_Dict(kw['action']): composite = DictCmdGenerator(kw['action'], source_ext_match) - kw['action'] = SCons.Action.CommandGeneratorAction(composite) + kw['action'] = SCons.Action.CommandGeneratorAction(composite, {}) kw['src_suffix'] = composite.src_suffixes() else: kw['action'] = SCons.Action.Action(kw['action']) |