Remove pystache dependency
And use the mustache node module instead.
This commit is contained in:
@@ -323,5 +323,5 @@ build/test_rendering_requires.js: $(SPEC_RENDERING_JS)
|
|||||||
@mkdir -p $(@D)
|
@mkdir -p $(@D)
|
||||||
@node tasks/generate-requires.js $^ > $@
|
@node tasks/generate-requires.js $^ > $@
|
||||||
|
|
||||||
%shader.js: %.glsl src/ol/webgl/shader.mustache bin/pyglslunit.py
|
%shader.js: %.glsl src/ol/webgl/shader.mustache bin/pyglslunit.py build/timestamps/node-modules-timestamp
|
||||||
@python bin/pyglslunit.py --input $< --template src/ol/webgl/shader.mustache --output $@
|
@python bin/pyglslunit.py --input $< | ./node_modules/.bin/mustache - src/ol/webgl/shader.mustache > $@
|
||||||
|
|||||||
+2
-3
@@ -1,10 +1,10 @@
|
|||||||
#!/usr/bin/python
|
#!/usr/bin/python
|
||||||
|
|
||||||
from optparse import OptionParser
|
from optparse import OptionParser
|
||||||
|
import json
|
||||||
import re
|
import re
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
import pystache
|
|
||||||
|
|
||||||
|
|
||||||
ESCAPE_SEQUENCE = {
|
ESCAPE_SEQUENCE = {
|
||||||
@@ -42,7 +42,6 @@ def main(argv):
|
|||||||
option_parser = OptionParser()
|
option_parser = OptionParser()
|
||||||
option_parser.add_option('--input')
|
option_parser.add_option('--input')
|
||||||
option_parser.add_option('--output')
|
option_parser.add_option('--output')
|
||||||
option_parser.add_option('--template')
|
|
||||||
options, args = option_parser.parse_args(argv[1:])
|
options, args = option_parser.parse_args(argv[1:])
|
||||||
|
|
||||||
context = {}
|
context = {}
|
||||||
@@ -114,7 +113,7 @@ def main(argv):
|
|||||||
output = open(options.output, 'wb')
|
output = open(options.output, 'wb')
|
||||||
else:
|
else:
|
||||||
output = sys.stdout
|
output = sys.stdout
|
||||||
output.write(pystache.render(open(options.template, 'rb').read(), context))
|
json.dump(context, output)
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
|
|||||||
@@ -54,6 +54,7 @@
|
|||||||
"jshint": "2.5.6",
|
"jshint": "2.5.6",
|
||||||
"mocha": "1.21.5",
|
"mocha": "1.21.5",
|
||||||
"mocha-phantomjs": "3.5.1",
|
"mocha-phantomjs": "3.5.1",
|
||||||
|
"mustache": "2.1.3",
|
||||||
"phantomjs": "1.9.10",
|
"phantomjs": "1.9.10",
|
||||||
"proj4": "2.3.6",
|
"proj4": "2.3.6",
|
||||||
"resemblejs": "1.2.0",
|
"resemblejs": "1.2.0",
|
||||||
|
|||||||
@@ -1,2 +1 @@
|
|||||||
http://closure-linter.googlecode.com/files/closure_linter-latest.tar.gz
|
http://closure-linter.googlecode.com/files/closure_linter-latest.tar.gz
|
||||||
pystache
|
|
||||||
|
|||||||
Reference in New Issue
Block a user