diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2015-01-08 16:48:29 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2015-01-08 16:48:29 -0500 |
| commit | 355d00685137aa0c42fdd93853096ac718a474b2 (patch) | |
| tree | 297fdc25fb5c28536a8485a877225ddaa44e5f12 /scripts/packages-formatter.py | |
| parent | 3d98ef6b08753d3e740ac9aa35e2364884f6c9cf (diff) | |
Rationalize use of AUTOBUILD environment variable across languages.
Ensure that AUTOBUILD is always in native path syntax on every platform.
Remove local build.sh logic to infer AUTOBUILD: either the generic build.sh
has set it properly, or scream for help.
Since cygwin bash scripts need a cygwin-syntax path to autobuild, convert to a
local 'autobuild' variable using shell_path.
Remove kludges in other languages involving cygdrive twiddling.
Diffstat (limited to 'scripts/packages-formatter.py')
| -rwxr-xr-x | scripts/packages-formatter.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/scripts/packages-formatter.py b/scripts/packages-formatter.py index 7e5e690e49..4e66cf9ed4 100755 --- a/scripts/packages-formatter.py +++ b/scripts/packages-formatter.py @@ -30,11 +30,7 @@ import errno import re import subprocess -_autobuild=os.getenv('AUTOBUILD', - 'autobuild' if not ( sys.platform == 'win32' or sys.platform == 'cygwin') - else 'autobuild.cmd') -# HACK: temporarily work around cygwin /cygdrive/c madness -_autobuild = re.sub(r"^/cygdrive/(.)/", r"\1:/", _autobuild) +_autobuild=os.getenv('AUTOBUILD', 'autobuild') pkg_line=re.compile('^([\w-]+):\s+(.*)$') |