diff --git a/source/dub/commandline.d b/source/dub/commandline.d index b487526..1c103d6 100644 --- a/source/dub/commandline.d +++ b/source/dub/commandline.d @@ -774,7 +774,7 @@ "The accepted values for --data=VALUE are:", "", "target-type, target-path, target-name, working-directory, " - "main-source-file, dflags, lflags, libs, source-files, " + "main-source-file, dflags, lflags, libs, lib-files, source-files, " "copy-files, versions, debug-versions, import-paths, " "string-import-paths, import-files, string-import-files, " "pre-generate-commands, post-generate-commands, " diff --git a/source/dub/compilers/buildsettings.d b/source/dub/compilers/buildsettings.d index 83e9322..190dd00 100644 --- a/source/dub/compilers/buildsettings.d +++ b/source/dub/compilers/buildsettings.d @@ -29,6 +29,7 @@ string[] dflags; string[] lflags; string[] libs; + string[] libFiles; string[] sourceFiles; string[] copyFiles; string[] versions; @@ -64,6 +65,7 @@ addDFlags(bs.dflags); addLFlags(bs.lflags); addLibs(bs.libs); + addLibFiles(bs.libFiles); addSourceFiles(bs.sourceFiles); addCopyFiles(bs.copyFiles); addVersions(bs.versions); @@ -82,6 +84,7 @@ void removeDFlags(in string[] value...) { remove(dflags, value); } void addLFlags(in string[] value...) { lflags ~= value; } void addLibs(in string[] value...) { add(libs, value); } + void addLibFiles(in string[] value...) { add(libFiles, value); } void addSourceFiles(in string[] value...) { add(sourceFiles, value); } void prependSourceFiles(in string[] value...) { prepend(sourceFiles, value); } void removeSourceFiles(in string[] value...) { removePaths(sourceFiles, value); } diff --git a/source/dub/project.d b/source/dub/project.d index 415bb9f..79f91e2 100644 --- a/source/dub/project.d +++ b/source/dub/project.d @@ -727,6 +727,7 @@ case "dflags": return listBuildSetting!"dflags"(platform, configs, projectDescription); case "lflags": return listBuildSetting!"lflags"(platform, configs, projectDescription); case "libs": return listBuildSetting!"libs"(platform, configs, projectDescription); + case "lib-files": return listBuildSetting!"libFiles"(platform, configs, projectDescription); case "source-files": return listBuildSetting!"sourceFiles"(platform, configs, projectDescription); case "copy-files": return listBuildSetting!"copyFiles"(platform, configs, projectDescription); case "versions": return listBuildSetting!"versions"(platform, configs, projectDescription); @@ -762,7 +763,7 @@ foreach (ldep; target.linkDependencies) { auto dbs = projectDescription.targetLookup[ldep].buildSettings; if (bs.targetType != TargetType.staticLibrary) { - bs.addLibs((Path(dbs.targetPath) ~ getTargetFileName(dbs, platform)).toNativeString()); + bs.addLibFiles((Path(dbs.targetPath) ~ getTargetFileName(dbs, platform)).toNativeString()); } } target.buildSettings = bs; diff --git a/test/4-describe-data.sh b/test/4-describe-data.sh index bdf5560..117f4d0 100755 --- a/test/4-describe-data.sh +++ b/test/4-describe-data.sh @@ -21,6 +21,7 @@ --data=dflags \ --data=lflags \ --data=libs \ + --data=lib-files \ --data=source-files \ --data=copy-files \ --data=versions \ @@ -67,6 +68,8 @@ # --data=libs echo "ssl" >> "$expected_file" echo "curl" >> "$expected_file" +echo >> "$expected_file" +# --data=lib-files echo "$CURR_DIR/describe-dependency-3/libdescribe-dependency-3.a" >> "$expected_file" echo >> "$expected_file" # --data=source-files