Minor tweaks in ship/make_msvc_package.py

- Fix a typo in the 7-Zip default paths.

 - Change env["Path"] to env["PATH"].  Python is case-sensitive, and "Path"
   isn't working.  Windows itself seems to prefer "Path".  I'm guessing
   Python is converting "Path" to "PATH" for platform interoperability.
This commit is contained in:
Ryan Prichard 2016-06-14 05:38:09 -05:00
parent c6603f72f5
commit d7290359d5

View File

@ -37,8 +37,8 @@ import sys
os.chdir(common_ship.topDir) os.chdir(common_ship.topDir)
ZIP_TOOL = common_ship.requireExe("7z.exe", [ ZIP_TOOL = common_ship.requireExe("7z.exe", [
"C:\\Program Files\\7-Zip\7z.exe", "C:\\Program Files\\7-Zip\\7z.exe",
"C:\\Program Files (x86)\\7-Zip\7z.exe", "C:\\Program Files (x86)\\7-Zip\\7z.exe",
]) ])
MSVC_VERSION_TABLE = { MSVC_VERSION_TABLE = {
@ -101,7 +101,7 @@ def build(arch, packageDir, xp=False):
sys.exit("Error: MSVC environment script missing: " + devCmdPath) sys.exit("Error: MSVC environment script missing: " + devCmdPath)
newEnv = os.environ.copy() newEnv = os.environ.copy()
newEnv["Path"] = os.path.dirname(sys.executable) + ";" + common_ship.defaultPathEnviron newEnv["PATH"] = os.path.dirname(sys.executable) + ";" + common_ship.defaultPathEnviron
commandLine = ( commandLine = (
'"' + devCmdPath + '" && ' '"' + devCmdPath + '" && '
" vcbuild.bat" + " vcbuild.bat" +