← Back to branch summary

~ubuntu-branches/ubuntu/vivid/emscripten/vivid

« back to all changes in this revision

Viewing changes to scons-tools/emscripten.py

  • Committer: Package Import Robot
  • Author(s): Sylvestre Ledru
  • Date: 2013-09-20 22:44:35 UTC
  • mfrom: (4.1.1 sid)
  • Revision ID: package-import@ubuntu.com-20130920224435-apuwj4fsl3fqv1a6
Tags: 1.5.6~20130920~6010666-1
http://bugs.debian.org/723129
* New snapshot release
* Update the list of supported architectures to the same as libv8
  (Closes: #723129)
* emlibtool has been removed from upstream.
* Fix warning syntax-error-in-dep5-copyright
* Refresh of the patches

Show diffs side-by-side

added added

removed removed

Lines of Context:
scons-tools/emscripten.py
24
24
    
25
25
    EMSCRIPTEN_DEPENDENCIES = [
26
26
        env.Glob('${EMSCRIPTEN_HOME}/src/*.js'),
 
27
        env.Glob('${EMSCRIPTEN_HOME}/src/embind/*.js'),
27
28
        env.Glob('${EMSCRIPTEN_HOME}/tools/*.py'),
28
29
        '${EMSCRIPTEN_HOME}/emscripten.py',
29
30
    ]
141
142
    [global_emscripten_min_js] = env.JSOptimizer(
142
143
        buildName('global.min.js'),
143
144
        closure_js,
144
 
        JS_OPTIMIZER_PASSES=['simplifyExpressionsPost', 'compress', 'last'])
 
145
        JS_OPTIMIZER_PASSES=['simplifyExpressionsPost', 'minifyWhitespace', 'last'])
145
146
 
146
147
    [emscripten_iteration_js] = env.WrapInModule(
147
148
        buildName('iteration.js'),
155
156
        buildName('min.js'),
156
157
        global_emscripten_min_js)
157
158
 
158
 
    env.InstallAs(buildName('js'), emscripten_js)
159
 
 
160
159
    return [emscripten_iteration_js, emscripten_js, emscripten_min_js]
161
160
 
162
161
LIBC_SOURCES = [
265
264
    )
266
265
 
267
266
    env.Replace(
268
 
        CC='${LLVM_ROOT}/${CLANG}',
269
 
        CXX='${LLVM_ROOT}/${CLANGXX}',
270
 
        AR='${LLVM_ROOT}/${LLVM_LINK}',
 
267
        CC=os.path.join('${LLVM_ROOT}', '${CLANG}'),
 
268
        CXX=os.path.join('${LLVM_ROOT}', '${CLANGXX}'),
 
269
        AR=os.path.join('${LLVM_ROOT}', '${LLVM_LINK}'),
271
270
        ARCOM='$AR -o $TARGET $SOURCES',
272
271
        OBJSUFFIX='.bc',
273
272
        LIBPREFIX='',
301
300
        '__IEEE_LITTLE_ENDIAN',
302
301
    ])
303
302
    
 
303
    env.Append(
 
304
        CPPPATH=[
 
305
            env.Dir('${EMSCRIPTEN_HOME}/system/include'),
 
306
        ]
 
307
    )
 
308
 
304
309
    env['BUILDERS']['Emscripten'] = Builder(
305
310
        action='$PYTHON ${EMSCRIPTEN_HOME}/emscripten.py $EMSCRIPTEN_FLAGS $_EMSCRIPTEN_SETTINGS_FLAGS --temp-dir=$EMSCRIPTEN_TEMP_DIR --compiler $JS_ENGINE --relooper=third-party/relooper.js $SOURCE > $TARGET',
306
311
        target_scanner=EmscriptenScanner)