AllSpiceMirrors/ThunderScope
7
Fork 0
mirror of https://github.com/EEVengers/ThunderScope.git synced 2025-04-22 17:43:44 +00:00
Files Issues Releases Activity

Include tesdata in installer

Browse Source
This commit is contained in:
Ratan Varghese 2021-03-27 04:22:08 -04:00
parent 96b46c3ac4
commit d213537262
2 changed files with 18 additions and 10 deletions
Software/waveview
electron
preload.ts
package.json

21
Software/waveview/electron/preload.ts
View File

@ -3,10 +3,13 @@
import * as fs from 'fs';
import { spawn } from 'child_process';
import { contextBridge } from 'electron';
import { contextBridge, app } from 'electron';
const cwd = process.cwd();
const cpp = spawn(cwd + "\\build_cpp\\Release\\scope.exe", ["-c"]);
const cpp_suffix_win = "\\build_cpp\\Release\\scope.exe";
const cpp_suffix_nix = "/build_cpp/Debug/scope";
const cpp_path = cwd + ((process.platform == "win32") ? cpp_suffix_win : cpp_suffix_nix);
const cpp = spawn(cpp_path, ["-c"]);
var did_open = false;
const SOCKET_PREFIX = (process.platform == "win32") ? "\\\\.\\pipe\\" : "/tmp/";
@ -16,11 +19,10 @@ var TX_FD = -1;
var RX_FD = -1;
cpp.stdout.on('data', (data) => {
console.log(`cpp stdout: ${data}`);
if(TX_FD != -1 && RX_FD != 1) {
did_open = true;
}
console.log(`cpp stdout:\n${data}`);
if(!did_open) {
console.log(`cpp_path: ${cpp_path}`);
fs.open(SOCKETFILE_TX, "w", (err, fd) => {
if(err) {
console.error(err);
@ -34,7 +36,12 @@ cpp.stdout.on('data', (data) => {
RX_FD = fd;
});
}
})
did_open = true;
});
cpp.stderr.on('data', (data) => {
console.error(`cpp stderr:\n${data}`);
});
//Welcome to the future: https://www.electronjs.org/docs/tutorial/context-isolation
contextBridge.exposeInMainWorld("thunderBridge", {

7
Software/waveview/package.json
View File

@ -46,8 +46,8 @@
"postinstall": "electron-builder install-app-deps",
"electron-dev": "concurrently \"BROWSER=none npm run start\" \"wait-on http://localhost:3000 && ./node_modules/.bin/tsc -p electron -w\" \"wait-on http://localhost:3000 && ./node_modules/.bin/tsc -p electron && electron .\"",
"electron-dev-win": "concurrently \"set BROWSER=none && call npm run start\" \"wait-on http://localhost:3000 && node_modules\\.bin\\tsc -p electron -w\" \"wait-on http://localhost:3000 && node_modules\\.bin\\tsc -p electron && electron %INIT_CWD%\"",
"electron-build": "npm run build && ./node_modules/.bin/tsc -p electron && electron-builder",
"electron-build-win": "npm run build && node_modules\\.bin\\tsc -p electron && electron-builder",
"electron-build": "npm run make-cpp && npm run build && ./node_modules/.bin/tsc -p electron && electron-builder",
"electron-build-win": "npm run make-cpp-win && npm run build && node_modules\\.bin\\tsc -p electron && electron-builder",
"make-cpp": "cmake-js compile --debug -O build_cpp",
"make-cpp-win": "cmake-js compile -O build_cpp"
},
@ -84,7 +84,8 @@
],
"extraFiles": [
"build_cpp/Release/**/*",
"build_cpp/Debug/**/*"
"build_cpp/Debug/**/*",
"scope_link/test/*.csv"
],
"directories": {
"buildResources": "assets"