Use proj4.js from node_modules/ instead of copying it to build/

This commit is contained in:
Andreas Hocevar
2014-07-09 14:49:28 +02:00
parent 0a01f8ef7e
commit fc3ed93080
2 changed files with 3 additions and 12 deletions

View File

@@ -128,8 +128,6 @@ SRC = [path
if path.endswith('.js')
if path not in SHADER_SRC]
PROJ4JS = 'build/proj4js/dist/proj4.js'
def report_sizes(t):
stringio = StringIO()
@@ -346,7 +344,7 @@ def examples_star_combined_js(name, match):
return Target(name, action=action, dependencies=dependencies)
@target('serve', PROJ4JS, 'examples')
@target('serve', 'examples')
def serve(t):
t.run('node', 'tasks/serve.js')
@@ -669,14 +667,7 @@ def check_examples(t):
t.run('%(PHANTOMJS)s', 'bin/check-example.js', example)
@target(PROJ4JS)
def proj4js(t):
contents = open('node_modules/proj4/dist/proj4.js').read()
with open(t.name, 'wb') as f:
f.write(contents)
@target('test', PROJ4JS, phony=True)
@target('test', phony=True)
def test(t):
t.run('node', 'tasks/test.js')

View File

@@ -13,6 +13,7 @@
<script type="text/javascript" src="../node_modules/expect.js/index.js"></script>
<script type="text/javascript" src="../node_modules/sinon/pkg/sinon.js"></script>
<script type="text/javascript" src="../node_modules/mocha/mocha.js"></script>
<script type="text/javascript" src="../node_modules/proj4/dist/proj4.js"></script>
<script type="text/javascript" src="test-extensions.js"></script>
<script>
mocha.setup({
@@ -20,7 +21,6 @@
bail: false
});
</script>
<script type="text/javascript" src="../build/proj4js/dist/proj4.js"></script>
<!-- This script is provided by the debug server (start with `build.py serve`) -->
<script type="text/javascript" src="loader.js"></script>