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-18 08:11:41 +03:00
parent 55301d641b fc51f4188e
commit 366891879a
5 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README.md
View File

@ -13,6 +13,11 @@ Currently supported features:
* DUB dependencies update * DUB dependencies update
* DUB package configuration selection (contributed by NCrashed) * DUB package configuration selection (contributed by NCrashed)
* Dependency projects are shown in workspace tree * Dependency projects are shown in workspace tree
* New project wizard
* Toolchain settings for DMD, LDC, GDC
* Project specific settings
* Basic debugger support using GDB (work in progress)
Source editor features: Source editor features:

2
dub.json
View File

@ -14,7 +14,7 @@
"copyFiles-windows": ["lib/win32/dcd-server.exe", "lib/win32/dcd-client.exe"], "copyFiles-windows": ["lib/win32/dcd-server.exe", "lib/win32/dcd-client.exe"],
"dependencies": { "dependencies": {
"dlangui": "~>0.7.22", "dlangui": "~>0.7.24",
"libdparse": "==0.2.0" "libdparse": "==0.2.0"
}, },

2
src/ddebug/gdb/gdbinterface.d
View File

@ -127,7 +127,7 @@ class GDBInterface : ConsoleDebuggerInterface, TextCommandTarget {
]; ];
Log.d("Terminal command line: ", args); Log.d("Terminal command line: ", args);
terminalPid = spawnProcess(args); terminalPid = spawnProcess(args);
for (int i = 0; i < 40; i++) { for (int i = 0; i < 80; i++) {
Thread.sleep(dur!"msecs"(100)); Thread.sleep(dur!"msecs"(100));
if (!isTerminalActive) { if (!isTerminalActive) {
Log.e("Failed to get terminal TTY"); Log.e("Failed to get terminal TTY");

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

@ -66,7 +66,6 @@ class Builder : BackgroundOperationWatcher {
ExternalProcessState state = _extprocess.state; ExternalProcessState state = _extprocess.state;
if (state == ExternalProcessState.None) { if (state == ExternalProcessState.None) {
_log.clear(); _log.clear();
_box.writeText("Running dub\n"d);
char[] program = "dub".dup; char[] program = "dub".dup;
char[][] params; char[][] params;
char[] dir = _project.dir.dup; char[] dir = _project.dir.dup;
@ -116,6 +115,8 @@ class Builder : BackgroundOperationWatcher {
if (_verbose) if (_verbose)
params ~= "-v".dup; 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); state = _extprocess.run(program, params, dir, _box, null);
if (state != ExternalProcessState.Running) { if (state != ExternalProcessState.Running) {
_box.writeText("Failed to run builder tool\n"d); _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 BuildConfiguration _buildConfiguration;
protected ProjectConfiguration _projectConfiguration = ProjectConfiguration.DEFAULT; protected ProjectConfiguration _projectConfiguration = ProjectConfiguration.DEFAULT;
this(IDEFrame frame, string fname = null) { this(IDEFrame frame, string fname = WORKSPACE_EXTENSION) {
super(fname); super(fname);
_workspaceFile = new SettingsFile(fname); _workspaceFile = new SettingsFile(fname);
_settings = new WorkspaceSettings(fname ? fname ~ WORKSPACE_SETTINGS_EXTENSION : null); _settings = new WorkspaceSettings(fname ? fname ~ WORKSPACE_SETTINGS_EXTENSION : null);