deprecate Artifact.fileName in favor of Artifact.filePath

This property is actually a file path, not a mere name.

Task-number: QBS-579
Change-Id: I04e8f03eac97b5f86fe743a4923888a3d2a82c5d
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

9 files changed, 37 insertions, 37 deletions

diff --git a/share/qbs/modules/cpp/DarwinGCC.qbs b/share/qbs/modules/cpp/DarwinGCC.qbs
index 376aefe3f..e74d4b84b 100644
--- a/share/qbs/modules/cpp/DarwinGCC.qbs
+++ b/share/qbs/modules/cpp/DarwinGCC.qbs
@@ -123,7 +123,7 @@ UnixGCC {
         inputs: ["infoplist"]
 
         Artifact {
-            fileName: product.destinationDirectory + "/" + BundleTools.pkgInfoPath(product)
+            filePath: product.destinationDirectory + "/" + BundleTools.pkgInfoPath(product)
             fileTags: ["pkginfo"]
         }
 
@@ -155,7 +155,7 @@ UnixGCC {
         inputs: ["qbs"]
 
         Artifact {
-            fileName: product.destinationDirectory + "/" + BundleTools.infoPlistPath(product)
+            filePath: product.destinationDirectory + "/" + BundleTools.infoPlistPath(product)
             fileTags: ["infoplist"]
         }
 
@@ -315,7 +315,7 @@ UnixGCC {
         inputs: ["application"]
 
         Artifact {
-            fileName: product.destinationDirectory + "/" + PathTools.dwarfDsymFileName(product)
+            filePath: product.destinationDirectory + "/" + PathTools.dwarfDsymFileName(product)
             fileTags: ["application_dsym"]
         }
 
@@ -336,7 +336,7 @@ UnixGCC {
             "resourcerules", "ipa"]
 
         Artifact {
-            fileName: product.destinationDirectory + "/" + BundleTools.wrapperName(product)
+            filePath: product.destinationDirectory + "/" + BundleTools.wrapperName(product)
             fileTags: ["applicationbundle"]
         }
 
@@ -354,7 +354,7 @@ UnixGCC {
         inputs: ["dynamiclibrary", "infoplist", "pkginfo", "dynamiclibrary_dsym", "compiled_nib"]
 
         Artifact {
-            fileName: product.destinationDirectory + "/" + BundleTools.wrapperName(product)
+            filePath: product.destinationDirectory + "/" + BundleTools.wrapperName(product)
             fileTags: ["frameworkbundle"]
         }
 
diff --git a/share/qbs/modules/cpp/GenericGCC.qbs b/share/qbs/modules/cpp/GenericGCC.qbs
index 67da0d1bb..7b9fb0478 100644
--- a/share/qbs/modules/cpp/GenericGCC.qbs
+++ b/share/qbs/modules/cpp/GenericGCC.qbs
@@ -69,31 +69,31 @@ CppModule {
         usings: ["dynamiclibrary_copy", "staticlibrary", "frameworkbundle"]
 
         Artifact {
-            fileName: product.destinationDirectory + "/" + PathTools.dynamicLibraryFilePath(product)
+            filePath: product.destinationDirectory + "/" + PathTools.dynamicLibraryFilePath(product)
             fileTags: ["dynamiclibrary"]
         }
 
         // libfoo
         Artifact {
-            fileName: product.destinationDirectory + "/" + PathTools.dynamicLibraryFileName(product, undefined, 0)
+            filePath: product.destinationDirectory + "/" + PathTools.dynamicLibraryFileName(product, undefined, 0)
             fileTags: ["dynamiclibrary_symlink"]
         }
 
         // libfoo.1
         Artifact {
-            fileName: product.destinationDirectory + "/" + PathTools.dynamicLibraryFileName(product, undefined, 1)
+            filePath: product.destinationDirectory + "/" + PathTools.dynamicLibraryFileName(product, undefined, 1)
             fileTags: ["dynamiclibrary_symlink"]
         }
 
         // libfoo.1.0
         Artifact {
-            fileName: product.destinationDirectory + "/" + PathTools.dynamicLibraryFileName(product, undefined, 2)
+            filePath: product.destinationDirectory + "/" + PathTools.dynamicLibraryFileName(product, undefined, 2)
             fileTags: ["dynamiclibrary_symlink"]
         }
 
         // Copy of dynamic lib for smart re-linking.
         Artifact {
-            fileName: product.destinationDirectory + "/.socopy/"
+            filePath: product.destinationDirectory + "/.socopy/"
                       + PathTools.dynamicLibraryFilePath(product)
             fileTags: ["dynamiclibrary_copy"]
             alwaysUpdated: false
@@ -229,7 +229,7 @@ CppModule {
         usings: ["dynamiclibrary", "staticlibrary", "frameworkbundle"]
 
         Artifact {
-            fileName: product.destinationDirectory + "/" + PathTools.staticLibraryFilePath(product)
+            filePath: product.destinationDirectory + "/" + PathTools.staticLibraryFilePath(product)
             fileTags: ["staticlibrary"]
             cpp.staticLibraries: {
                 var result = []
@@ -275,7 +275,7 @@ CppModule {
         usings: ["dynamiclibrary_copy", "staticlibrary", "frameworkbundle"]
 
         Artifact {
-            fileName: product.destinationDirectory + "/" + PathTools.applicationFilePath(product)
+            filePath: product.destinationDirectory + "/" + PathTools.applicationFilePath(product)
             fileTags: ["application"]
         }
 
@@ -344,7 +344,7 @@ CppModule {
 
         Artifact {
             fileTags: ["obj"]
-            fileName: ".obj/" + input.baseDir + "/" + input.fileName + ".o"
+            filePath: ".obj/" + input.baseDir + "/" + input.fileName + ".o"
         }
 
         prepare: {
@@ -356,7 +356,7 @@ CppModule {
         condition: cPrecompiledHeader !== undefined
         inputs: cPrecompiledHeader
         Artifact {
-            fileName: product.name + "_c.gch"
+            filePath: product.name + "_c.gch"
             fileTags: "c_pch"
         }
         prepare: {
@@ -368,7 +368,7 @@ CppModule {
         condition: cxxPrecompiledHeader !== undefined
         inputs: cxxPrecompiledHeader
         Artifact {
-            fileName: product.name + "_cpp.gch"
+            filePath: product.name + "_cpp.gch"
             fileTags: "cpp_pch"
         }
         prepare: {
@@ -380,7 +380,7 @@ CppModule {
         condition: objcPrecompiledHeader !== undefined
         inputs: objcPrecompiledHeader
         Artifact {
-            fileName: product.name + "_objc.gch"
+            filePath: product.name + "_objc.gch"
             fileTags: "objc_pch"
         }
         prepare: {
@@ -392,7 +392,7 @@ CppModule {
         condition: objcxxPrecompiledHeader !== undefined
         inputs: objcxxPrecompiledHeader
         Artifact {
-            fileName: product.name + "_objcpp.gch"
+            filePath: product.name + "_objcpp.gch"
             fileTags: "objcpp_pch"
         }
         prepare: {
diff --git a/share/qbs/modules/cpp/ios-gcc.qbs b/share/qbs/modules/cpp/ios-gcc.qbs
index aeb1ad767..dced87c27 100644
--- a/share/qbs/modules/cpp/ios-gcc.qbs
+++ b/share/qbs/modules/cpp/ios-gcc.qbs
@@ -24,7 +24,7 @@ DarwinGCC {
         inputs: ["qbs"]
 
         Artifact {
-            fileName: product.destinationDirectory + "/"
+            filePath: product.destinationDirectory + "/"
                     + BundleTools.contentsFolderPath(product)
                     + "/ResourceRules.plist"
             fileTags: ["resourcerules"]
@@ -48,7 +48,7 @@ DarwinGCC {
         inputs: ["application", "infoplist", "pkginfo", "resourcerules", "compiled_nib"]
 
         Artifact {
-            fileName: product.destinationDirectory + "/" + product.targetName + ".ipa"
+            filePath: product.destinationDirectory + "/" + product.targetName + ".ipa"
             fileTags: ["ipa"]
         }
 
diff --git a/share/qbs/modules/cpp/windows-mingw.qbs b/share/qbs/modules/cpp/windows-mingw.qbs
index ea66d61f4..809485b78 100644
--- a/share/qbs/modules/cpp/windows-mingw.qbs
+++ b/share/qbs/modules/cpp/windows-mingw.qbs
@@ -39,7 +39,7 @@ GenericGCC {
         inputs: ["rc"]
 
         Artifact {
-            fileName: ".obj/" + input.baseDir.replace(':', '') + "/" + input.completeBaseName + "_res.o"
+            filePath: ".obj/" + input.baseDir.replace(':', '') + "/" + input.completeBaseName + "_res.o"
             fileTags: ["obj"]
         }
 
diff --git a/share/qbs/modules/cpp/windows-msvc.qbs b/share/qbs/modules/cpp/windows-msvc.qbs
index 2af9065a6..2779ec830 100644
--- a/share/qbs/modules/cpp/windows-msvc.qbs
+++ b/share/qbs/modules/cpp/windows-msvc.qbs
@@ -34,7 +34,7 @@ CppModule {
         inputs: cPrecompiledHeader
         Artifact {
             fileTags: ['obj']
-            fileName: {
+            filePath: {
                 var completeBaseName = FileInfo.completeBaseName(product.moduleProperty("cpp",
                         "cPrecompiledHeader"));
                 return ".obj/" + completeBaseName + '_c.obj'
@@ -42,7 +42,7 @@ CppModule {
         }
         Artifact {
             fileTags: ['c_pch']
-            fileName: ".obj/" + product.name + '_c.pch'
+            filePath: ".obj/" + product.name + '_c.pch'
         }
         prepare: {
             var platformDefines = ModUtils.moduleProperty(input, 'platformDefines');
@@ -61,7 +61,7 @@ CppModule {
         explicitlyDependsOn: ["c_pch"]  // to prevent vc--0.pdb conflict
         Artifact {
             fileTags: ['obj']
-            fileName: {
+            filePath: {
                 var completeBaseName = FileInfo.completeBaseName(product.moduleProperty("cpp",
                         "cxxPrecompiledHeader"));
                 return ".obj/" + completeBaseName + '_cpp.obj'
@@ -69,7 +69,7 @@ CppModule {
         }
         Artifact {
             fileTags: ['cpp_pch']
-            fileName: ".obj/" + product.name + '_cpp.pch'
+            filePath: ".obj/" + product.name + '_cpp.pch'
         }
         prepare: {
             var platformDefines = ModUtils.moduleProperty(input, 'platformDefines');
@@ -90,7 +90,7 @@ CppModule {
 
         Artifact {
             fileTags: ['obj']
-            fileName: ".obj/" + input.baseDir.replace(':', '') + "/" + input.fileName + ".obj"
+            filePath: ".obj/" + input.baseDir.replace(':', '') + "/" + input.fileName + ".obj"
         }
 
         prepare: {
@@ -113,7 +113,7 @@ CppModule {
         usings: ['staticlibrary', 'dynamiclibrary_import']
         Artifact {
             fileTags: ["application"]
-            fileName: product.destinationDirectory + "/" + PathTools.applicationFilePath(product)
+            filePath: product.destinationDirectory + "/" + PathTools.applicationFilePath(product)
         }
 
         prepare: {
@@ -134,12 +134,12 @@ CppModule {
 
         Artifact {
             fileTags: ["dynamiclibrary"]
-            fileName: product.destinationDirectory + "/" + PathTools.dynamicLibraryFilePath(product)
+            filePath: product.destinationDirectory + "/" + PathTools.dynamicLibraryFilePath(product)
         }
 
         Artifact {
             fileTags: ["dynamiclibrary_import"]
-            fileName: product.destinationDirectory + "/" + PathTools.importLibraryFilePath(product)
+            filePath: product.destinationDirectory + "/" + PathTools.importLibraryFilePath(product)
             alwaysUpdated: false
         }
 
@@ -161,7 +161,7 @@ CppModule {
 
         Artifact {
             fileTags: ["staticlibrary"]
-            fileName: product.destinationDirectory + "/" + PathTools.staticLibraryFilePath(product)
+            filePath: product.destinationDirectory + "/" + PathTools.staticLibraryFilePath(product)
             cpp.staticLibraries: {
                 var result = []
                 for (var i in inputs.staticlibrary) {
@@ -200,7 +200,7 @@ CppModule {
         inputs: ["rc"]
 
         Artifact {
-            fileName: ".obj/" + input.baseDir.replace(':', '') + "/" + input.completeBaseName + ".res"
+            filePath: ".obj/" + input.baseDir.replace(':', '') + "/" + input.completeBaseName + ".res"
             fileTags: ["obj"]
         }
 
diff --git a/share/qbs/modules/ib/IBModule.qbs b/share/qbs/modules/ib/IBModule.qbs
index c8037f243..abc0cfcb0 100644
--- a/share/qbs/modules/ib/IBModule.qbs
+++ b/share/qbs/modules/ib/IBModule.qbs
@@ -29,7 +29,7 @@ Module {
         explicitlyDependsOn: ["infoplist"]
 
         Artifact {
-            fileName: {
+            filePath: {
                 var path = product.destinationDirectory;
 
                 var xibFilePath = input.baseDir + '/' + input.fileName;
diff --git a/share/qbs/modules/nsis/NSISModule.qbs b/share/qbs/modules/nsis/NSISModule.qbs
index ad8b84238..349c7fe5d 100644
--- a/share/qbs/modules/nsis/NSISModule.qbs
+++ b/share/qbs/modules/nsis/NSISModule.qbs
@@ -117,7 +117,7 @@ Module {
 
         Artifact {
             fileTags: ["nsissetup", "application"]
-            fileName: product.destinationDirectory + "/" + product.targetName + ModUtils.moduleProperty(product, "executableSuffix")
+            filePath: product.destinationDirectory + "/" + product.targetName + ModUtils.moduleProperty(product, "executableSuffix")
         }
 
         prepare: {
diff --git a/share/qbs/modules/wix/WiXModule.qbs b/share/qbs/modules/wix/WiXModule.qbs
index 940b7a518..e2803da73 100644
--- a/share/qbs/modules/wix/WiXModule.qbs
+++ b/share/qbs/modules/wix/WiXModule.qbs
@@ -152,7 +152,7 @@ Module {
 
         Artifact {
             fileTags: ["wixobj"]
-            fileName: ".obj/" + input.baseDir.replace(':', '') + "/" + FileInfo.baseName(input.fileName) + ".wixobj"
+            filePath: ".obj/" + input.baseDir.replace(':', '') + "/" + FileInfo.baseName(input.fileName) + ".wixobj"
         }
 
         prepare: {
@@ -295,19 +295,19 @@ Module {
         Artifact {
             condition: product.type.contains("wixsetup")
             fileTags: ["wixsetup", "application"]
-            fileName: product.destinationDirectory + "/" + product.targetName + ModUtils.moduleProperty(product, "executableSuffix")
+            filePath: product.destinationDirectory + "/" + product.targetName + ModUtils.moduleProperty(product, "executableSuffix")
         }
 
         Artifact {
             condition: product.type.contains("msi")
             fileTags: ["msi"]
-            fileName: product.destinationDirectory + "/" + product.targetName + ModUtils.moduleProperty(product, "windowsInstallerSuffix")
+            filePath: product.destinationDirectory + "/" + product.targetName + ModUtils.moduleProperty(product, "windowsInstallerSuffix")
         }
 
         Artifact {
             condition: product.moduleProperty("qbs", "debugInformation") // ### QBS-412
             fileTags: ["wixpdb"]
-            fileName: product.destinationDirectory + "/" + product.targetName + ".wixpdb"
+            filePath: product.destinationDirectory + "/" + product.targetName + ".wixpdb"
         }
 
         prepare: {
diff --git a/share/share.qbs b/share/share.qbs
index 070e8df02..c00674e81 100644
--- a/share/share.qbs
+++ b/share/share.qbs
@@ -18,7 +18,7 @@ Product {
     Transformer {
         inputs: "qbs"
         Artifact {
-            fileName: "share/qbs"
+            filePath: "share/qbs"
         }
         prepare: {
             var cmd = new JavaScriptCommand();