Copy source files into source map file

Author: verhovsky

tools/building.py

@@ -1127,6 +1127,7 @@ def emit_wasm_source_map(wasm_file, map_file, final_wasm):
                    wasm_file,
                    '--dwarfdump=' + LLVM_DWARFDUMP,
                    '-o',  map_file,
+                   '--sources',
                    '--basepath=' + base_path]
   check_call(sourcemap_cmd)
 

tools/wasm-sourcemap.py

@@ -61,6 +61,7 @@ def resolve(self, name):
     if name in self.cache:
       return self.cache[name]
 
+    result = name
     for p in self.prefixes:
       if name.startswith(p['prefix']):
         if p['replacement'] is None:
@@ -285,20 +286,20 @@ def build_sourcemap(entries, code_section_offset, prefixes, collect_sources, bas
     if prefixes.provided():
       source_name = prefixes.sources.resolve(file_name)
     else:
+      source_name = file_name
       try:
-        file_name = os.path.relpath(file_name, base_path)
+        source_name = os.path.relpath(source_name, base_path)
       except ValueError:
-        file_name = os.path.abspath(file_name)
-      file_name = utils.normalize_path(file_name)
-      source_name = file_name
+        source_name = os.path.abspath(source_name)
+      source_name = utils.normalize_path(file_name)
     if source_name not in sources_map:
       source_id = len(sources)
       sources_map[source_name] = source_id
       sources.append(source_name)
       if collect_sources:
         load_name = prefixes.load.resolve(file_name)
         try:
-          with open(load_name, 'r') as infile:
+          with open(os.path.normpath(load_name), 'r') as infile:
             source_content = infile.read()
           sources_content.append(source_content)
         except IOError: