From 292edec38b6708cb91874525d5e9afd9dc951dc3 Mon Sep 17 00:00:00 2001 From: Alex Kent Hajnal Date: Mon, 7 Aug 2023 22:09:03 -0400 Subject: [PATCH 1/2] Various fixes: Changed Linux package format to "tar.gz"; Fixed executable paths in "build_then_launch.sh" (paths are case-sensitive on Linux et al.); Added note about requiring Java 17 to top-level "readme.md"; Cleaned-up and corrected examples in top-level "readme.md". --- build_then_launch.sh | 4 ++-- io.sloeber.product/pom.xml | 2 +- readme.md | 25 ++++++++++++++++++------- 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/build_then_launch.sh b/build_then_launch.sh index d9741d241..488189c08 100755 --- a/build_then_launch.sh +++ b/build_then_launch.sh @@ -1,7 +1,7 @@ #!/bin/bash -file_x86="./io.sloeber.product/target/products/io.sloeber.product/linux/gtk/x86/sloeber/sloeber-ide" -file_x86_64="./io.sloeber.product/target/products/io.sloeber.product/linux/gtk/x86_64/sloeber/sloeber-ide" +file_x86="./io.sloeber.product/target/products/io.sloeber.product/linux/gtk/x86/Sloeber/sloeber-ide" +file_x86_64="./io.sloeber.product/target/products/io.sloeber.product/linux/gtk/x86_64/Sloeber/sloeber-ide" file="" echo "Trying to build and then launch the Arduino Eclipse IDE" diff --git a/io.sloeber.product/pom.xml b/io.sloeber.product/pom.xml index 7bd3a8651..62eb553cd 100644 --- a/io.sloeber.product/pom.xml +++ b/io.sloeber.product/pom.xml @@ -34,7 +34,7 @@ zip - zip + tar.gz zip diff --git a/readme.md b/readme.md index 8262fbf48..404eddcb6 100644 --- a/readme.md +++ b/readme.md @@ -19,6 +19,8 @@ You only need to do one. ## Prerequisites Please install [git](http://git-scm.com/downloads) and [maven](http://maven.apache.org/download.cgi). +Java 17 is required. + ## Build from the command line from source for your os and the default eclipse instance ```bash git clone https://github.com/Sloeber/arduino-eclipse-plugin sloeber @@ -50,14 +52,23 @@ You can control the maven build with the following profiles: * macm1 ### Examples - mvn clean verify -Pwin64,latest,NOSDK -DskipTests=true (builds for latest eclipse and windows bits) - mvn clean verify -Plinux32,latest.NOSDK -DskipTests=true (builds for latest eclipse and linux 32 bits) - mvn clean verify -PSDK,win64,latest -DskipTests=true (builds the Sloeber SDK. For Sloeber programmers.) - -To build for latest and the platform you are running on: - - mvn clean verify -DskipTests=true +* Build the latest version for the platform you are running on: + + `mvn clean verify -DskipTests=true` + +* Build Eclipse + Sloeber for 64-bit Windows: + `mvn clean verify -Pwin64,latest,NOSDK -DskipTests=true` + +* Build Eclipse + Sloeber for 64-bit Linux: + `mvn clean verify -Plinux64,latest,NOSDK -DskipTests=true` + +* Build Eclipse + Sloeber for 32-bit Linux: + `mvn clean verify -Plinux32,latest,NOSDK -DskipTests=true` + +* Build the Sloeber SDK (for Sloeber programmers): + `mvn clean verify -PSDK,win64,latest -DskipTests=true` + # Importing your build into another Eclipse If you want to import the latest code based plugin to another Eclipse setup you have then it is possible to setup a local repository to install the plugin you have just built. Just add a local repository with location ```arduino-eclipse-plugin/io.sloeber.product/target/repository``` From 602927a804eea649c6871106b35af2424e4652bc Mon Sep 17 00:00:00 2001 From: Alex Kent Hajnal Date: Thu, 10 Aug 2023 12:02:51 -0400 Subject: [PATCH 2/2] Removed mentions of 32-bit platforms from readme.md and build_then_launch.sh --- build_then_launch.sh | 6 ------ readme.md | 11 +++++------ 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/build_then_launch.sh b/build_then_launch.sh index 488189c08..3105afcc5 100755 --- a/build_then_launch.sh +++ b/build_then_launch.sh @@ -1,6 +1,5 @@ #!/bin/bash -file_x86="./io.sloeber.product/target/products/io.sloeber.product/linux/gtk/x86/Sloeber/sloeber-ide" file_x86_64="./io.sloeber.product/target/products/io.sloeber.product/linux/gtk/x86_64/Sloeber/sloeber-ide" file="" @@ -23,11 +22,6 @@ fi echo "Searching for the Eclipse executable (with our plugin pre-packaged) to launch" #Find an executable if we made it successfully -if [[ -x "$file_x86" ]] -then - #echo "File '$file_x86' is executable" - file=$file_x86 -fi if [[ -x "$file_x86_64" ]] then diff --git a/readme.md b/readme.md index 404eddcb6..b2229d946 100644 --- a/readme.md +++ b/readme.md @@ -21,6 +21,9 @@ Please install [git](http://git-scm.com/downloads) and [maven](http://maven.apac Java 17 is required. +A 64-bit OS is required. + + ## Build from the command line from source for your os and the default eclipse instance ```bash git clone https://github.com/Sloeber/arduino-eclipse-plugin sloeber @@ -45,7 +48,6 @@ You can control the maven build with the following profiles: * latest (default, builds against the latest versions) * SDK (builds a Sloeber you can program Sloeber in. With Java.) -* win32 (builds for 32 bit windows) * win64 * linux64 * mac64 @@ -55,7 +57,7 @@ You can control the maven build with the following profiles: * Build the latest version for the platform you are running on: - `mvn clean verify -DskipTests=true` + `mvn clean verify -PNOSDK -DskipTests=true` * Build Eclipse + Sloeber for 64-bit Windows: `mvn clean verify -Pwin64,latest,NOSDK -DskipTests=true` @@ -63,10 +65,7 @@ You can control the maven build with the following profiles: * Build Eclipse + Sloeber for 64-bit Linux: `mvn clean verify -Plinux64,latest,NOSDK -DskipTests=true` -* Build Eclipse + Sloeber for 32-bit Linux: - `mvn clean verify -Plinux32,latest,NOSDK -DskipTests=true` - -* Build the Sloeber SDK (for Sloeber programmers): +* Build the Sloeber SDK for 64-bit Windows (for Sloeber programmers): `mvn clean verify -PSDK,win64,latest -DskipTests=true` # Importing your build into another Eclipse