Rename the dynamiclibrary_copy tag to dynamiclibrary_symbols

...because that reflects the purpose of this artifact much better.
For quite some time we do not create copies of shared objects anymore.

The file tag is internal. Users are not negatively affected.

Change-Id: I0df85587d9f8eb5f5f1c7f272ec57a66588dac29
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>

4 files changed, 17 insertions, 17 deletions

diff --git a/share/qbs/modules/cpp/DarwinGCC.qbs b/share/qbs/modules/cpp/DarwinGCC.qbs
index 33b5093ab..397d951a6 100644
--- a/share/qbs/modules/cpp/DarwinGCC.qbs
+++ b/share/qbs/modules/cpp/DarwinGCC.qbs
@@ -231,7 +231,7 @@ UnixGCC {
         inputsFromDependencies: ["dynamiclibrary"]
         multiplex: true
 
-        outputFileTags: ["bundle.input", "dynamiclibrary", "dynamiclibrary_copy", "primary",
+        outputFileTags: ["bundle.input", "dynamiclibrary", "dynamiclibrary_symbols", "primary",
                          "debuginfo_dll"]
         outputArtifacts: Darwin.lipoOutputArtifacts(product, inputs, "dynamiclibrary", "dll")
 
diff --git a/share/qbs/modules/cpp/GenericGCC.qbs b/share/qbs/modules/cpp/GenericGCC.qbs
index 86fd64874..22fb857b9 100644
--- a/share/qbs/modules/cpp/GenericGCC.qbs
+++ b/share/qbs/modules/cpp/GenericGCC.qbs
@@ -358,11 +358,11 @@ CppModule {
             }
             return tags;
         }
-        inputsFromDependencies: ["dynamiclibrary_copy", "staticlibrary"]
+        inputsFromDependencies: ["dynamiclibrary_symbols", "staticlibrary"]
 
         outputFileTags: [
             "bundle.input",
-            "dynamiclibrary", "dynamiclibrary_symlink", "dynamiclibrary_copy", "debuginfo_dll"
+            "dynamiclibrary", "dynamiclibrary_symlink", "dynamiclibrary_symbols", "debuginfo_dll"
         ]
         outputArtifacts: {
             var artifacts = [{
@@ -379,7 +379,7 @@ CppModule {
                 artifacts.push({
                     filePath: product.destinationDirectory + "/.sosymbols/"
                               + PathTools.dynamicLibraryFilePath(product),
-                    fileTags: ["dynamiclibrary_copy"],
+                    fileTags: ["dynamiclibrary_symbols"],
                     alwaysUpdated: false,
                 });
             }
@@ -462,7 +462,7 @@ CppModule {
             }
             return tags;
         }
-        inputsFromDependencies: ["dynamiclibrary_copy", "staticlibrary"]
+        inputsFromDependencies: ["dynamiclibrary_symbols", "staticlibrary"]
 
         outputFileTags: ["bundle.input", "loadablemodule", "debuginfo_loadablemodule"]
         outputArtifacts: {
@@ -499,7 +499,7 @@ CppModule {
             }
             return tags;
         }
-        inputsFromDependencies: ["dynamiclibrary_copy", "staticlibrary"]
+        inputsFromDependencies: ["dynamiclibrary_symbols", "staticlibrary"]
 
         outputFileTags: ["bundle.input", "application", "debuginfo_app"]
         outputArtifacts: {
diff --git a/share/qbs/modules/cpp/darwin.js b/share/qbs/modules/cpp/darwin.js
index 484076bca..24b6ee089 100644
--- a/share/qbs/modules/cpp/darwin.js
+++ b/share/qbs/modules/cpp/darwin.js
@@ -50,7 +50,7 @@ function lipoOutputArtifacts(product, inputs, fileTag, debugSuffix) {
             return {
                 filePath: product.destinationDirectory + "/.sosymbols/"
                     + PathTools.dynamicLibraryFilePath(product, variant.suffix),
-                fileTags: ["dynamiclibrary_copy"],
+                fileTags: ["dynamiclibrary_symbols"],
                 qbs: { buildVariant: variant.name },
                 cpp: { variantSuffix: variant.suffix },
                 alwaysUpdated: false
@@ -184,7 +184,7 @@ function prepareLipo(project, product, inputs, outputs, input, output) {
                       ["-S", outputs.primary[0].filePath]);
     cmd.silent = true;
     commands.push(cmd);
-    if (outputs.dynamiclibrary_copy)
+    if (outputs.dynamiclibrary_symbols)
         Array.prototype.push.apply(commands, Gcc.createSymbolCheckingCommands(product, outputs));
     return commands;
 }
diff --git a/share/qbs/modules/cpp/gcc.js b/share/qbs/modules/cpp/gcc.js
index f638d3cb3..f90714918 100644
--- a/share/qbs/modules/cpp/gcc.js
+++ b/share/qbs/modules/cpp/gcc.js
@@ -1042,31 +1042,31 @@ function readSymbolFile(filePath)
 
 function createSymbolCheckingCommands(product, outputs) {
     var commands = [];
-    if (!outputs.dynamiclibrary || !outputs.dynamiclibrary_copy)
+    if (!outputs.dynamiclibrary || !outputs.dynamiclibrary_symbols)
         return commands;
 
-    if (outputs.dynamiclibrary.length !== outputs.dynamiclibrary_copy.length)
+    if (outputs.dynamiclibrary.length !== outputs.dynamiclibrary_symbols.length)
         throw new Error("The number of outputs tagged dynamiclibrary ("
                         + outputs.dynamiclibrary.length + ") must be equal to the number of "
-                        + "outputs tagged dynamiclibrary_copy ("
-                        + outputs.dynamiclibrary_copy.length + ")");
+                        + "outputs tagged dynamiclibrary_symbols ("
+                        + outputs.dynamiclibrary_symbols.length + ")");
 
-    for (var d = 0; d < outputs.dynamiclibrary_copy.length; ++d) {
+    for (var d = 0; d < outputs.dynamiclibrary_symbols.length; ++d) {
         // Update the symbols file if the list of relevant symbols has changed.
         var cmd = new JavaScriptCommand();
         cmd.silent = true;
         cmd.d = d;
         cmd.sourceCode = function() {
             if (outputs.dynamiclibrary[d].qbs.buildVariant
-                    !== outputs.dynamiclibrary_copy[d].qbs.buildVariant)
+                    !== outputs.dynamiclibrary_symbols[d].qbs.buildVariant)
                 throw new Error("Build variant of output tagged dynamiclibrary ("
                                 + outputs.dynamiclibrary[d].qbs.buildVariant + ") is not equal to "
-                                + "build variant of output tagged dynamiclibrary_copy ("
-                                + outputs.dynamiclibrary_copy[d].qbs.buildVariant + ") at index "
+                                + "build variant of output tagged dynamiclibrary_symbols ("
+                                + outputs.dynamiclibrary_symbols[d].qbs.buildVariant + ") at index "
                                 + d);
 
             var libFilePath = outputs.dynamiclibrary[d].filePath;
-            var symbolFilePath = outputs.dynamiclibrary_copy[d].filePath;
+            var symbolFilePath = outputs.dynamiclibrary_symbols[d].filePath;
 
             var newNmResult = getSymbolInfo(product, libFilePath);
             if (!newNmResult.success)