Commit f46bf8a3 authored by thestig@chromium.org's avatar thestig@chromium.org

Convert build/linux/install-debian.wheezy.sysroot.wrapper.sh to python for Windows compatibility.

BUG=224487
TBR=dbeam

Review URL: https://codereview.chromium.org/15059002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198859 0039d316-1c4b-4281-b951-d872f2087c98
parent ce5b5150
...@@ -649,7 +649,8 @@ hooks = [ ...@@ -649,7 +649,8 @@ hooks = [
# build deps change. This script is a no-op except for linux users who have # build deps change. This script is a no-op except for linux users who have
# src-internal access and are doing official chrome builds. # src-internal access and are doing official chrome builds.
"pattern": ".", "pattern": ".",
"action": ["src/build/linux/install-debian.wheezy.sysroot.wrapper.sh"], "action": ["python",
"src/build/linux/install-debian.wheezy.sysroot.wrapper.py"],
}, },
{ {
# Pull clang on mac. If nothing changed, or on non-mac platforms, this takes # Pull clang on mac. If nothing changed, or on non-mac platforms, this takes
......
#!/bin/sh #!/usr/bin/env python
# Copyright (c) 2013 The Chromium Authors. All rights reserved. # Copyright (c) 2013 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be # Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file. # found in the LICENSE file.
...@@ -17,13 +17,31 @@ ...@@ -17,13 +17,31 @@
# #
# * chromeos=1 # * chromeos=1
set -e import os.path
import subprocess
import sys
SRC_DIR="$(dirname "$0")/../../" def main():
SCRIPT_DIR="chrome/installer/linux/internal/sysroot_scripts/" if sys.platform != 'linux2':
SCRIPT_FILE="$SRC_DIR/$SCRIPT_DIR/install-debian.wheezy.sysroot.py" return 0
if [ -e "$SCRIPT_FILE" ]; then SRC_DIR = os.path.dirname(os.path.dirname(os.path.dirname(
python "$SCRIPT_FILE" --linux-only --arch=amd64 os.path.realpath(__file__))))
python "$SCRIPT_FILE" --linux-only --arch=i386 SCRIPT_FILE = os.path.join(SRC_DIR,
fi 'chrome',
'installer',
'linux',
'internal',
'sysroot_scripts',
'install-debian.wheezy.sysroot.py')
if os.path.exists(SCRIPT_FILE):
ret = subprocess.call([SCRIPT_FILE, '--linux-only', '--arch=amd64'])
if ret != 0:
return ret
ret = subprocess.call([SCRIPT_FILE, '--linux-only', '--arch=i386'])
if ret != 0:
return ret
return 0
if __name__ == '__main__':
sys.exit(main())
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment