diff --git a/source/app.d b/source/app.d index 9e2ee98..1883079 100644 --- a/source/app.d +++ b/source/app.d @@ -197,8 +197,8 @@ flags ~= settings.dflags; flags ~= settings.lflags.map!(f => "-L"~f)().array(); - flags ~= settings.importPath.map!(f => "-I"~f)().array(); - flags ~= settings.stringImportPath.map!(f => "-J"~f)().array(); + flags ~= settings.importPaths.map!(f => "-I"~f)().array(); + flags ~= settings.stringImportPaths.map!(f => "-J"~f)().array(); flags ~= settings.versions.map!(f => "-version="~f)().array(); flags ~= settings.files; flags ~= (mainsrc).toNativeString(); diff --git a/source/dub/dub.d b/source/dub/dub.d index dbe9bd2..c6de137 100644 --- a/source/dub/dub.d +++ b/source/dub/dub.d @@ -650,8 +650,8 @@ dst.addFiles(processVars(project_path, settings.files, true)); dst.addCopyFiles(processVars(project_path, settings.copyFiles, true)); dst.addVersions(processVars(project_path, settings.versions)); - dst.addImportDirs(processVars(project_path, settings.importPath, true)); - dst.addStringImportDirs(processVars(project_path, settings.stringImportPath, true)); + dst.addImportDirs(processVars(project_path, settings.importPaths, true)); + dst.addStringImportDirs(processVars(project_path, settings.stringImportPaths, true)); } private string[] processVars(string project_path, string[] vars, bool are_paths = false) @@ -691,7 +691,10 @@ } if( are_paths ){ auto p = Path(var); - if( !p.absolute ) p = Path(project_path) ~ p; + if( !p.absolute ){ + logTrace("Fixing relative path: %s ~ %s", project_path, p.toNativeString()); + p = Path(project_path) ~ p; + } dst.put(p.toNativeString()); } else dst.put(var); } diff --git a/source/dub/package_.d b/source/dub/package_.d index 94091c9..c1ebe60 100644 --- a/source/dub/package_.d +++ b/source/dub/package_.d @@ -32,8 +32,8 @@ string[] files; string[] copyFiles; string[] versions; - string[] importPath; - string[] stringImportPath; + string[] importPaths; + string[] stringImportPaths; void parse(in Json root, BuildPlatform platform) { @@ -43,8 +43,8 @@ addFiles(getPlatformField(root, "files", platform)); addCopyFiles(getPlatformField(root, "copyFiles", platform)); addVersions(getPlatformField(root, "versions", platform)); - addImportDirs(getPlatformField(root, "importPath", platform)); - addStringImportDirs(getPlatformField(root, "stringImportPath", platform)); + addImportDirs(getPlatformField(root, "importPaths", platform)); + addStringImportDirs(getPlatformField(root, "stringImportPaths", platform)); } void addDFlags(string[] value) { add(dflags, value); } @@ -53,8 +53,8 @@ void addFiles(string[] value) { add(files, value); } void addCopyFiles(string[] value) { add(copyFiles, value); } void addVersions(string[] value) { add(versions, value); } - void addImportDirs(string[] value) { add(importPath, value); } - void addStringImportDirs(string[] value) { add(stringImportPath, value); } + void addImportDirs(string[] value) { add(importPaths, value); } + void addStringImportDirs(string[] value) { add(stringImportPaths, value); } private void add(ref string[] arr, string[] vals) {