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

Fix serialport #982

Merged
merged 9 commits into from
Mar 19, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ before_install:
wget https://downloads.arduino.cc/arduino-1.8.2-linux64.tar.xz -P /home/$USER;
tar -xvf /home/$USER/arduino-1.8.2-linux64.tar.xz -C /home/$USER/;
sudo ln -s /home/$USER/arduino-1.8.2/arduino /usr/bin/arduino;
sudo apt-get update;
sudo apt-get install g++-multilib;
sudo apt-get install -y build-essential;
sudo apt-get install libudev-dev;
fi
# Arduino 1.8.7 has breaking change, Install board package and library will fail
# https://github.com/arduino/Arduino/issues/8034
Expand All @@ -46,6 +50,7 @@ before_install:

install:
- npm install -g vsce
- npm install -g node-gyp
- npm install -g typescript
- npm install -g gulp
- npm install
Expand Down
12 changes: 6 additions & 6 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,26 +7,26 @@
// ${cwd}: the current working directory of the spawned process
// A task runner that calls a custom npm script that compiles the extension.
{
"version": "0.1.0",
"version": "2.0.0",
"command": "gulp",
"isShellCommand": true,
"args": [
"--no-color"
],
"tasks": [
{
"taskName": "build",
"label": "build",
"args": [],
"isBuildCommand": true,
"type": "shell",
"group": "build",
"isBackground": false,
"problemMatcher": [
"$tsc"
]
},
{
"taskName": "build_without_view",
"label": "build_without_view",
"args": [],
"isBuildCommand": true,
"group": "build",
"isBackground": false,
"problemMatcher": [
"$tsc"
Expand Down
13 changes: 3 additions & 10 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,18 @@ const sourcemaps = require("gulp-sourcemaps");
const webpack = require("webpack");
const del = require('del');
const fs = require("fs");
const fsp = require('fs-plus');
const path = require("path");
const childProcess = require("child_process");
const argv = require('minimist')(process.argv.slice(2));

//...
gulp.task("tslint", () => {
return gulp.src(["**/*.ts", "**/*.tsx", "!**/*.d.ts", "!node_modules/**", "!./src/views/node_modules/**"])
return gulp.src(["**/*.ts", "**/*.tsx", "!**/*.d.ts", "!./vendor/**", "!node_modules/**", "!./src/views/node_modules/**", "!out/**"])
.pipe(tslint())
.pipe(tslint.report());
});

gulp.task("eslint", () => {
return gulp.src(["./vendor/**/*.js", "!**/node_modules/**"])
return gulp.src(["!**/node_modules/**"])
.pipe(eslint())
.pipe(eslint.format())
.pipe(eslint.failAfterError());
Expand Down Expand Up @@ -99,11 +97,6 @@ gulp.task("genAikey", (done) => {
}
});

gulp.task("copyVendor", (done) => {
fsp.copySync('vendor', 'out/vendor');
done();
});

gulp.task("test", (done) => {
function removeExtensionDependencies() {
const packageJson = JSON.parse(fs.readFileSync("package.json"));
Expand Down Expand Up @@ -149,7 +142,7 @@ gulp.task("test", (done) => {
});
});

gulp.task("build", gulp.series("clean", "ts-compile", "html-webpack", "node_modules-webpack", "copyVendor"));
gulp.task("build", gulp.series("clean", "ts-compile", "html-webpack", "node_modules-webpack"));

gulp.task("build_without_view", gulp.series("clean", "ts-compile"));

Expand Down
Loading