ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Unused JAVA executable

Browse Source
This commit is contained in:
Tim Schaub
2014-07-11 18:23:47 -06:00
parent 5010596ec0
commit f5830cc8e5
1 changed files with 2 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
build.py
View File

@@ -19,7 +19,6 @@ if sys.platform == 'win32':
'CLEANCSS': './node_modules/.bin/cleancss', 'CLEANCSS': './node_modules/.bin/cleancss',
'GIT': 'git.exe', 'GIT': 'git.exe',
'GJSLINT': 'gjslint.exe', 'GJSLINT': 'gjslint.exe',
'JAVA': 'java.exe',
'JSDOC': './node_modules/.bin/jsdoc', 'JSDOC': './node_modules/.bin/jsdoc',
'JSHINT': './node_modules/.bin/jshint', 'JSHINT': './node_modules/.bin/jshint',
'PYTHON': 'python.exe', 'PYTHON': 'python.exe',
@@ -28,22 +27,6 @@ if sys.platform == 'win32':
sys_dir = os.environ.get('SYSTEMDRIVE') sys_dir = os.environ.get('SYSTEMDRIVE')
program_files = os.environ.get('PROGRAMFILES') program_files = os.environ.get('PROGRAMFILES')
java_home = os.environ.get('JAVA_HOME')
if not java_home:
# Following lines choose sensible defaults to guess JAVA_HOME in
# 32/64bit Program Files folder opting for the most current version.
search_term = os.path.join(sys_dir, os.sep, 'Program Files*', 'Java', 'jdk*')
found_jdks = sorted(glob.glob(search_term), key=lambda x: x[-8:])
if found_jdks:
java_home = found_jdks[-1]
if java_home:
if not which(win['JAVA']):
win['JAVA'] = os.path.join(java_home, 'bin', 'java.exe')
elif not which(win['JAVA']):
win['JAVA'] = os.path.join(program_files,
'Java', 'jre7', 'bin', 'java.exe')
if not which(win['GIT']): if not which(win['GIT']):
win['GIT'] = os.path.join(program_files, 'Git', 'cmd', 'git.exe') win['GIT'] = os.path.join(program_files, 'Git', 'cmd', 'git.exe')
@@ -72,7 +55,6 @@ else:
variables.GIT = 'git' variables.GIT = 'git'
variables.GJSLINT = 'gjslint' variables.GJSLINT = 'gjslint'
variables.JSHINT = './node_modules/.bin/jshint' variables.JSHINT = './node_modules/.bin/jshint'
variables.JAVA = 'java'
variables.JSDOC = './node_modules/.bin/jsdoc' variables.JSDOC = './node_modules/.bin/jsdoc'
variables.PYTHON = 'python' variables.PYTHON = 'python'
variables.PHANTOMJS = './node_modules/.bin/phantomjs' variables.PHANTOMJS = './node_modules/.bin/phantomjs'
@@ -81,8 +63,8 @@ variables.BRANCH = output(
'%(GIT)s', 'rev-parse', '--abbrev-ref', 'HEAD').strip() '%(GIT)s', 'rev-parse', '--abbrev-ref', 'HEAD').strip()
EXECUTABLES = [variables.CLEANCSS, variables.GIT, variables.GJSLINT, EXECUTABLES = [variables.CLEANCSS, variables.GIT, variables.GJSLINT,
variables.JAVA, variables.JSDOC, variables.JSHINT, variables.JSDOC, variables.JSHINT, variables.PYTHON,
variables.PYTHON, variables.PHANTOMJS] variables.PHANTOMJS]
EXAMPLES = [path EXAMPLES = [path
for path in ifind('examples') for path in ifind('examples')