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

project config support for builder

This commit is contained in:
Anton Gushcha 2015-02-26 17:59:24 +03:00
parent b9b1b0e10b
commit 6de6b99afe
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,6 +16,7 @@ class Builder : BackgroundOperationWatcher {
protected ExternalProcess _extprocess; protected ExternalProcess _extprocess;
protected OutputPanel _log; protected OutputPanel _log;
protected ProtectedTextStorage _box; protected ProtectedTextStorage _box;
protected dstring _projectConfig;
protected BuildConfiguration _buildConfig; protected BuildConfiguration _buildConfig;
protected BuildOperation _buildOp; protected BuildOperation _buildOp;
protected bool _verbose; protected bool _verbose;
@ -23,8 +24,9 @@ class Builder : BackgroundOperationWatcher {
@property Project project() { return _project; } @property Project project() { return _project; }
@property void project(Project p) { _project = p; } @property void project(Project p) { _project = p; }
this(AppFrame frame, Project project, OutputPanel log, BuildConfiguration buildConfig, BuildOperation buildOp, bool verbose) { this(AppFrame frame, Project project, OutputPanel log, dstring projectConfig, BuildConfiguration buildConfig, BuildOperation buildOp, bool verbose) {
super(frame); super(frame);
_projectConfig = projectConfig;
_buildConfig = buildConfig; _buildConfig = buildConfig;
_buildOp = buildOp; _buildOp = buildOp;
_verbose = verbose; _verbose = verbose;
@ -83,6 +85,10 @@ class Builder : BackgroundOperationWatcher {
} }
} }
if(_projectConfig != DEFAULT_PROJECT_CONFIGURATION) {
params ~= "--config=".dup ~ cast(string)(_projectConfig);
}
if (_verbose) if (_verbose)
params ~= "-v".dup; params ~= "-v".dup;

2
src/dlangide/ui/frame.d
View File

@ -697,7 +697,7 @@ class IDEFrame : AppFrame {
_logPanel.logLine("No project is opened"); _logPanel.logLine("No project is opened");
return; return;
} }
Builder op = new Builder(this, currentWorkspace.startupProject, _logPanel, currentWorkspace.buildConfiguration, buildOp, false); Builder op = new Builder(this, currentWorkspace.startupProject, _logPanel, currentWorkspace.projectConfiguration, currentWorkspace.buildConfiguration, buildOp, false);
setBackgroundOperation(op); setBackgroundOperation(op);
} }