diff options
| author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-31 18:41:26 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-31 18:41:26 +0000 |
| commit | dab2a382958109fd368f0d82f648ca39414d0b78 (patch) | |
| tree | 1f1c2884ff598b5c265f09e67c454e52c4323c45 /chrome/tools | |
| parent | d6455401046a035f9e5fe2cd1541466cf169517a (diff) | |
| download | chromium_src-dab2a382958109fd368f0d82f648ca39414d0b78.zip chromium_src-dab2a382958109fd368f0d82f648ca39414d0b78.tar.gz chromium_src-dab2a382958109fd368f0d82f648ca39414d0b78.tar.bz2 | |
Use xcrun instead of DEVELOPER_BIN_DIR to deal with tools that keep
moving around.
R=thomasvl@chromium.org
Review URL: https://codereview.chromium.org/54643003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@232182 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/tools')
| -rwxr-xr-x | chrome/tools/build/mac/generate_localizer | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome/tools/build/mac/generate_localizer b/chrome/tools/build/mac/generate_localizer index cadec8a..afda56dd 100755 --- a/chrome/tools/build/mac/generate_localizer +++ b/chrome/tools/build/mac/generate_localizer @@ -40,9 +40,6 @@ static const size_t kUIResourcesSize = arraysize(kUIResources); def xib_localizable_strings(xib_path): """Runs ibtool to extract the localizable strings data from the xib.""" - tools_dir = os.environ.get('DEVELOPER_BIN_DIR', '/usr/bin') - tool_path = os.path.join(tools_dir, 'ibtool') - # Take SDKROOT out of the environment passed to ibtool. ibtool itself has # no need for it, but when ibtool runs via xcrun and Xcode isn't aware of # the SDK in use, its presence causes an error. @@ -52,7 +49,8 @@ def xib_localizable_strings(xib_path): else: ibtool_env = os.environ - ibtool_cmd = subprocess.Popen([tool_path, '--localizable-strings', xib_path], + ibtool_cmd = subprocess.Popen(['xcrun', 'ibtool', + '--localizable-strings', xib_path], stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=ibtool_env) (cmd_out, cmd_err) = ibtool_cmd.communicate() |