rc4

README-DEVELOPER.md

@@ -13,48 +13,7 @@ Download pre-built clangd and arduino-language-server binaries from _releases_.
 
 Then execute [build-ide.sh](build-ide.sh). Make sure ZIP_DIR points to the directory where you have downloaded the pre-built clangd and arduino-language-server binaries.
 
-This creates the file ``$ARD_DIR/arduino-ide/electron/build/dist/arduino-ide_2.0.0-rc1-snapshot.767b09d_Linux_ARM64.zip ``
-
-## appimage
-
-To make deployment easier, create an appimage.
-Download latest AppRun and appimagetool from [git](https://github.com/AppImage/AppImageKit/releases/tag/continuous)
-
-```
-mkdir -p arduino-ide-appdir/usr/bin arduino-ide-appdir/usr/lib
-cd arduino-ide-appdir
-export APP_ROOT=$PWD
-cd $APP_ROOT/usr/bin
-unzip $ARD_DIR/arduino-ide/electron/build/dist/arduino-ide_2.0.0-rc2-snapshot.0b6fc0b_Linux_ARM64.zip
-cp *.so $APP_ROOT/usr/lib/
-cd $APP_ROOT
-cat >arduino-ide.desktop <<EOD
-[Desktop Entry]
-Type=Application
-Version=1.0
-Name=Arduino IDE
-Icon=arduino-ide
-Exec=arduino-ide %f
-MimeType=text/x-arduino;
-Categories=Development;Engineering;Electronics;
-Keywords=embedded electronics;electronics;microcontroller;
-X-AppImage-Version=2.0.0-rc2
-EOD
-wget -O arduino-ide.svg http://halley.cc/paste/arduino.svg
-wget -O AppRun https://github.com/AppImage/AppImageKit/releases/download/continuous/AppRun-aarch64
-chmod +x ./AppRun
-```
-
-At this point, you can test run the arduino-ide with: ```./AppRun```
-
-Create the appimage. For aarch64, type:
-```
-cd  $APP_ROOT/..
-wget https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-aarch64.AppImage
-chmod +x ./appimagetool-aarch64.AppImage
-ARCH=arm_aarch64 ./appimagetool-aarch64.AppImage ./arduino-ide-appdir
-```
-This creates the file ``Arduino_IDE-aarch64.AppImage``.
+This creates two files in ``$ARD_DIR/arduino-ide/electron/build/dist/``: ``arduino-ide_2.0.0-*_Linux_ARM64.zip `` and ``arduino-ide_2.0.0-*_Linux_ARM64.AppImage ``
 
 ## clangd
 
@@ -79,12 +38,12 @@ You need go 1.16 or higher. [Download](https://go.dev/dl/) and install if needed
 
 ```
 export PATH=/usr/lib/go-1.14/bin:$PATH
-git clone -b 2.0.0-beta.6 https://github.com/arduino/arduino-language-server
+git clone https://github.com/arduino/arduino-language-server
 cd arduino-language-server
 go version
 # check go version 1.16 or higher
 go build
 zip arduino-language-server_Linux_ARM64.zip ./arduino-language-server
 ```
 
-not truncated.
+not truncated.

arduino-ide.patch

@@ -0,0 +1,16 @@
+diff --git a/arduino-ide-extension/scripts/download-ls.js b/arduino-ide-extension/scripts/download-ls.js
+index f00a8e6..aff22bc 100755
+--- a/arduino-ide-extension/scripts/download-ls.js
++++ b/arduino-ide-extension/scripts/download-ls.js
+@@ -79,6 +79,11 @@
+       lsSuffix = 'Linux_64bit.tar.gz';
+       clangdSuffix = 'Linux_64bit';
+       break;
++    case 'linux-arm64':
++      clangdExecutablePath = path.join(build, 'clangd');
++      lsSuffix = 'Linux_ARM64.tar.gz';
++      clangdSuffix = 'Linux_ARM64';
++      break;
+     case 'win32-x64':
+       clangdExecutablePath = path.join(build, 'clangd.exe');
+       lsSuffix = 'Windows_64bit.zip';

build-ide.sh

@@ -1,8 +1,9 @@
 #!/bin/bash
 export ZIP_DIR=~/src/arduino-ide-builds
-apt-get install libxkbfile-dev libsecret-1-dev
+sudo apt-get install libxkbfile-dev libsecret-1-dev
 git clone https://github.com/arduino/arduino-ide
 cd arduino-ide
+patch -p1 < ../arduino-ide-raspberrypi/arduino-ide.patch
 export ARD_DIR=$PWD
 cd $ARD_DIR/arduino-ide-extension/
 mkdir build
@@ -13,10 +14,8 @@ cd $ARD_DIR
 wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.0/install.sh | bash
 . ~/.config/nvm/nvm.sh
 . ~/.config/nvm/bash_completion
-nvm install 12.14.1
+nvm install 14.0.0
 npm install --global yarn
-# the version numbers are those found in the x86_64 linux build
-npm install "[email protected]" "[email protected]" "[email protected]" "[email protected]" "[email protected]" "[email protected]" "vscode-textmate" "@octokit/core@>=3"
 yarn install
 yarn
 (cd electron-app; yarn theia rebuild:electron )