jeans/arduino-ide
1
0
Fork 0
mirror of https://github.com/arduino/arduino-ide.git synced 2025-11-09 02:18:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated the application name, version to 0.0.2.

Browse Source 
Increased the heap size for the packager.

Signed-off-by: Akos Kitta <kittaakos@typefox.io>
This commit is contained in:
Akos Kitta
2019-10-25 10:14:18 +02:00
parent 3efb5a4e08
commit 90d7d88162
11 changed files with 66 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@@ -29,10 +29,10 @@ Then you can start the browser example again:
yarn --cwd browser-app start
```
## Arduino-PoC Electron Application
## Arduino Pro IDE Electron Application
The project is built on [Azure DevOps](https://dev.azure.com/typefox/Arduino).
Currently, we provide the Arduino-PoC for the following platforms:
Currently, we provide the Arduino Pro IDE for the following platforms:
- Windows,
- macOS, and
- Linux.

2
arduino-ide-extension/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "arduino-ide-extension",
"version": "0.0.1",
"version": "0.0.2",
"description": "An extension for Theia building the Arduino IDE",
"license": "MIT",
"engines": {

2
arduino-ide-extension/src/node/arduino-backend-module.ts
View File

@@ -133,7 +133,7 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
return parentLogger.child('discovery');
}).inSingletonScope().whenTargetNamed('discovery');
// Default workspace server extension to initialize and use a fallback workspace (`~/Arduino-PoC/workspace/`)
// Default workspace server extension to initialize and use a fallback workspace.
// If nothing was set previously.
bind(DefaultWorkspaceServerExt).toSelf().inSingletonScope();
rebind(WorkspaceServer).toService(DefaultWorkspaceServerExt);

10
azure-pipelines.yml
View File

@@ -52,7 +52,7 @@ jobs:
- task: PublishBuildArtifacts@1
inputs:
pathtoPublish: electron/build/dist/$(ArduinoPoC.AppName)
artifactName: 'Arduino-PoC - Applications'
artifactName: 'Arduino Pro IDE - Applications'
condition: or(in(variables['Agent.OS'], 'Windows_NT'), in(variables['Build.Reason'], 'Manual', 'Schedule'))
displayName: Publish
- job: Release
@@ -65,16 +65,16 @@ jobs:
- task: DownloadBuildArtifacts@0
displayName: Download
inputs:
artifactName: 'Arduino-PoC - Applications'
artifactName: 'Arduino Pro IDE - Applications'
downloadPath: 'gh-release'
- task: GithubRelease@0
inputs:
gitHubConnection: typefox-service-account1
repositoryName: bcmi-labs/arduino-editor
assets: |
gh-release/Arduino-PoC - Applications/*.zip
gh-release/Arduino-PoC - Applications/*.dmg
gh-release/Arduino-PoC - Applications/*.tar.xz
gh-release/Arduino Pro IDE - Applications/*.zip
gh-release/Arduino Pro IDE - Applications/*.dmg
gh-release/Arduino Pro IDE - Applications/*.tar.xz
target: $(Build.SourceVersion)
action: Edit
tagSource: auto

8
browser-app/package.json
View File

@@ -1,10 +1,11 @@
{
"private": true,
"name": "browser-app",
"version": "0.0.1",
"version": "0.0.2",
"license": "MIT",
"dependencies": {
"@theia/core": "next",
"@theia/cpp": "next",
"@theia/editor": "next",
"@theia/file-search": "next",
"@theia/filesystem": "next",
@@ -16,9 +17,8 @@
"@theia/process": "next",
"@theia/terminal": "next",
"@theia/workspace": "next",
"@theia/cpp": "next",
"@theia/textmate-grammars": "next",
"arduino-ide-extension": "0.0.1"
"arduino-ide-extension": "0.0.2"
},
"devDependencies": {
"@theia/cli": "next"
@@ -31,7 +31,7 @@
"theia": {
"frontend": {
"config": {
"applicationName": "Arduino Editor",
"applicationName": "Arduino Pro IDE",
"defaultTheme": "arduino-theme",
"preferences": {
"editor.autoSave": "on"

8
electron-app/package.json
View File

@@ -1,10 +1,11 @@
{
"private": true,
"name": "electron-app",
"version": "0.0.1",
"version": "0.0.2",
"license": "MIT",
"dependencies": {
"@theia/core": "next",
"@theia/cpp": "next",
"@theia/editor": "next",
"@theia/electron": "next",
"@theia/file-search": "next",
@@ -17,9 +18,8 @@
"@theia/process": "next",
"@theia/terminal": "next",
"@theia/workspace": "next",
"@theia/cpp": "next",
"@theia/textmate-grammars": "next",
"arduino-ide-extension": "0.0.1"
"arduino-ide-extension": "0.0.2"
},
"devDependencies": {
"@theia/cli": "next",
@@ -34,7 +34,7 @@
"target": "electron",
"frontend": {
"config": {
"applicationName": "Arduino Editor",
"applicationName": "Arduino Pro IDE",
"defaultTheme": "arduino-theme",
"preferences": {
"editor.autoSave": "on"

4
electron/README.md
View File

@@ -1,13 +1,13 @@
## Electron
All-in-one packager producing the `Arduino-PoC` Electron-based application.
All-in-one packager producing the `Arduino Pro IDE` Electron-based application.
## Prerequisites
The prerequisites are defined [here](https://github.com/theia-ide/theia/blob/master/doc/Developing.md#prerequisites).
### Build:
To build the Arduino-PoC Electron-based Theia application you have to do the followings:
To build the Arduino Pro IDE application you have to do the followings:
```bash
yarn --cwd ./electron/packager/ && yarn --cwd ./electron/packager/ package
```

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

@@ -1,14 +1,17 @@
{
"name": "arduino-electron",
"description": "Arduino-PoC Electron",
"name": "arduino.Pro.IDE",
"description": "Arduino Pro IDE",
"main": "src-gen/frontend/electron-main.js",
"author": "TypeFox",
"dependencies": {
"google-protobuf": "^3.5.0",
"arduino-ide-extension": "file:../working-copy/arduino-ide-extension"
},
"resolutions": {
"**/fs-extra": "^4.0.2"
},
"devDependencies": {
"electron-builder": "^20.36.2"
"electron-builder": "^21.2.0"
},
"scripts": {
"build": "theia build --mode development",
@@ -21,16 +24,17 @@
},
"repository": {
"type": "git",
"url": "git+https://github.com/TypeFox/arduino-poc.git"
"url": "git+https://github.com/arduino/arduino-pro-ide.git"
},
"// Notes:" : [
"// Notes:": [
"The `electronVersion` version was pinned for `@grpc/grpc-js` -> Node.js version constraints.",
"`google-protobuf` was declared as it is not picked up by the `electron-builder` as a runtime dependency."
"`google-protobuf` was declared as it is not picked up by the `electron-builder` as a runtime dependency.",
"The resolution for `fs-extra` was required due to this: https://spectrum.chat/theia/general/our-theia-electron-builder-app-no-longer-starts~f5cf09a0-6d88-448b-8818-24ad0ec2ee7c"
],
"build": {
"productName": "Arduino-PoC",
"appId": "arduino.PoC",
"electronVersion": "4.0.0",
"productName": "Arduino Pro IDE",
"appId": "arduino.Pro.IDE",
"electronVersion": "4.2.0",
"asar": false,
"directories": {
"buildResources": "resources"
@@ -49,40 +53,40 @@
"!node_modules/onigasm/*"
],
"win": {
"target": [
"zip"
],
"artifactName": "${productName}-${env.ARDUINO_VERSION}-${os}.${ext}"
"target": [
"zip"
],
"artifactName": "${productName}-${env.ARDUINO_VERSION}-${os}.${ext}"
},
"mac": {
"target": [
"dmg"
],
"artifactName": "${productName}-${env.ARDUINO_VERSION}-${os}.${ext}",
"darkModeSupport": true
"target": [
"dmg"
],
"artifactName": "${productName}-${env.ARDUINO_VERSION}-${os}.${ext}",
"darkModeSupport": true
},
"linux": {
"target": [
"tar.xz"
"tar.xz"
],
"artifactName": "${productName}-${env.ARDUINO_VERSION}-${os}.${ext}"
},
"dmg": {
"icon": "resources/icon.icns",
"iconSize": 128,
"contents": [
{
"x": 380,
"y": 240,
"type": "link",
"path": "/Applications"
},
{
"x": 122,
"y": 240,
"type": "file"
}
]
"icon": "resources/icon.icns",
"iconSize": 128,
"contents": [
{
"x": 380,
"y": 240,
"type": "link",
"path": "/Applications"
},
{
"x": 122,
"y": 240,
"type": "file"
}
]
}
}
}

2
electron/packager/cli
View File

@@ -25,7 +25,7 @@ const yargs = require('yargs');
process.stderr.write(`Unexpected platform: ${platform}.`);
process.exit(1);
}
process.stdout.write(`Arduino-PoC-${versionInfo().version}-${os}.${ext}`);
process.stdout.write(`Arduino Pro IDE-${versionInfo().version}-${os}.${ext}`);
process.exit(0);
}
})

11
electron/packager/index.js
View File

@@ -5,7 +5,8 @@
const fs = require('fs');
const join = require('path').join;
const shell = require('shelljs');
shell.env.THEIA_ELECTRON_SKIP_REPLACE_FFMPEG = '1';
shell.env.THEIA_ELECTRON_SKIP_REPLACE_FFMPEG = '1'; // Do not run the ffmpeg validation for the packager.
shell.env.NODE_OPTIONS = '--max_old_space_size=4096'; // Increase heap size for the CI
const utils = require('./utils');
const { version, release } = utils.versionInfo();
@@ -64,7 +65,7 @@
//-------------------------------------------------------------------------------------------------+
// Rebuild the extension with the copied `yarn.lock`. It is a must to use the same Theia versions. |
//-------------------------------------------------------------------------------------------------+
exec(`yarn --network-timeout 1000000 --cwd ${path('..', workingCopy)}`, 'Building the Arduino Theia extensions');
exec(`yarn --network-timeout 1000000 --cwd ${path('..', workingCopy)}`, 'Building the Arduino Pro IDE extensions');
// Collect all unused dependencies by the backend. We have to remove them from the electron app.
// The `bundle.js` already contains everything we need for the frontend.
// We have to do it before changing the dependencies to `local-path`.
@@ -87,7 +88,7 @@
devDependencies: pkg.devDependencies
}, null, 2));
echo(`📜 Effective 'package.json' for the Arduino-PoC application is:
echo(`📜 Effective 'package.json' for the Arduino Pro IDE application is:
-----------------------
${fs.readFileSync(path('..', 'build', 'package.json')).toString()}
-----------------------
@@ -108,7 +109,7 @@ ${fs.readFileSync(path('..', 'build', 'package.json')).toString()}
// Install all private and public dependencies for the electron application and build Theia. |
//-------------------------------------------------------------------------------------------+
exec(`yarn --network-timeout 1000000 --cwd ${path('..', 'build')}`, 'Installing dependencies');
exec(`yarn --network-timeout 1000000 --cwd ${path('..', 'build')} build${release ? ':release' : ''}`, 'Building the Arduino-PoC application');
exec(`yarn --network-timeout 1000000 --cwd ${path('..', 'build')} build${release ? ':release' : ''}`, 'Building the Arduino Pro IDE application');
//------------------------------------------------------------------------------+
// Create a throw away dotenv file which we use to feed the builder with input. |
@@ -124,7 +125,7 @@ ${fs.readFileSync(path('..', 'build', 'package.json')).toString()}
//-----------------------------------+
// Package the electron application. |
//-----------------------------------+
exec(`yarn --network-timeout 1000000 --cwd ${path('..', 'build')} package`, `Packaging your Arduino-PoC application`);
exec(`yarn --network-timeout 1000000 --cwd ${path('..', 'build')} package`, `Packaging your Arduino Pro IDE application`);
echo(`🎉 Success. Your application is at: ${path('..', 'build', 'dist')}`);
restore();

2
electron/packager/package.json
View File

@@ -2,7 +2,7 @@
"private": true,
"name": "packager",
"version": "1.0.0",
"description": "Packager for the Arduino-PoC electron application",
"description": "Packager for the Arduino Pro IDE electron application",
"main": "index.js",
"scripts": {
"package": "node index.js",