jeans/arduino-ide
jeans/arduino-ide
1
0
Fork 0
mirror of https://github.com/arduino/arduino-ide.git synced 2025-06-17 01:26:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated the packager, included the debug extension

Browse Source 
Note, I did not check in `/electron/packager/yarn.lock`.
It should be checked in, see the `master`.

Signed-off-by: Akos Kitta <kittaakos@typefox.io>
This commit is contained in:
Akos Kitta 2019-11-28 12:04:07 +01:00 committed by Miro Spönemann
parent 5baf43bf25
commit 2b7bceada0
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
electron/build/template-package.json
View File

@ -4,7 +4,8 @@
"main": "src-gen/frontend/electron-main.js", "main": "src-gen/frontend/electron-main.js",
"author": "Arduino SA", "author": "Arduino SA",
"dependencies": { "dependencies": {
"arduino-ide-extension": "file:../working-copy/arduino-ide-extension" "arduino-ide-extension": "file:../working-copy/arduino-ide-extension",
"arduino-debugger-extension": "file:../working-copy/arduino-debugger-extension"
}, },
"resolutions": { "resolutions": {
"**/fs-extra": "^4.0.3" "**/fs-extra": "^4.0.3"

14
electron/packager/index.js
View File

@ -42,13 +42,13 @@
// Copy the following items into the `working-copy` folder. Make sure to reuse the `yarn.lock`. | // Copy the following items into the `working-copy` folder. Make sure to reuse the `yarn.lock`. |
//----------------------------------------------------------------------------------------------+ //----------------------------------------------------------------------------------------------+
mkdir('-p', path('..', workingCopy)); mkdir('-p', path('..', workingCopy));
for (const name of ['arduino-ide-extension', 'electron-app', 'yarn.lock', 'package.json', 'lerna.json']) { for (const name of ['arduino-ide-extension', 'arduino-debugger-extension', 'electron-app', 'yarn.lock', 'package.json', 'lerna.json']) {
cp('-rf', path(rootPath, name), path('..', workingCopy)); cp('-rf', path(rootPath, name), path('..', workingCopy));
} }
//-----------------------------------------------------+ //---------------------------------------------+
// No need to build the `browser-app` example. | // No need to build the `browser-app` example. |
//-----------------------------------------------------+ //---------------------------------------------+
//@ts-ignore //@ts-ignore
let pkg = require('../working-copy/package.json'); let pkg = require('../working-copy/package.json');
const workspaces = pkg.workspaces; const workspaces = pkg.workspaces;
@ -72,6 +72,14 @@
// We have to do it before changing the dependencies to `local-path`. // We have to do it before changing the dependencies to `local-path`.
const unusedDependencies = await utils.collectUnusedDependencies('../working-copy/electron-app/'); const unusedDependencies = await utils.collectUnusedDependencies('../working-copy/electron-app/');
//-------------------------------------------------------------------------------------------------------------+
// Change the regular NPM dependencies to `local-paths`, so that we can build them without any NPM registries. |
//-------------------------------------------------------------------------------------------------------------+
// @ts-ignore
pkg = require('../working-copy/arduino-debugger-extension/package.json');
pkg.dependencies['arduino-ide-extension'] = 'file:../arduino-ide-extension';
fs.writeFileSync(path('..', workingCopy, 'arduino-debugger-extension', 'package.json'), JSON.stringify(pkg, null, 2));
//------------------------------------------------------------------------------------+ //------------------------------------------------------------------------------------+
// Merge the `working-copy/package.json` with `electron/build/template-package.json`. | // Merge the `working-copy/package.json` with `electron/build/template-package.json`. |
//------------------------------------------------------------------------------------+ //------------------------------------------------------------------------------------+