From a3e7528841186841110777ed6c716a3c5ff40a8a Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Tue, 12 Feb 2013 15:30:36 +0100 Subject: [PATCH] Guess paths to Windows binaries using environment variables --- build.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/build.py b/build.py index 8a9795ee90..2cf4a2ee5d 100755 --- a/build.py +++ b/build.py @@ -13,12 +13,14 @@ from pake import Target, ifind, main, output, rule, target, variables, virtual if sys.platform == 'win32': - variables.GIT = 'C:/Program Files/Git/bin/git.exe' + ProgramFiles = os.environ.get('ProgramFiles', 'C:\\Program Files') + ProgramFiles_X86 = os.environ.get('ProgramFiles(X86)', 'C:\\Program Files') + variables.GIT = os.path.join(ProgramFiles_X86, 'Git', 'bin', 'git.exe') variables.GJSLINT = 'gjslint' # FIXME - variables.JAVA = 'C:/Program Files/Java/jre7/bin/java.exe' + variables.JAVA = os.path.join(ProgramFiles, 'Java', 'jre7', 'bin', 'java.exe') variables.JSDOC = 'jsdoc' # FIXME variables.PHANTOMJS = 'phantomjs' # FIXME - variables.PYTHON = 'C:/Python27/python.exe' + variables.PYTHON = os.path.join(os.environ['SystemDrive'] + '\\', 'Python27', 'python.exe') else: variables.GIT = 'git' variables.GJSLINT = 'gjslint'