forks
/
dlangide
mirror of https://github.com/buggins/dlangide.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:buggins/dlangide

This commit is contained in:
Vadim Lopatin 2015-12-17 18:39:37 +03:00
parent 7a25003987 5a3e6e3055
commit ebb5d41e5a
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/dlangide/builders/builder.d
View File

@ -66,7 +66,6 @@ class Builder : BackgroundOperationWatcher {
ExternalProcessState state = _extprocess.state;
if (state == ExternalProcessState.None) {
_log.clear();
_box.writeText("Running dub\n"d);
char[] program = "dub".dup;
char[][] params;
char[] dir = _project.dir.dup;
@ -116,6 +115,8 @@ class Builder : BackgroundOperationWatcher {
if (_verbose)
params ~= "-v".dup;
auto text = "Running (in " ~ dir ~ "): " ~ program ~ " " ~ params.join(' ') ~ "\n";
_box.writeText(to!dstring(text));
state = _extprocess.run(program, params, dir, _box, null);
if (state != ExternalProcessState.Running) {
_box.writeText("Failed to run builder tool\n"d);

2
src/dlangide/workspace/workspace.d
View File

@ -58,7 +58,7 @@ class Workspace : WorkspaceItem {
protected BuildConfiguration _buildConfiguration;
protected ProjectConfiguration _projectConfiguration = ProjectConfiguration.DEFAULT;
this(IDEFrame frame, string fname = null) {
this(IDEFrame frame, string fname = WORKSPACE_EXTENSION) {
super(fname);
_workspaceFile = new SettingsFile(fname);
_settings = new WorkspaceSettings(fname ? fname ~ WORKSPACE_SETTINGS_EXTENSION : null);