From df2c14b7affd20f26847c36e09168cb3b5efc8ce Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Fri, 11 Jul 2014 18:14:22 -0600 Subject: [PATCH 1/4] Remove unnecessary linting of generated exports file --- build.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.py b/build.py index d5235d587f..097c071602 100755 --- a/build.py +++ b/build.py @@ -355,7 +355,7 @@ virtual('lint', 'build/lint-timestamp', 'build/check-requires-timestamp', 'build/check-whitespace-timestamp') -@target('build/lint-timestamp', SRC, EXPORTS, EXAMPLES_SRC, SPEC, precious=True) +@target('build/lint-timestamp', SRC, EXAMPLES_SRC, SPEC, precious=True) def build_lint_src_timestamp(t): t.run('%(GJSLINT)s', '--jslint_error=all', @@ -367,7 +367,7 @@ def build_lint_src_timestamp(t): virtual('jshint', 'build/jshint-timestamp') -@target('build/jshint-timestamp', SRC, EXPORTS, EXAMPLES_SRC, SPEC, +@target('build/jshint-timestamp', SRC, EXAMPLES_SRC, SPEC, precious=True) def build_jshint_timestamp(t): t.run(variables.JSHINT, '--verbose', t.newer(t.dependencies)) @@ -537,7 +537,7 @@ def build_check_requires_timestamp(t): t.touch() -@target('build/check-whitespace-timestamp', SRC, EXPORTS, EXAMPLES_SRC, +@target('build/check-whitespace-timestamp', SRC, EXAMPLES_SRC, SPEC, JSDOC_SRC, precious=True) def build_check_whitespace_timestamp(t): CR_RE = re.compile(r'\r') From db431ebdc6892f913268d68abceed1e6be7fc7dd Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Fri, 11 Jul 2014 18:19:25 -0600 Subject: [PATCH 2/4] No reason for build.py to run generate-exports.js The doc task does not use the generated exports.js file. --- build.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/build.py b/build.py index 097c071602..e3ab399730 100755 --- a/build.py +++ b/build.py @@ -88,8 +88,6 @@ EXECUTABLES = [variables.CLEANCSS, variables.GIT, variables.GJSLINT, variables.JAVA, variables.JAR, variables.JSDOC, variables.JSHINT, variables.PYTHON, variables.PHANTOMJS] -EXPORTS = 'build/exports.js' - EXAMPLES = [path for path in ifind('examples') if path.endswith('.html') @@ -192,11 +190,6 @@ def build_ol_all_js(t): t.run('node', 'tasks/build.js', 'buildcfg/ol-all.json', 'build/ol-all.js') -@target(EXPORTS, SRC) -def build_exports_js(t): - t.run('node', 'tasks/generate-exports.js', EXPORTS) - - for glsl_src in GLSL_SRC: def shader_src_helper(glsl_src): @target(glsl_src.replace('.glsl', 'shader.js'), glsl_src, @@ -574,8 +567,7 @@ virtual('apidoc', 'build/jsdoc-%(BRANCH)s-timestamp' % vars(variables)) @target('build/jsdoc-%(BRANCH)s-timestamp' % vars(variables), 'host-resources', - EXPORTS, SRC, SHADER_SRC, - ifind('apidoc/template')) + SRC, SHADER_SRC, ifind('apidoc/template')) def jsdoc_BRANCH_timestamp(t): t.run('%(JSDOC)s', 'apidoc/index.md', '-c', 'apidoc/conf.json', '-d', 'build/hosted/%(BRANCH)s/apidoc') From 5010596ec064dc98ef85069ac942cfd2ade27953 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Fri, 11 Jul 2014 18:22:03 -0600 Subject: [PATCH 3/4] Unused JAR executable --- build.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/build.py b/build.py index e3ab399730..a5b8838ecb 100755 --- a/build.py +++ b/build.py @@ -20,7 +20,6 @@ if sys.platform == 'win32': 'GIT': 'git.exe', 'GJSLINT': 'gjslint.exe', 'JAVA': 'java.exe', - 'JAR': 'jar.exe', 'JSDOC': './node_modules/.bin/jsdoc', 'JSHINT': './node_modules/.bin/jshint', 'PYTHON': 'python.exe', @@ -42,8 +41,6 @@ if sys.platform == 'win32': if java_home: if not which(win['JAVA']): win['JAVA'] = os.path.join(java_home, 'bin', 'java.exe') - if not which(win['JAR']): - win['JAR'] = os.path.join(java_home, 'bin', 'jar.exe') elif not which(win['JAVA']): win['JAVA'] = os.path.join(program_files, 'Java', 'jre7', 'bin', 'java.exe') @@ -76,7 +73,6 @@ else: variables.GJSLINT = 'gjslint' variables.JSHINT = './node_modules/.bin/jshint' variables.JAVA = 'java' - variables.JAR = 'jar' variables.JSDOC = './node_modules/.bin/jsdoc' variables.PYTHON = 'python' variables.PHANTOMJS = './node_modules/.bin/phantomjs' @@ -85,8 +81,8 @@ variables.BRANCH = output( '%(GIT)s', 'rev-parse', '--abbrev-ref', 'HEAD').strip() EXECUTABLES = [variables.CLEANCSS, variables.GIT, variables.GJSLINT, - variables.JAVA, variables.JAR, variables.JSDOC, - variables.JSHINT, variables.PYTHON, variables.PHANTOMJS] + variables.JAVA, variables.JSDOC, variables.JSHINT, + variables.PYTHON, variables.PHANTOMJS] EXAMPLES = [path for path in ifind('examples') From f5830cc8e52ef34b90176d4a43d76d478473fd18 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Fri, 11 Jul 2014 18:23:47 -0600 Subject: [PATCH 4/4] Unused JAVA executable --- build.py | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/build.py b/build.py index a5b8838ecb..3aa65c1593 100755 --- a/build.py +++ b/build.py @@ -19,7 +19,6 @@ if sys.platform == 'win32': 'CLEANCSS': './node_modules/.bin/cleancss', 'GIT': 'git.exe', 'GJSLINT': 'gjslint.exe', - 'JAVA': 'java.exe', 'JSDOC': './node_modules/.bin/jsdoc', 'JSHINT': './node_modules/.bin/jshint', 'PYTHON': 'python.exe', @@ -28,22 +27,6 @@ if sys.platform == 'win32': sys_dir = os.environ.get('SYSTEMDRIVE') 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']): win['GIT'] = os.path.join(program_files, 'Git', 'cmd', 'git.exe') @@ -72,7 +55,6 @@ else: variables.GIT = 'git' variables.GJSLINT = 'gjslint' variables.JSHINT = './node_modules/.bin/jshint' - variables.JAVA = 'java' variables.JSDOC = './node_modules/.bin/jsdoc' variables.PYTHON = 'python' variables.PHANTOMJS = './node_modules/.bin/phantomjs' @@ -81,8 +63,8 @@ variables.BRANCH = output( '%(GIT)s', 'rev-parse', '--abbrev-ref', 'HEAD').strip() EXECUTABLES = [variables.CLEANCSS, variables.GIT, variables.GJSLINT, - variables.JAVA, variables.JSDOC, variables.JSHINT, - variables.PYTHON, variables.PHANTOMJS] + variables.JSDOC, variables.JSHINT, variables.PYTHON, + variables.PHANTOMJS] EXAMPLES = [path for path in ifind('examples')