Skip to content
This repository was archived by the owner on Oct 1, 2024. It is now read-only.

add prebuild for build and verify #551

Merged
merged 2 commits into from
May 7, 2018
Merged

add prebuild for build and verify #551

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29c64c8
add prebuild for build and verify
Sneezry May 7, 2018
d3044cb
update readme
Sneezry May 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions src/arduino/arduino.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,18 @@ export class ArduinoApp {
UsbDetector.getInstance().pauseListening();
await vscode.workspace.saveAll(false);

if (dc.prebuild) {
arduinoChannel.info(`Run prebuild command: ${dc.prebuild}`);
const prebuildargs = dc.prebuild.split(" ");
const prebuildCommand = prebuildargs.shift();
try {
await util.spawn(prebuildCommand, arduinoChannel.channel, prebuildargs, {shell: true, cwd: ArduinoWorkspace.rootPath});
} catch (ex) {
arduinoChannel.error(`Run prebuild failed: \n${ex.error}`);
return;
}
}

const appPath = path.join(ArduinoWorkspace.rootPath, dc.sketch);
const args = ["--upload", "--board", boardDescriptor, "--port", dc.port, appPath];
if (VscodeSettings.getInstance().logLevel === "verbose") {
Expand Down Expand Up @@ -161,6 +173,19 @@ export class ArduinoApp {
await vscode.workspace.saveAll(false);

arduinoChannel.start(`Verify sketch - ${dc.sketch}`);

if (dc.prebuild) {
arduinoChannel.info(`Run prebuild command: ${dc.prebuild}`);
const prebuildargs = dc.prebuild.split(" ");
const prebuildCommand = prebuildargs.shift();
try {
await util.spawn(prebuildCommand, arduinoChannel.channel, prebuildargs, {shell: true, cwd: ArduinoWorkspace.rootPath});
} catch (ex) {
arduinoChannel.error(`Run prebuild failed: \n${ex.error}`);
return;
}
}

const appPath = path.join(ArduinoWorkspace.rootPath, dc.sketch);
const args = ["--verify", "--board", boardDescriptor, appPath];
if (VscodeSettings.getInstance().logLevel === "verbose") {
Expand Down
9 changes: 9 additions & 0 deletions src/deviceContext.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@ export class DeviceContext implements IDeviceContext, vscode.Disposable {

private _sketchStatusBar: vscode.StatusBarItem;

private _prebuild: string;

/**
* @constructor
*/
Expand Down Expand Up @@ -142,6 +144,7 @@ export class DeviceContext implements IDeviceContext, vscode.Disposable {
this._output = deviceConfigJson.output;
this._debugger = deviceConfigJson["debugger"];
this._onDidChange.fire();
this._prebuild = deviceConfigJson.prebuild;
} else {
Logger.notifyUserError("arduinoFileError", new Error(constants.messages.ARDUINO_FILE_ERROR));
}
Expand All @@ -153,6 +156,7 @@ export class DeviceContext implements IDeviceContext, vscode.Disposable {
this._output = null;
this._debugger = null;
this._onDidChange.fire();
this._prebuild = null;
}
return this;
}, (reason) => {
Expand All @@ -169,6 +173,7 @@ export class DeviceContext implements IDeviceContext, vscode.Disposable {
this._output = null;
this._debugger = null;
this._onDidChange.fire();
this._prebuild = null;

return this;
});
Expand Down Expand Up @@ -243,6 +248,10 @@ export class DeviceContext implements IDeviceContext, vscode.Disposable {
this.saveContext();
}

public get prebuild() {
return this._prebuild.trim();
}

public get output() {
return this._output;
}
Expand Down