For "dub run", change the CWD only if non-empty. Fixes #272.
1 parent cad3afc commit 2a2ff73d95db33806ba5da21c5f66324580285b1
@Sönke Ludwig Sönke Ludwig authored on 21 Apr 2014
Showing 2 changed files
View
1
■■■■
source/dub/package_.d
break;
case "targetPath":
enforce(suffix.empty, "targetPath does not support platform customization.");
this.targetPath = value.get!string;
if (this.workingDirectory is null) this.workingDirectory = this.targetPath;
break;
case "targetName":
enforce(suffix.empty, "targetName does not support platform customization.");
this.targetName = value.get!string;
View
8
source/dub/project.d
}
dst.targetType = psettings.targetType;
dst.targetPath = psettings.targetPath;
dst.targetName = psettings.targetName;
dst.workingDirectory = processVars(psettings.workingDirectory, pkg_path, true);
if (!psettings.workingDirectory.empty)
dst.workingDirectory = processVars(psettings.workingDirectory, pkg_path, true);
if (psettings.mainSourceFile.length)
dst.mainSourceFile = processVars(psettings.mainSourceFile, pkg_path, true);
}
}
if (include_target_settings) {
dst.targetType = settings.targetType;
dst.targetPath = processVars(settings.targetPath, project_path, true);
dst.targetName = settings.targetName;
dst.workingDirectory = processVars(settings.workingDirectory, project_path, true);
if (!settings.workingDirectory.empty)
dst.workingDirectory = processVars(settings.workingDirectory, project_path, true);
if (settings.mainSourceFile.length)
dst.mainSourceFile = processVars(settings.mainSourceFile, project_path, true);
}
}