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

Merge pull request #486 from twpayne/build-py-pep8

Browse Source 
Make build.py PEP8 compliant again
This commit is contained in:
Tom Payne
2013-04-06 05:22:43 -07:00
parent a2bae2d893 8bf14f8f98
commit f8ea6fefd3
1 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
build.py
View File

@@ -9,64 +9,65 @@ import re
import shutil import shutil
import sys import sys
from pake import Target, ifind, main, output, rule, target, variables, virtual, which from pake import Target
from pake import ifind, main, output, rule, target, variables, virtual, which
if sys.platform == 'win32': if sys.platform == 'win32':
""" windows_defaults assumes that jsdoc was installed at a specific place """ windows_defaults assumes that jsdoc was installed at a specific place
(C:\jsdoc). It also fixes a certain version (1.9.0) of phantomjs which might (C:\jsdoc). It also fixes a certain version (1.9.0) of phantomjs which
not anymore be proposed on might not anymore be proposed on
http://code.google.com/p/phantomjs/downloads/list""" http://code.google.com/p/phantomjs/downloads/list"""
windows_defaults = { windows_defaults = {
'ProgramFiles': os.environ.get('ProgramFiles', 'C:\\Program Files'), 'ProgramFiles': os.environ.get('ProgramFiles', 'C:\\Program Files'),
'Python27': os.environ.get('SystemDrive', 'C:') + '\\Python27', 'Python27': os.environ.get('SystemDrive', 'C:') + '\\Python27',
'jsdoc': os.environ.get('SystemDrive', 'C:') + '\\jsdoc3', 'jsdoc': os.environ.get('SystemDrive', 'C:') + '\\jsdoc3',
'phantomjs': os.environ.get('SystemDrive', 'C:') + \ 'phantomjs': (os.environ.get('SystemDrive', 'C:') +
'\\phantomjs-1.9.0-windows' '\\phantomjs-1.9.0-windows')
} }
if which('git.exe'): if which('git.exe'):
variables.GIT = 'git.exe' variables.GIT = 'git.exe'
else: else:
variables.GIT = os.path.join(windows_defaults['ProgramFiles'], variables.GIT = os.path.join(windows_defaults['ProgramFiles'],
'Git', 'bin', 'git.exe') 'Git', 'bin', 'git.exe')
if which('gjslint.exe'): if which('gjslint.exe'):
variables.GJSLINT = 'gjslint.exe' variables.GJSLINT = 'gjslint.exe'
else: else:
variables.GJSLINT = os.path.join(windows_defaults['Python27'], variables.GJSLINT = os.path.join(windows_defaults['Python27'],
'Scripts', 'gjslint.exe') 'Scripts', 'gjslint.exe')
if which('java.exe'): if which('java.exe'):
variables.JAVA = 'java.exe' variables.JAVA = 'java.exe'
else: else:
variables.JAVA = os.path.join(windows_defaults['ProgramFiles'], variables.JAVA = os.path.join(windows_defaults['ProgramFiles'],
'Java', 'jre7', 'bin', 'java.exe') 'Java', 'jre7', 'bin', 'java.exe')
if which('jar.exe'): if which('jar.exe'):
variables.JAR = 'jar.exe' variables.JAR = 'jar.exe'
else: else:
variables.JAR = os.path.join(windows_defaults['ProgramFiles'], variables.JAR = os.path.join(windows_defaults['ProgramFiles'],
'Java', 'jdk1.7.0_17', 'bin', 'jar.exe') 'Java', 'jdk1.7.0_17', 'bin', 'jar.exe')
if which('jsdoc.cmd'): if which('jsdoc.cmd'):
variables.JSDOC = 'jsdoc.cmd' variables.JSDOC = 'jsdoc.cmd'
else: else:
variables.JSDOC = os.path.join(windows_defaults['jsdoc'], variables.JSDOC = os.path.join(windows_defaults['jsdoc'],
'jsdoc.cmd') 'jsdoc.cmd')
if which('python.exe'): if which('python.exe'):
variables.PYTHON = 'python.exe' variables.PYTHON = 'python.exe'
else: else:
variables.PYTHON = os.path.join(windows_defaults['Python27'], variables.PYTHON = os.path.join(windows_defaults['Python27'],
'python.exe') 'python.exe')
if which('phantomjs.exe'): if which('phantomjs.exe'):
variables.PHANTOMJS = 'phantomjs.exe' variables.PHANTOMJS = 'phantomjs.exe'
else: else:
variables.PHANTOMJS = os.path.join(windows_defaults['phantomjs'], variables.PHANTOMJS = os.path.join(windows_defaults['phantomjs'],
'phantomjs.exe') 'phantomjs.exe')
else: else:
variables.GIT = 'git' variables.GIT = 'git'
@@ -84,7 +85,7 @@ variables.BRANCH = output(
'%(GIT)s', 'rev-parse', '--abbrev-ref', 'HEAD').strip() '%(GIT)s', 'rev-parse', '--abbrev-ref', 'HEAD').strip()
EXECUTABLES = [variables.GIT, variables.GJSLINT, variables.JAVA, variables.JAR, EXECUTABLES = [variables.GIT, variables.GJSLINT, variables.JAVA, variables.JAR,
variables.JSDOC, variables.PYTHON, variables.PHANTOMJS] variables.JSDOC, variables.PYTHON, variables.PHANTOMJS]
EXPORTS = [path EXPORTS = [path
for path in ifind('src') for path in ifind('src')
@@ -524,8 +525,9 @@ def split_example_file(example, dst_dir):
@target('host-resources', phony=True) @target('host-resources', phony=True)
def host_resources(t): def host_resources(t):
resources_dir = 'build/gh-pages/%(BRANCH)s/resources' resources_dir = 'build/gh-pages/%(BRANCH)s/resources'
t.rm_rf(resources_dir); t.rm_rf(resources_dir)
t.cp_r('resources', resources_dir); t.cp_r('resources', resources_dir)
@target('host-examples', 'build', 'host-resources', 'examples', phony=True) @target('host-examples', 'build', 'host-resources', 'examples', phony=True)
def host_examples(t): def host_examples(t):