diff options
| author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-25 22:27:54 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-25 22:27:54 +0000 |
| commit | 0581263d521822e077525141a67e041605003546 (patch) | |
| tree | b35e2fcc3c0055256ad23e56033870da60f121f1 /webkit | |
| parent | a836276d37db02eb45ffa22208d07b5229321468 (diff) | |
| download | chromium_src-0581263d521822e077525141a67e041605003546.zip chromium_src-0581263d521822e077525141a67e041605003546.tar.gz chromium_src-0581263d521822e077525141a67e041605003546.tar.bz2 | |
Eliminate duplicate argument to action_jsconfig.py
Review URL: http://codereview.chromium.org/27170
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10392 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rwxr-xr-x | webkit/build/action_jsconfig.py | 14 | ||||
| -rw-r--r-- | webkit/webkit.gyp | 2 |
2 files changed, 7 insertions, 9 deletions
diff --git a/webkit/build/action_jsconfig.py b/webkit/build/action_jsconfig.py index 2160983..7ddc12a 100755 --- a/webkit/build/action_jsconfig.py +++ b/webkit/build/action_jsconfig.py @@ -6,8 +6,7 @@ # usage: action_jsconfig.py JS_ENGINE OUTPUT_DIR CONFIG_H_IN FILES_TO_COPY # JS_ENGINE may be v8 at present. jsc will be added in the future. -# CONFIG_H_DIR is the directory to put config.h in. -# OUTPUT_DIR is the directory to put other files in. +# OUTPUT_DIR is the directory to put files in. # CONFIG_H_IN is the path to config.h.in upon which config.h will be based. # FILES_TO_COPY is a list of additional headers to be copied. It may be empty. @@ -17,14 +16,13 @@ import os.path import shutil import sys -assert len(sys.argv) >= 5 +assert len(sys.argv) >= 4 js_engine = sys.argv[1] -config_h_dir = sys.argv[2] -output_dir = sys.argv[3] -config_h_in_path = sys.argv[4] -files_to_copy = sys.argv[5:] +output_dir = sys.argv[2] +config_h_in_path = sys.argv[3] +files_to_copy = sys.argv[4:] -config_h_path = os.path.join(config_h_dir, 'config.h') +config_h_path = os.path.join(output_dir, 'config.h') assert js_engine == 'v8' diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp index dd41586..c04e967 100644 --- a/webkit/webkit.gyp +++ b/webkit/webkit.gyp @@ -137,7 +137,7 @@ # TODO(bradnelson): npapi.h, npruntime.h, npruntime_priv.h, and # stdint.h shouldn't be in the SHARED_INTERMEDIATE_DIR, it's very # global. - 'action': ['python', 'build/action_jsconfig.py', 'v8', '<(SHARED_INTERMEDIATE_DIR)/webkit', '<(SHARED_INTERMEDIATE_DIR)/webkit', '<@(_inputs)'], + 'action': ['python', 'build/action_jsconfig.py', 'v8', '<(SHARED_INTERMEDIATE_DIR)/webkit', '<@(_inputs)'], 'conditions': [ ['OS=="win"', { |