Issue 5020 - Part 3: Add command line options to compile script

compile

 #!/usr/bin/env python
 
 import argparse
 import os
 import re
 import subprocess
 
 BASE_DIR = os.path.dirname(__file__) or os.getcwd()
 SOURCE_DIR = os.path.join(BASE_DIR, 'compiled')
 SOURCE_FILES = [
     os.path.join(path, f)
     for (path, dirs, files) in os.walk(SOURCE_DIR)
     for f in files
     if f.endswith('.cpp')
 ]
 BINDINGS_FILE = os.path.join(SOURCE_DIR, 'bindings.cpp')
 BINDINGS_GENERATOR = os.path.join(SOURCE_DIR, 'bindings.cpp.js')
 BINDINGS_OUTPUT = os.path.join(SOURCE_DIR, 'bindings.js')
 COMPILER_OUTPUT = os.path.join(BASE_DIR, 'lib', 'compiled.js')
 GENERATION_PARAMS = {
-    'SHELL_FILE': "'%s'" % os.path.abspath(os.path.join(SOURCE_DIR,
-                                                        'shell.js')),
+    'SHELL_FILE': "'{}'".format(os.path.abspath(os.path.join(SOURCE_DIR,
+                                                             'shell.js'))),
     'ASM_JS': 2,  # "almost asm"
     'TOTAL_MEMORY': 16*1024*1024,
     'TOTAL_STACK': 1*1024*1024,
     'ALLOW_MEMORY_GROWTH': 1,
     'NO_EXIT_RUNTIME': 1,
     'NO_DYNAMIC_EXECUTION': 1,
     'NO_FILESYSTEM': 1,
     'INVOKE_RUN': 0,
     'TEXTDECODER': 0,
     'EXPORTED_RUNTIME_METHODS': ['cwrap', 'ccall', 'stringToAscii'],
@@ skipping 26 matching lines @@
         '-o', BINDINGS_GENERATOR, '-std=gnu++14', '-DPRINT_BINDINGS',
         '-s', 'WARN_ON_UNDEFINED_SYMBOLS=0',
     ]
     subprocess.check_call(params, env=env)
 
     node = subprocess.check_output('which node', env=env, shell=True).strip()
     with open(BINDINGS_OUTPUT, 'w') as file:
         subprocess.check_call([node, BINDINGS_GENERATOR], env=env, stdout=file)
 
 
-def run_compiler(env):
+def run_compiler(env, debug=False, tracing=False):
     params = [
         os.path.join(env['EMSCRIPTEN'], 'emcc'),
         '-o', COMPILER_OUTPUT,
         '--post-js', BINDINGS_OUTPUT,
     ]
     params.extend(SOURCE_FILES)
     params.extend('-D' + flag for flag in DEFINES)
     for key, value in GENERATION_PARAMS.iteritems():
-        params.extend(['-s', '%s=%s' % (key, str(value))])
+        params.extend(['-s', '{}={}'.format(key, str(value))])
+    if debug:
+        params.append('-g1')
+    if tracing:
+        params.append('--tracing')
     params.extend(ADDITIONAL_PARAMS)
     subprocess.check_call(params, env=env)
 
 
 if __name__ == '__main__':
     parser = argparse.ArgumentParser(
         description='Compile Emscripten-based C++ code to JavaScript'
     )
     parser.add_argument(
         '--emscripten',
         metavar='DIR',
         default=os.path.join(BASE_DIR, '..', 'emscripten'),
         help='Emscripten installation directory'
     )
     parser.add_argument(
         '-d', '--debug',
         action='store_true',
         help='Disable code minification'
     )
     parser.add_argument(
         '-t', '--tracing',
         action='store_true',
         help='Enable memory tracing'
     )
     args = parser.parse_args()
 
-    if args.debug:
-        ADDITIONAL_PARAMS.append('-g1')

[Vasily Kuznetsov, 2017/03/21 18:38:19]

Isn't it a bit misleading that ADDITIONAL_PARAMETERS is named like a constant
but we're modifying it? Maybe it would be better to make a new list and put it
into `env`?
To be honest I have a hard time coming up with realistic scenarios of how
current approach would bite us in the future. However, sometimes reality exceeds
our expectations :)

[Wladimir Palant, 2017/03/22 08:52:12]

I have been wondering the same thing. Yes, let's do it properly.

-    if args.tracing:
-        ADDITIONAL_PARAMS.append('--tracing')
-
     env = getenv(args.emscripten)
     generate_bindings(env)
-    run_compiler(env)
+    run_compiler(env, debug=args.debug, tracing=args.tracing)