Use pyglslunit instead of glsl-unit

This commit is contained in:
Tom Payne
2013-10-01 18:32:36 +02:00
parent 9c9a6ebff5
commit f1d4b58eb9
+2 -5
View File
@@ -82,8 +82,6 @@ else:
variables.PYTHON = 'python' variables.PYTHON = 'python'
variables.PHANTOMJS = 'phantomjs' variables.PHANTOMJS = 'phantomjs'
TEMPLATE_GLSL_COMPILER_JS = 'build/glsl-unit/bin/template_glsl_compiler.js'
variables.BRANCH = output( variables.BRANCH = output(
'%(GIT)s', 'rev-parse', '--abbrev-ref', 'HEAD').strip() '%(GIT)s', 'rev-parse', '--abbrev-ref', 'HEAD').strip()
@@ -238,13 +236,12 @@ def build_src_external_src_types_js(t):
'--typedef', 'src/objectliterals.jsdoc') '--typedef', 'src/objectliterals.jsdoc')
if os.path.exists(TEMPLATE_GLSL_COMPILER_JS):
for glsl_src in GLSL_SRC: for glsl_src in GLSL_SRC:
def shader_src_helper(glsl_src): def shader_src_helper(glsl_src):
@target(glsl_src.replace('.glsl', 'shader.js'), glsl_src, @target(glsl_src.replace('.glsl', 'shader.js'), glsl_src,
'src/ol/webgl/shader.mustache') 'src/ol/webgl/shader.mustache', 'bin/pyglslunit.py')
def shader_src(t): def shader_src(t):
t.run('%(NODE)s', TEMPLATE_GLSL_COMPILER_JS, t.run('%(PYTHON)s', 'bin/pyglslunit.py',
'--input', glsl_src, '--input', glsl_src,
'--template', 'src/ol/webgl/shader.mustache', '--template', 'src/ol/webgl/shader.mustache',
'--output', t.name) '--output', t.name)