Consistent naming of .symbols and .mem files

This change only effects the names of the side files that are generated
from `--emit-symbol-map` and `--memory-init-file`.  In these cases
we now use the same naming scheme as we do for for MINIMAL_RUNTIME.

Author: sbc100

ChangeLog.md

@@ -144,6 +144,14 @@ See docs/process.md for more on how version tagging works.
 -----------------
 - Initial support for C++20 modules.  We have added a very simple test in form
   of `other.test_cpp_module`. (#18915)
+  of `other.test_cpp_module`. (#)
+- File names of the files output by `--emit-symbol-map` and `--memory-init-file`
+  no longer contains the file extension of the output file.  This matches the
+  behaivour of `-sMINIMAL_RUNTIME`.  e.g `a.out.js.mem` -> `a.out.js` and
+  `a.out.js.symbols` -> `a.out.symbols`.
+- When targetting `node` (i.e. when node is included in `ENVIRONMENT`) the
+  output file is now marked as executable and includes a !# line by default.
+  This can be disabled explictly via `-sEXECUTABLE_OUTPUT=0`.
 - Removed `sys/sysctl.h` compatibility header.  We don't implement the function
   it defines. (#18863)
 - Update SDL2_ttf port to 2.20.2 (#18804)

emcc.py

@@ -3142,7 +3142,7 @@ def phase_post_link(options, state, in_wasm, wasm_target, target, js_syms):
   if settings.MEM_INIT_IN_WASM:
     memfile = None
   else:
-    memfile = shared.replace_or_append_suffix(target, '.mem')
+    memfile = shared.replace_suffix(target, '.mem')
 
   phase_emscript(options, in_wasm, wasm_target, memfile, js_syms)
 
@@ -3760,7 +3760,7 @@ def phase_binaryen(target, options, wasm_target):
 
   symbols_file = None
   if options.emit_symbol_map:
-    symbols_file = shared.replace_or_append_suffix(target, '.symbols')
+    symbols_file = shared.replace_suffix(target, '.symbols')
 
   if settings.WASM2JS:
     symbols_file_js = None
@@ -3772,11 +3772,11 @@ def phase_binaryen(target, options, wasm_target):
       write_file(wasm2js_template, wasm2js_polyfill)
       # generate secondary file for JS symbols
       if options.emit_symbol_map:
-        symbols_file_js = shared.replace_or_append_suffix(wasm2js_template, '.symbols')
+        symbols_file_js = shared.replace_suffix(wasm2js_template, '.symbols')
     else:
       wasm2js_template = final_js
       if options.emit_symbol_map:
-        symbols_file_js = shared.replace_or_append_suffix(target, '.symbols')
+        symbols_file_js = shared.replace_suffix(target, '.symbols')
 
     wasm2js = building.wasm2js(wasm2js_template,
                                wasm_target,

site/source/docs/tools_reference/emcc.rst

@@ -229,7 +229,7 @@ Options that are modified or new in *emcc* are listed below:
   can still reconstruct meaningful stack traces by translating the indexes back
   to the names.
 
-  .. note:: When used with ``-sWASM=2``, two symbol files are created. ``[name].js.symbols`` (with WASM symbols) and ``[name].wasm.js.symbols`` (with ASM.js symbols)
+  .. note:: When used with ``-sWASM=2``, two symbol files are created. ``[name].symbols`` (with WASM symbols) and ``[name].wasm.symbols`` (with wasm2js symbols)
 
 .. _emcc-lto:
 

test/test_core.py

@@ -7443,7 +7443,7 @@ def test_demangle_stacks_symbol_map(self):
     # make sure the shortened name is the right one
     full_aborter = None
     short_aborter = None
-    for line in open('test_demangle_stacks.js.symbols').readlines():
+    for line in open('test_demangle_stacks.symbols').readlines():
       if ':' not in line:
         continue
       # split by the first ':' (wasm backend demangling may include more :'s later on)

test/test_other.py

@@ -4450,7 +4450,7 @@ def guess_symbols_file_type(symbols_file):
         cmd.append(f'-sWASM={wasm}')
       self.run_process(cmd)
 
-      minified_middle = get_minified_middle('a.out.js.symbols')
+      minified_middle = get_minified_middle('a.out.symbols')
       self.assertNotEqual(minified_middle, None, "Missing minified 'middle' function")
       if wasm:
         # stack traces are standardized enough that we can easily check that the
@@ -4465,15 +4465,15 @@ def guess_symbols_file_type(symbols_file):
 
       # Ensure symbols file type according to `-sWASM=` mode
       if wasm == 0:
-        self.assertEqual(guess_symbols_file_type('a.out.js.symbols'), 'js', 'Primary symbols file should store JS mappings')
+        self.assertEqual(guess_symbols_file_type('a.out.symbols'), 'js', 'Primary symbols file should store JS mappings')
       elif wasm == 1:
-        self.assertEqual(guess_symbols_file_type('a.out.js.symbols'), 'wasm', 'Primary symbols file should store Wasm mappings')
+        self.assertEqual(guess_symbols_file_type('a.out.symbols'), 'wasm', 'Primary symbols file should store Wasm mappings')
       elif wasm == 2:
         # special case when both JS and Wasm targets are created
-        minified_middle_2 = get_minified_middle('a.out.wasm.js.symbols')
+        minified_middle_2 = get_minified_middle('a.out.wasm.symbols')
         self.assertNotEqual(minified_middle_2, None, "Missing minified 'middle' function")
-        self.assertEqual(guess_symbols_file_type('a.out.js.symbols'), 'wasm', 'Primary symbols file should store Wasm mappings')
-        self.assertEqual(guess_symbols_file_type('a.out.wasm.js.symbols'), 'js', 'Secondary symbols file should store JS mappings')
+        self.assertEqual(guess_symbols_file_type('a.out.symbols'), 'wasm', 'Primary symbols file should store Wasm mappings')
+        self.assertEqual(guess_symbols_file_type('a.out.wasm.symbols'), 'js', 'Secondary symbols file should store JS mappings')
 
       # check we don't keep unnecessary debug info with wasm2js when emitting
       # a symbol map

tools/emdump.py

@@ -605,7 +605,7 @@ def read_symbol_map(filename):
   return symbol_map
 
 
-# Locates foo.js to foo.js.symbols or foo.html.symbols based on default output name rules for Emscripten compiler
+# Locates foo.js to foo.symbols or foo.html.symbols based on default output name rules for Emscripten compiler
 def guess_symbol_map_file_location(sources, symbol_map_file):
   if os.path.isfile(symbol_map_file):
     return symbol_map_file

tools/shared.py

@@ -536,14 +536,6 @@ def replace_suffix(filename, new_suffix):
   return os.path.splitext(filename)[0] + new_suffix
 
 
-# In MINIMAL_RUNTIME mode, keep suffixes of generated files simple
-# ('.mem' instead of '.js.mem'; .'symbols' instead of '.js.symbols' etc)
-# Retain the original naming scheme in traditional runtime.
-def replace_or_append_suffix(filename, new_suffix):
-  assert new_suffix[0] == '.'
-  return replace_suffix(filename, new_suffix) if settings.MINIMAL_RUNTIME else filename + new_suffix
-
-
 # Temp dir. Create a random one, unless EMCC_DEBUG is set, in which case use the canonical
 # temp directory (TEMP_DIR/emscripten_temp).
 @memoize