jeans/arduino-ide
jeans/arduino-ide
1
0
Fork 0
mirror of https://github.com/arduino/arduino-ide.git synced 2025-06-07 12:46:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Renamed the application. Updated links and version

Browse Source 
Signed-off-by: Akos Kitta <kittaakos@typefox.io>
This commit is contained in:
Akos Kitta 2021-02-08 14:06:42 +01:00 committed by Akos Kitta
parent cfe9e8ec95
commit b8647f16ad
21 changed files with 74 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.github/workflows/build.yml vendored
View File

@ -1,4 +1,4 @@
name: Arduino Pro IDE name: Arduino IDE
on: on:
push: push:
@ -22,7 +22,6 @@ jobs:
- os: windows-latest - os: windows-latest
- os: ubuntu-latest - os: ubuntu-latest
- os: macos-latest - os: macos-latest
# - os: rsora-rpi-arm # self-hosted armhf
runs-on: ${{ matrix.config.os }} runs-on: ${{ matrix.config.os }}
timeout-minutes: 90 timeout-minutes: 90
@ -98,7 +97,7 @@ jobs:
if [ "$IS_RELEASE" = true ]; then if [ "$IS_RELEASE" = true ]; then
export BODY=$(echo -e "$GIT_LOG") export BODY=$(echo -e "$GIT_LOG")
else else
export LATEST_TAG_WITH_LINK=$(echo "[$LATEST_TAG](https://github.com/arduino/arduino-pro-ide/releases/tag/$LATEST_TAG)") export LATEST_TAG_WITH_LINK=$(echo "[$LATEST_TAG](https://github.com/arduino/arduino-ide/releases/tag/$LATEST_TAG)")
if [ -z "$GIT_LOG" ]; then if [ -z "$GIT_LOG" ]; then
export BODY="There were no changes since version $LATEST_TAG_WITH_LINK." export BODY="There were no changes since version $LATEST_TAG_WITH_LINK."
else else
@ -135,7 +134,7 @@ jobs:
env: env:
PLUGIN_SOURCE: "build-artifacts/*" PLUGIN_SOURCE: "build-artifacts/*"
PLUGIN_STRIP_PREFIX: "build-artifacts/" PLUGIN_STRIP_PREFIX: "build-artifacts/"
PLUGIN_TARGET: "/arduino-pro-ide/nightly" PLUGIN_TARGET: "/arduino-ide/nightly"
PLUGIN_BUCKET: ${{ secrets.DOWNLOADS_BUCKET }} PLUGIN_BUCKET: ${{ secrets.DOWNLOADS_BUCKET }}
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@ -159,8 +158,7 @@ jobs:
- name: Publish Release [GitHub] - name: Publish Release [GitHub]
uses: svenstaro/upload-release-action@2.2.0 uses: svenstaro/upload-release-action@2.2.0
with: with:
repo_token: ${{ secrets.RELEASE_TOKEN }} repo_token: ${{ secrets.GITHUB_TOKEN }}
repo_name: arduino/arduino-pro-ide
release_name: ${{ steps.tag_name.outputs.TAG_NAME }} release_name: ${{ steps.tag_name.outputs.TAG_NAME }}
file: build-artifacts/* file: build-artifacts/*
tag: ${{ github.ref }} tag: ${{ github.ref }}
@ -172,7 +170,7 @@ jobs:
env: env:
PLUGIN_SOURCE: "build-artifacts/*" PLUGIN_SOURCE: "build-artifacts/*"
PLUGIN_STRIP_PREFIX: "build-artifacts/" PLUGIN_STRIP_PREFIX: "build-artifacts/"
PLUGIN_TARGET: "/arduino-pro-ide" PLUGIN_TARGET: "/arduino-ide"
PLUGIN_BUCKET: ${{ secrets.DOWNLOADS_BUCKET }} PLUGIN_BUCKET: ${{ secrets.DOWNLOADS_BUCKET }}
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

22
.vscode/tasks.json vendored
View File

@ -4,7 +4,7 @@
"version": "2.0.0", "version": "2.0.0",
"tasks": [ "tasks": [
{ {
"label": "Arduino Pro IDE - Rebuild Electron App", "label": "Arduino IDE - Rebuild Electron App",
"type": "shell", "type": "shell",
"command": "yarn rebuild:browser && yarn rebuild:electron", "command": "yarn rebuild:browser && yarn rebuild:electron",
"group": "build", "group": "build",
@ -15,7 +15,7 @@
} }
}, },
{ {
"label": "Arduino Pro IDE - Start Browser App", "label": "Arduino IDE - Start Browser App",
"type": "shell", "type": "shell",
"command": "yarn --cwd ./browser-app start", "command": "yarn --cwd ./browser-app start",
"group": "build", "group": "build",
@ -26,7 +26,7 @@
} }
}, },
{ {
"label": "Arduino Pro IDE - Watch IDE Extension", "label": "Arduino IDE - Watch IDE Extension",
"type": "shell", "type": "shell",
"command": "yarn --cwd ./arduino-ide-extension watch", "command": "yarn --cwd ./arduino-ide-extension watch",
"group": "build", "group": "build",
@ -37,7 +37,7 @@
} }
} }
{ {
"label": "Arduino Pro IDE - Watch Browser App", "label": "Arduino IDE - Watch Browser App",
"type": "shell", "type": "shell",
"command": "yarn --cwd ./browser-app watch", "command": "yarn --cwd ./browser-app watch",
"group": "build", "group": "build",
@ -48,7 +48,7 @@
} }
}, },
{ {
"label": "Arduino Pro IDE - Watch Electron App", "label": "Arduino IDE - Watch Electron App",
"type": "shell", "type": "shell",
"command": "yarn --cwd ./electron-app watch", "command": "yarn --cwd ./electron-app watch",
"group": "build", "group": "build",
@ -59,19 +59,19 @@
} }
}, },
{ {
"label": "Arduino Pro IDE - Watch All [Browser]", "label": "Arduino IDE - Watch All [Browser]",
"type": "shell", "type": "shell",
"dependsOn": [ "dependsOn": [
"Arduino Pro IDE - Watch IDE Extension", "Arduino IDE - Watch IDE Extension",
"Arduino Pro IDE - Watch Browser App" "Arduino IDE - Watch Browser App"
] ]
}, },
{ {
"label": "Arduino Pro IDE - Watch All [Electron]", "label": "Arduino IDE - Watch All [Electron]",
"type": "shell", "type": "shell",
"dependsOn": [ "dependsOn": [
"Arduino Pro IDE - Watch IDE Extension", "Arduino IDE - Watch IDE Extension",
"Arduino Pro IDE - Watch Electron App" "Arduino IDE - Watch Electron App"
] ]
} }
] ]

42
README.md
View File

@ -1,10 +1,10 @@
# Arduino Pro IDE # Arduino IDE
[![Arduino Pro IDE](https://github.com/bcmi-labs/arduino-editor/workflows/Arduino%20Pro%20IDE/badge.svg)](https://github.com/bcmi-labs/arduino-editor/actions?query=workflow%3A%22Arduino+Pro+IDE%22) [![Arduino IDE](https://github.com/bcmi-labs/arduino-editor/workflows/Arduino%20Pro%20IDE/badge.svg)](https://github.com/bcmi-labs/arduino-editor/actions?query=workflow%3A%22Arduino+Pro+IDE%22)
### Download ### Download
You can download the latest version of the Arduino Pro IDE application for the supported platforms from the [GitHub release page](https://github.com/arduino/arduino-pro-ide/releases) or following the links in the following table. You can download the latest version of the Arduino IDE application for the supported platforms from the [GitHub release page](https://github.com/arduino/arduino-ide/releases) or following the links in the following table.
#### Latest version #### Latest version
@ -15,16 +15,16 @@ Linux ARM | [🚧 Work in progress...] | [🚧 Work in progress...]
Windows | | [Windows 64 bit installer]<br />[Windows 64 bit MSI]<br />[Windows 64 bit ZIP] | Windows | | [Windows 64 bit installer]<br />[Windows 64 bit MSI]<br />[Windows 64 bit ZIP] |
macOS | | [macOS 64 bit] | macOS | | [macOS 64 bit] |
[🚧 Work in progress...]: https://github.com/arduino/arduino-pro-ide/issues/287 [🚧 Work in progress...]: https://github.com/arduino/arduino-ide/issues/287
[Linux 64 bit]: https://downloads.arduino.cc/arduino-pro-ide/arduino-pro-ide_latest_Linux_64bit.zip [Linux 64 bit]: https://downloads.arduino.cc/arduino-ide/arduino-ide_latest_Linux_64bit.zip
[Windows 64 bit installer]: https://downloads.arduino.cc/arduino-pro-ide/arduino-pro-ide_latest_Windows_64bit.exe [Windows 64 bit installer]: https://downloads.arduino.cc/arduino-ide/arduino-ide_latest_Windows_64bit.exe
[Windows 64 bit MSI]: https://downloads.arduino.cc/arduino-pro-ide/arduino-pro-ide_latest_Windows_64bit.msi [Windows 64 bit MSI]: https://downloads.arduino.cc/arduino-ide/arduino-ide_latest_Windows_64bit.msi
[Windows 64 bit ZIP]: https://downloads.arduino.cc/arduino-pro-ide/arduino-pro-ide_latest_Windows_64bit.zip [Windows 64 bit ZIP]: https://downloads.arduino.cc/arduino-ide/arduino-ide_latest_Windows_64bit.zip
[macOS 64 bit]: https://downloads.arduino.cc/arduino-pro-ide/arduino-pro-ide_latest_macOS_64bit.dmg [macOS 64 bit]: https://downloads.arduino.cc/arduino-ide/arduino-ide_latest_macOS_64bit.dmg
#### Previous versions #### Previous versions
These are available from the [GitHub releases page](https://github.com/arduino/arduino-pro-ide/releases). These are available from the [GitHub releases page](https://github.com/arduino/arduino-ide/releases).
#### Nightly builds #### Nightly builds
@ -39,12 +39,12 @@ Linux ARM | [🚧 Work in progress...] | [🚧 Work in progress...]
Windows | | [Nightly Windows 64 bit installer]<br />[Nightly Windows 64 bit MSI]<br />[Nightly Windows 64 bit ZIP] | Windows | | [Nightly Windows 64 bit installer]<br />[Nightly Windows 64 bit MSI]<br />[Nightly Windows 64 bit ZIP] |
macOS | | [Nightly macOS 64 bit] | macOS | | [Nightly macOS 64 bit] |
[🚧 Work in progress...]: https://github.com/arduino/arduino-pro-ide/issues/287 [🚧 Work in progress...]: https://github.com/arduino/arduino-ide/issues/287
[Nightly Linux 64 bit]: https://downloads.arduino.cc/arduino-pro-ide/nightly/arduino-pro-ide_nightly-latest_Linux_64bit.zip [Nightly Linux 64 bit]: https://downloads.arduino.cc/arduino-ide/nightly/arduino-ide_nightly-latest_Linux_64bit.zip
[Nightly Windows 64 bit installer]: https://downloads.arduino.cc/arduino-pro-ide/nightly/arduino-pro-ide_nightly-latest_Windows_64bit.exe [Nightly Windows 64 bit installer]: https://downloads.arduino.cc/arduino-ide/nightly/arduino-ide_nightly-latest_Windows_64bit.exe
[Nightly Windows 64 bit MSI]: https://downloads.arduino.cc/arduino-pro-ide/nightly/arduino-pro-ide_nightly-latest_Windows_64bit.msi [Nightly Windows 64 bit MSI]: https://downloads.arduino.cc/arduino-ide/nightly/arduino-ide_nightly-latest_Windows_64bit.msi
[Nightly Windows 64 bit ZIP]: https://downloads.arduino.cc/arduino-pro-ide/nightly/arduino-pro-ide_nightly-latest_Windows_64bit.zip [Nightly Windows 64 bit ZIP]: https://downloads.arduino.cc/arduino-ide/nightly/arduino-ide_nightly-latest_Windows_64bit.zip
[Nightly macOS 64 bit]: https://downloads.arduino.cc/arduino-pro-ide/nightly/arduino-pro-ide_nightly-latest_macOS_64bit.dmg [Nightly macOS 64 bit]: https://downloads.arduino.cc/arduino-ide/nightly/arduino-ide_nightly-latest_macOS_64bit.dmg
> These links return an HTTP `302: Found` response, redirecting to latest > These links return an HTTP `302: Found` response, redirecting to latest
generated builds by replacing `latest` with the latest available build generated builds by replacing `latest` with the latest available build
@ -54,7 +54,7 @@ macOS | | [Nightly macOS 64 bit]
### Build from source ### Build from source
If you’re familiar with TypeScript, the [Theia IDE](https://theia-ide.org/), and if you want to contribute to the If you’re familiar with TypeScript, the [Theia IDE](https://theia-ide.org/), and if you want to contribute to the
project, you should be able to build the Arduino Pro IDE locally. Please refer to the [Theia IDE prerequisites](https://github.com/theia-ide/theia/blob/master/doc/) documentation for the setup instructions. project, you should be able to build the Arduino IDE locally. Please refer to the [Theia IDE prerequisites](https://github.com/theia-ide/theia/blob/master/doc/) documentation for the setup instructions.
### Build ### Build
```sh ```sh
@ -114,7 +114,7 @@ git add . \
git tag -a 0.2.0 -m "0.2.0" \ git tag -a 0.2.0 -m "0.2.0" \
&& git push origin 0.2.0 && git push origin 0.2.0
``` ```
- The release build starts automatically and uploads the artifacts with the changelog to the Pro IDE [release page](https://github.com/arduino/arduino-pro-ide/releases). - The release build starts automatically and uploads the artifacts with the changelog to the Pro IDE [release page](https://github.com/arduino/arduino-ide/releases).
- If you do not want to release the `EXE` and `MSI` installers, wipe them manually. - If you do not want to release the `EXE` and `MSI` installers, wipe them manually.
- If you do not like the generated changelog, modify it and update the GH release. - If you do not like the generated changelog, modify it and update the GH release.
@ -126,9 +126,9 @@ git tag -a 0.2.0 -m "0.2.0" \
- Q: I have understood that not all versions of the CLI is compatible with my version of IDE but how can I manually update the `arduino-cli` inside the IDE? - Q: I have understood that not all versions of the CLI is compatible with my version of IDE but how can I manually update the `arduino-cli` inside the IDE?
- A: [Get](https://arduino.github.io/arduino-cli/installation) the desired version of `arduino-cli` for your platform and manually replace the one inside the IDE. The CLI can be found inside the IDE at: - A: [Get](https://arduino.github.io/arduino-cli/installation) the desired version of `arduino-cli` for your platform and manually replace the one inside the IDE. The CLI can be found inside the IDE at:
- Windows: `C:\path\to\Arduino Pro IDE\resources\app\node_modules\arduino-ide-extension\build\arduino-cli.exe`, - Windows: `C:\path\to\Arduino IDE\resources\app\node_modules\arduino-ide-extension\build\arduino-cli.exe`,
- macOS: `/path/to/Arduino Pro IDE.app/Contents/Resources/app/node_modules/arduino-ide-extension/build/arduino-cli`, and - macOS: `/path/to/Arduino IDE.app/Contents/Resources/app/node_modules/arduino-ide-extension/build/arduino-cli`, and
- Linux: `/path/to/Arduino Pro IDE/resources/app/node_modules/arduino-ide-extension/build/arduino-cli`. - Linux: `/path/to/Arduino IDE/resources/app/node_modules/arduino-ide-extension/build/arduino-cli`.
### Architecture overview ### Architecture overview

4
arduino-debugger-extension/package.json
View File

@ -1,11 +1,11 @@
{ {
"name": "arduino-debugger-extension", "name": "arduino-debugger-extension",
"version": "0.1.4", "version": "2.0.0-beta.1",
"description": "An extension for debugging Arduino programs", "description": "An extension for debugging Arduino programs",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@theia/debug": "next", "@theia/debug": "next",
"arduino-ide-extension": "0.1.4", "arduino-ide-extension": "2.0.0-beta.1",
"cdt-gdb-adapter": "^0.0.14", "cdt-gdb-adapter": "^0.0.14",
"vscode-debugadapter": "^1.26.0", "vscode-debugadapter": "^1.26.0",
"vscode-debugprotocol": "^1.26.0" "vscode-debugprotocol": "^1.26.0"

2
arduino-ide-extension/README.md
View File

@ -1,6 +1,6 @@
## Arduino IDE Extension ## Arduino IDE Extension
Arduino Pro IDE is based on Theia, and most of its IDE features, UIs and customizations are implemented in this Theia extension. Arduino IDE is based on Theia, and most of its IDE features, UIs and customizations are implemented in this Theia extension.
### IDE Services ### IDE Services

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

@ -1,6 +1,6 @@
{ {
"name": "arduino-ide-extension", "name": "arduino-ide-extension",
"version": "0.1.4", "version": "2.0.0-beta.1",
"description": "An extension for Theia building the Arduino IDE", "description": "An extension for Theia building the Arduino IDE",
"license": "MIT", "license": "MIT",
"scripts": { "scripts": {
@ -123,7 +123,7 @@
], ],
"arduino": { "arduino": {
"cli": { "cli": {
"version": "0.15.1" "version": "0.15.2"
} }
} }
} }

2
arduino-ide-extension/src/browser/arduino-frontend-contribution.tsx
View File

@ -386,7 +386,7 @@ export class ArduinoFrontendContribution implements FrontendApplicationContribut
light: 'editorWidget.background', light: 'editorWidget.background',
hc: 'editorWidget.background' hc: 'editorWidget.background'
}, },
description: 'Color of the Arduino Pro IDE foreground which is used for dialogs, such as the Select Board dialog.' description: 'Color of the Arduino IDE foreground which is used for dialogs, such as the Select Board dialog.'
}, },
{ {
id: 'arduino.toolbar.background', id: 'arduino.toolbar.background',

2
arduino-ide-extension/src/browser/boards/boards-data-store.ts
View File

@ -157,7 +157,7 @@ export class BoardsDataStore implements FrontendApplicationContribution {
} }
protected getStorageKey(fqbn: string, version: Installable.Version): string { protected getStorageKey(fqbn: string, version: Installable.Version): string {
return `.arduinoProIDE-configOptions-${version}-${fqbn}`; return `.arduinoIDE-configOptions-${version}-${fqbn}`;
} }
protected async getBoardDetailsSafe(fqbn: string): Promise<BoardDetails | undefined> { protected async getBoardDetailsSafe(fqbn: string): Promise<BoardDetails | undefined> {

2
arduino-ide-extension/src/electron-browser/theia/core/electron-main-menu-factory.ts
View File

@ -23,7 +23,7 @@ export class ElectronMainMenuFactory extends TheiaElectronMainMenuFactory {
protected createOSXMenu(): Electron.MenuItemConstructorOptions { protected createOSXMenu(): Electron.MenuItemConstructorOptions {
const { submenu } = super.createOSXMenu(); const { submenu } = super.createOSXMenu();
const label = 'Arduino Pro IDE'; const label = 'Arduino IDE';
if (!!submenu && !(submenu instanceof remote.Menu)) { if (!!submenu && !(submenu instanceof remote.Menu)) {
const [/* about */, /* settings */, ...rest] = submenu; const [/* about */, /* settings */, ...rest] = submenu;
const about = this.fillMenuTemplate([], this.menuProvider.getMenu(ArduinoMenus.HELP__ABOUT_GROUP)); const about = this.fillMenuTemplate([], this.menuProvider.getMenu(ArduinoMenus.HELP__ABOUT_GROUP));

2
arduino-ide-extension/src/node/sketches-service-impl.ts
View File

@ -18,7 +18,7 @@ import { LoadSketchReq, ArchiveSketchReq } from './cli-protocol/commands/command
const WIN32_DRIVE_REGEXP = /^[a-zA-Z]:\\/; const WIN32_DRIVE_REGEXP = /^[a-zA-Z]:\\/;
const prefix = '.arduinoProIDE-unsaved'; const prefix = '.arduinoIDE-unsaved';
@injectable() @injectable()
export class SketchesServiceImpl implements SketchesService { export class SketchesServiceImpl implements SketchesService {

10
browser-app/package.json
View File

@ -1,7 +1,7 @@
{ {
"private": true, "private": true,
"name": "browser-app", "name": "browser-app",
"version": "0.1.4", "version": "2.0.0-beta.1",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@theia/core": "next", "@theia/core": "next",
@ -18,7 +18,7 @@
"@theia/process": "next", "@theia/process": "next",
"@theia/terminal": "next", "@theia/terminal": "next",
"@theia/workspace": "next", "@theia/workspace": "next",
"arduino-ide-extension": "0.1.4" "arduino-ide-extension": "2.0.0-beta.1"
}, },
"devDependencies": { "devDependencies": {
"@theia/cli": "next" "@theia/cli": "next"
@ -31,9 +31,9 @@
"theia": { "theia": {
"frontend": { "frontend": {
"config": { "config": {
"applicationName": "Arduino Pro IDE", "applicationName": "Arduino IDE",
"defaultTheme": "arduino-theme", "defaultTheme": "arduino-theme",
"status": "Alpha", "status": "Beta",
"preferences": { "preferences": {
"editor.autoSave": "on", "editor.autoSave": "on",
"editor.minimap.enabled": false, "editor.minimap.enabled": false,
@ -44,7 +44,7 @@
}, },
"backend": { "backend": {
"config": { "config": {
"configDirName": ".arduinoProIDE" "configDirName": ".arduinoIDE"
} }
}, },
"generator": { "generator": {

10
electron-app/package.json
View File

@ -1,7 +1,7 @@
{ {
"private": true, "private": true,
"name": "electron-app", "name": "electron-app",
"version": "0.1.4", "version": "2.0.0-beta.1",
"license": "MIT", "license": "MIT",
"main": "src-gen/frontend/electron-main.js", "main": "src-gen/frontend/electron-main.js",
"dependencies": { "dependencies": {
@ -20,7 +20,7 @@
"@theia/process": "next", "@theia/process": "next",
"@theia/terminal": "next", "@theia/terminal": "next",
"@theia/workspace": "next", "@theia/workspace": "next",
"arduino-ide-extension": "0.1.4" "arduino-ide-extension": "2.0.0-beta.1"
}, },
"devDependencies": { "devDependencies": {
"@theia/cli": "next" "@theia/cli": "next"
@ -34,9 +34,9 @@
"target": "electron", "target": "electron",
"frontend": { "frontend": {
"config": { "config": {
"applicationName": "Arduino Pro IDE", "applicationName": "Arduino IDE",
"defaultTheme": "arduino-theme", "defaultTheme": "arduino-theme",
"status": "Alpha", "status": "Beta",
"preferences": { "preferences": {
"editor.autoSave": "on", "editor.autoSave": "on",
"editor.minimap.enabled": false, "editor.minimap.enabled": false,
@ -47,7 +47,7 @@
}, },
"backend": { "backend": {
"config": { "config": {
"configDirName": ".arduinoProIDE" "configDirName": ".arduinoIDE"
} }
}, },
"generator": { "generator": {

4
electron/README.md
View File

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

4
electron/build/patch/main.js
View File

@ -1,7 +1,7 @@
// @ts-check // @ts-check
const { setup, log } = require('node-log-rotate'); const { setup, log } = require('node-log-rotate');
setup({ setup({
appName: 'Arduino Pro IDE', appName: 'Arduino IDE',
maxSize: 10 * 1024 * 1024 maxSize: 10 * 1024 * 1024
}); });
for (const name of ['log', 'trace', 'info', 'warn', 'error']) { for (const name of ['log', 'trace', 'info', 'warn', 'error']) {
@ -15,7 +15,7 @@ for (const name of ['log', 'trace', 'info', 'warn', 'error']) {
const { BackendApplicationConfigProvider } = require('@theia/core/lib/node/backend-application-config-provider'); const { BackendApplicationConfigProvider } = require('@theia/core/lib/node/backend-application-config-provider');
const main = require('@theia/core/lib/node/main'); const main = require('@theia/core/lib/node/main');
BackendApplicationConfigProvider.set({ BackendApplicationConfigProvider.set({
"configDirName": ".arduinoProIDE", "configDirName": ".arduinoIDE",
"singleInstance": true "singleInstance": true
}); });

0
electron/build/scripts/arduino-pro-ide-electron-main.js → electron/build/scripts/arduino-ide-electron-main.js
View File

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

@ -1,5 +1,5 @@
{ {
"main": "scripts/arduino-pro-ide-electron-main.js", "main": "scripts/arduino-ide-electron-main.js",
"author": "Arduino SA", "author": "Arduino SA",
"resolutions": { "resolutions": {
"**/fs-extra": "^4.0.3" "**/fs-extra": "^4.0.3"
@ -29,7 +29,7 @@
}, },
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git+https://github.com/arduino/arduino-pro-ide.git" "url": "git+https://github.com/arduino/arduino-ide.git"
}, },
"// Notes:": [ "// Notes:": [
"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" "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"
@ -48,7 +48,7 @@
} }
}, },
"build": { "build": {
"productName": "Arduino Pro IDE", "productName": "Arduino IDE",
"asar": false, "asar": false,
"directories": { "directories": {
"buildResources": "resources" "buildResources": "resources"
@ -130,7 +130,7 @@
{ {
"provider": "s3", "provider": "s3",
"bucket": "arduino-downloads-prod-beagle", "bucket": "arduino-downloads-prod-beagle",
"path": "arduino-pro-ide/nightly" "path": "arduino-ide/nightly"
} }
] ]
}, },

6
electron/packager/config.js
View File

@ -18,7 +18,7 @@ function artifactName() {
return getVersion(); return getVersion();
} }
})(); })();
const name = 'arduino-pro-ide'; const name = 'arduino-ide';
switch (platform) { switch (platform) {
case 'win32': { case 'win32': {
if (arch === 'x64') { if (arch === 'x64') {
@ -99,8 +99,8 @@ function generateTemplate(buildDate) {
// do `export PUBLISH=true yarn package` if you want to mimic CI build locally. // do `export PUBLISH=true yarn package` if you want to mimic CI build locally.
// const electronPublish = release || (isCI && currentBranch() === 'master') || process.env.PUBLISH === 'true'; // const electronPublish = release || (isCI && currentBranch() === 'master') || process.env.PUBLISH === 'true';
const version = getVersion(); const version = getVersion();
const productName = 'Arduino Pro IDE'; const productName = 'Arduino IDE';
const name = 'arduino-pro-ide'; const name = 'arduino-ide';
let customizations = { let customizations = {
name, name,
description: productName, description: productName,

6
electron/packager/index.js
View File

@ -276,15 +276,15 @@ ${fs.readFileSync(path('..', 'build', 'package.json')).toString()}
const filesToCopy = []; const filesToCopy = [];
switch (platform) { switch (platform) {
case 'linux': { case 'linux': {
filesToCopy.push(...glob.sync('**/arduino-pro-ide*.{zip,AppImage}', { cwd }).map(p => join(cwd, p))); filesToCopy.push(...glob.sync('**/arduino-ide*.{zip,AppImage}', { cwd }).map(p => join(cwd, p)));
break; break;
} }
case 'win32': { case 'win32': {
filesToCopy.push(...glob.sync('**/arduino-pro-ide*.{exe,msi,zip}', { cwd }).map(p => join(cwd, p))); filesToCopy.push(...glob.sync('**/arduino-ide*.{exe,msi,zip}', { cwd }).map(p => join(cwd, p)));
break; break;
} }
case 'darwin': { case 'darwin': {
filesToCopy.push(...glob.sync('**/arduino-pro-ide*.{dmg,zip}', { cwd }).map(p => join(cwd, p))); filesToCopy.push(...glob.sync('**/arduino-ide*.{dmg,zip}', { cwd }).map(p => join(cwd, p)));
break; break;
} }
default: { default: {

2
electron/packager/package.json
View File

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

4
package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "arduino-editor", "name": "arduino-editor",
"version": "0.1.4", "version": "2.0.0-beta.1",
"description": "Arduino Pro IDE", "description": "Arduino IDE",
"repository": "https://github.com/bcmi-labs/arduino-editor.git", "repository": "https://github.com/bcmi-labs/arduino-editor.git",
"author": "Arduino SA", "author": "Arduino SA",
"license": "MIT", "license": "MIT",

2
scripts/update-version.js
View File

@ -19,7 +19,7 @@ if (!semver.valid(targetVersion)) {
} }
if (!semver.gt(targetVersion, currentVersion)) { if (!semver.gt(targetVersion, currentVersion)) {
console.error(`Target version '${targetVersion}' must be greater than the current version '${currentVersion}.'`); console.error(`Target version '${targetVersion}' must be greater than the current version '${currentVersion}'.`);
process.exit(1); process.exit(1);
} }