[#3] Use original names for objects and deps

xpack · Nov 6, 2018 · b45f1f4 · b45f1f4
1 parent 88aebdd
commit b45f1f4
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/assets/templates/build.ninja.liquid b/assets/templates/build.ninja.liquid
@@ -15,9 +15,9 @@ rule {{ tool.prefix }}
 # Compile files from '{{ folder.relativePath }}'.
 
 {% for file in folder.files -%}
-build {{ file.relativePathShortName | replace: '$', '$$' | replace: ' ', '$ ' }}.{{ toolchain.objectExtension }}: {{ file.tool.prefix }} {{ file.buildRelativePath | replace: '$', '$$' | replace: ' ', '$ ' }}
-  description = {{ file.tool.fullCommandName }} {{ file.tool.options }} '{{ file.relativePath | replace: '$', '$$' }}'
-  depfile = {{ file.relativePathShortName | replace: '$', '$$' | replace: ' ', '$ ' }}.d
+build {{ file.relativePath | replace: '$', '$$' | replace: ' ', '$ ' }}.{{ toolchain.objectExtension }}: {{ file.tool.prefix }} {{ file.buildRelativePath | replace: '$', '$$' | replace: ' ', '$ ' }}
+  description = {{ file.tool.fullCommandName }} {{ file.tool.outputFlag }} '{{ file.relativePath | replace: '$', '$$' }}.{{ toolchain.objectExtension }}'
+  depfile = {{ file.relativePath | replace: '$', '$$' | replace: ' ', '$ ' }}.d
   command = {{ file.fullCommand | replace: '$', '$$' }}
 
 {% endfor -%}

diff --git a/assets/templates/makefile.liquid b/assets/templates/makefile.liquid
@@ -14,7 +14,7 @@ all: {{ artefact.fullName | replace: '$', '$$' }}
 
 {% for folder in sourceFolders -%}
 {% for file in folder.files -%}
--include {{ file.relativePathShortName | replace: '$', '$$' | replace: ' ', '\ ' }}.d
+-include {{ file.relativePath | replace: '$', '$$' | replace: ' ', '\ ' }}.d
 {% endfor -%}
 {% endfor -%}
 
@@ -23,17 +23,17 @@ all: {{ artefact.fullName | replace: '$', '$$' }}
 # Compile files from '{{ folder.relativePath }}'.
 
 {% for file in folder.files -%}
-{{ file.relativePathShortName | replace: '$', '$$' | replace: ' ', '\ ' }}.{{ toolchain.objectExtension }}: {{ file.buildRelativePath | replace: '$', '$$' | replace: ' ', '\ ' }}
+{{ file.relativePath | replace: '$', '$$' | replace: ' ', '\ ' }}.{{ toolchain.objectExtension }}: {{ file.buildRelativePath | replace: '$', '$$' | replace: ' ', '\ ' }}
 {% if isVerbose -%}
 {{ tab }}@echo ' '
-{{ tab }}@echo 'Building file: {{ file.buildRelativePath | replace: '$', '$$' }}'
+{{ tab }}@echo 'Building file: {{ file.relativePath | replace: '$', '$$' }}.{{ toolchain.objectExtension }}'
 {{ tab }}@echo 'Invoking: {{ file.tool.fullDescription }}'
 {% else -%}
-{{ tab }}@echo '{{ file.tool.fullCommandName }} {{ file.tool.options }} {{ file.buildRelativePath | replace: '$', '$$' }} ...'
+{{ tab }}@echo '{{ file.tool.fullCommandName }} {{ file.tool.outputFlag }} {{ file.relativePath | replace: '$', '$$' }}.{{ toolchain.objectExtension }} ...'
 {% endif -%}
 {{ tab }}{% if isVerbose == false %}@{% endif %}{{ file.fullCommand | replace: '$', '$$' }}
 {% if isVerbose -%}
-{{ tab }}@echo 'Finished building: {{ file.buildRelativePath | replace: '$', '$$' }}'
+{{ tab }}@echo 'Finished building: {{ file.relativePath | replace: '$', '$$' }}.{{ toolchain.objectExtension }}'
 {% endif -%}
 
 {% endfor -%}
@@ -63,7 +63,7 @@ clean:
 {% else -%}
 {{ tab }}-@echo '$(firstword $(RM)) ...'
 {% endif -%}
-{{ tab }}-{% if isVerbose == false %}@{% endif %}$(RM) {% for folder in sourceFolders %}{% for file in folder.files %}'{{ file.relativePathShortName | replace: '$', '$$' }}.d' {% endfor %}{% endfor %}
+{{ tab }}-{% if isVerbose == false %}@{% endif %}$(RM) {% for folder in sourceFolders %}{% for file in folder.files %}'{{ file.relativePath | replace: '$', '$$' }}.d' {% endfor %}{% endfor %}
 {{ tab }}-{% if isVerbose == false %}@{% endif %}$(RM) {% for obj in root.objs %}'{{ obj | replace: '$', '$$' }}' {% endfor %}'{{ artefact.fullName | replace: '$', '$$' }}'
 
 ################################################################################

diff --git a/assets/toolchains.json b/assets/toolchains.json
@@ -122,9 +122,9 @@
         "cCompiler": {
           "commandName": "gcc",
           "options": "-c",
-          "deps": "-MMD -MP -MF '${node.relativePathShortName}.d'",
+          "deps": "-MMD -MP -MF '${node.relativePath}.d'",
           "outputFlag": "-o",
-          "output": "'${node.relativePathShortName}.${toolchain.objectExtension}'",
+          "output": "'${node.relativePath}.${toolchain.objectExtension}'",
           "inputs": "'${node.buildRelativePath}'",
           "fileExtensions": {
             "c": {
@@ -135,9 +135,9 @@
         "cppCompiler": {
           "commandName": "g++",
           "options": "-c",
-          "deps": "-MMD -MP -MF '${node.relativePathShortName}.d'",
+          "deps": "-MMD -MP -MF '${node.relativePath}.d'",
           "outputFlag": "-o",
-          "output": "'${node.relativePathShortName}.${toolchain.objectExtension}'",
+          "output": "'${node.relativePath}.${toolchain.objectExtension}'",
           "inputs": "'${node.buildRelativePath}'",
           "fileExtensions": {
             "cpp": {
@@ -160,9 +160,9 @@
         "assembler": {
           "commandName": "gcc",
           "options": "-x assembler-with-cpp -c",
-          "deps": "-MMD -MP -MF '${node.relativePathShortName}.d'",
+          "deps": "-MMD -MP -MF '${node.relativePath}.d'",
           "outputFlag": "-o",
-          "output": "'${node.relativePathShortName}.${toolchain.objectExtension}'",
+          "output": "'${node.relativePath}.${toolchain.objectExtension}'",
           "inputs": "'${node.buildRelativePath}'",
           "fileExtensions": {
             "S": {

diff --git a/lib/utils/source-tree.js b/lib/utils/source-tree.js
@@ -899,7 +899,7 @@ class SourceTree extends Node {
       out.sourceFolderNodes.push(node)
 
       for (const file of node.files) {
-        out.objs.push(file.relativePathShortName + '.' +
+        out.objs.push(file.relativePath + '.' +
           file.tool.toolchain.objectExtension)
         out.tools.add(file.tool)
       }