Skip to content

Make release 4 4 3 #1623

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
cb66d22
Merge pull request #1612 from Sloeber/support_for_tar_zst_#1611
jantje Jan 26, 2024
a27a310
upgrade the version number in the splash
Jan 28, 2024
47e20d1
remove extra semicolon
Jan 28, 2024
0118a90
fix warning about product id
Jan 28, 2024
719ded0
reintroducing the warning fixes the build
Jan 29, 2024
02c0518
Use only one perspective and it needs to be in ui
Jan 29, 2024
bbbf4df
remove unneeded code from product
Jan 29, 2024
f5f8856
add sloeber plugins to required plugins :-S
Jan 29, 2024
6b31b97
add slf4j.api to core
Jan 29, 2024
5e07912
fix missing dependencies
Jan 29, 2024
188670a
Seems justj.openjdk should not be in the target file
Jan 29, 2024
af39252
For the product only the product needs building
Jan 29, 2024
36f2596
product needed some care
Jan 29, 2024
328b29c
upgrade all action versions to latest; lets hope this works :-S
Jan 29, 2024
e92a1ea
[email protected] did not work now trying upload-artifact@v4
Jan 29, 2024
a0eccf8
Rename product files and add sdk splash
Jan 29, 2024
5dfcfa0
checking for debugging purposes
Jan 30, 2024
011b244
change the sdk.product ID to io.sloeber.product.sdk fixes the build but
Jan 30, 2024
cd2784d
change the product if from io.sloeber.product.sdk.product to product
Jan 30, 2024
90246ac
Checking in as is. mvn build succeeds but product does not load
Feb 1, 2024
0041393
fixed the product issues
Feb 3, 2024
2dbb67b
Upgrade the version numbers
Feb 3, 2024
219feb2
fix ison in project properties
Feb 4, 2024
6c7d25e
remove some unneeded? testing
Feb 4, 2024
4316b2b
remove jantjes hardware for now
Feb 4, 2024
c5c7e8c
remove a lot of packages that are no longer supported
Feb 4, 2024
835f45a
fix missing List methoid for Teensy
Feb 7, 2024
1fc8b45
Share the counter with all the test so it continues
Feb 7, 2024
18fbcd8
trying to use the correct/better names for the download files in actions
Feb 7, 2024
8caff30
Update the web site
Feb 7, 2024
02dd85b
Merge branch '#1126_support_for_creating_library_archives' into make_…
jantje Feb 7, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,43 +15,43 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up Maven
uses: stCarolas/[email protected]
with:
maven-version: 3.9.6
- name: Set up JDK 17
uses: actions/setup-java@v2
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'adopt'
- name: Build Sloeber with Maven
run: mvn --no-transfer-progress verify -Pall,sloeber_release,NOSDK -Dtest=NightlyJenkins -DfailIfNoTests=false

- name: Archive production artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Repository
path: io.sloeber.updatesite/target/repository
- name: Archive Windows 64 bit
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: windows
name: sloeber-ide-sloeber_release-win32.win32.x86_64.zip
path: io.sloeber.product/target/products/sloeber-ide-sloeber_release-win32.win32.x86_64.zip
- name: Archive Linux 64 bit
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: linux
name: sloeber-ide-sloeber_release-linux.gtk.x86_64.tar.gz
path: io.sloeber.product/target/products/sloeber-ide-sloeber_release-linux.gtk.x86_64.tar.gz
- name: Archive Mac 64 bit
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: macosx
name: sloeber-ide-sloeber_release-macosx.cocoa.x86_64.zip
path: io.sloeber.product/target/products/sloeber-ide-sloeber_release-macosx.cocoa.x86_64.zip
- name: Archive Mac ARM 64 bit
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: macosx_arm
name: sloeber-ide-sloeber_release-macosx.cocoa.aarch64.zip
path: io.sloeber.product/target/products/sloeber-ide-sloeber_release-macosx.cocoa.aarch64.zip
- name: Build Sloeber SDK with Maven
run: mvn clean verify -PSDK,win64,latest -DskipTests=true
Expand Down
25 changes: 17 additions & 8 deletions images_plugin_dev_setup/SVG_Logo/splash.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion io.sloeber.core.nl1/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: Sloeber core language pack
Bundle-SymbolicName: io.sloeber.core.nl1;singleton:=true
Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-Version: 4.4.2.qualifier
Bundle-Version: 4.4.3.qualifier
Fragment-Host: io.sloeber.core
Bundle-Vendor: Sloeber.io
Automatic-Module-Name: io.sloeber.core.nl1
2 changes: 1 addition & 1 deletion io.sloeber.core.nl1/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>io.sloeber.arduino-eclipse-plugin</groupId>
<artifactId>io.sloeber.parent</artifactId>
<version>4.4.2-SNAPSHOT</version>
<version>4.4.3-SNAPSHOT</version>
<relativePath>../io.sloeber.parent</relativePath>
</parent>

Expand Down
5 changes: 4 additions & 1 deletion io.sloeber.core/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Arduino eclipse plugin
Bundle-SymbolicName: io.sloeber.core;singleton:=true
Bundle-Version: 4.4.2.qualifier
Bundle-Version: 4.4.3.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-Vendor: Sloeber.io
Bundle-ActivationPolicy: lazy
Expand All @@ -24,8 +24,11 @@ Require-Bundle:
org.apache.commons.commons-io,
org.apache.commons.commons-compress,
com.github.luben.zstd-jni;bundle-version="1.5.5",
slf4j.api;bundle-version="2.0.9",
org.eclipse.ui.intro
io.sloeber.autoBuild,
org.eclipse.cdt.make.core

Export-Package: cc.arduino.packages;x-internal:=true,
cc.arduino.packages.discoverers;x-internal:=true,
cc.arduino.packages.ssh;x-internal:=true,
Expand Down
4 changes: 3 additions & 1 deletion io.sloeber.core/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,7 @@ bin.includes = .,\
lib/jsch-0.1.55.jar,\
OSGI-INF/l10n/bundle.properties,\
lib/jssc-2.9.4.jar,\
lib/jmdns-3.5.7.jar
lib/jmdns-3.5.7.jar,\
icons/,\
launch/
jars.compile.order = .
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
72 changes: 71 additions & 1 deletion io.sloeber.core/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,77 @@ priority="high"/>
supportsArgument="true">
</variable>
</extension>


<extension
id="product"
name="Sloeber"
point="org.eclipse.core.runtime.products">
<product
application="org.eclipse.ui.ide.workbench"
description="Arduino layer for CDT"
name="Sloeber">
<property
name="windowImages"
value="icons/logo_16.png,icons/logo_32.png,icons/logo_48.png,icons/logo_64.png,icons/logo_128.png,icons/logo_256.png">
</property>
<property
name="startupForegroundColor"
value="C8D5EA">
</property>
<property
name="startupProgressRect"
value="97,370,100,4">
</property>
<property
name="startupMessageRect"
value="400,370,441,20">
</property>
<property
name="appName"
value="Sloeber">
</property>
<property
name="aboutImage"
value="icons/eclipse_lg.png">
</property>
<property
name="preferenceCustomization"
value="plugin_customization.ini">
</property>
<property
name="aboutText"
value="Sloeber, the Eclipse IDE for Arduino Developers&#x0A;&#x0A;Info: https://eclipse.baeyens.it/&#x0A;Source: https://github.com/sloeber/arduino-eclipse-plugin&#x0A;&#x0A;&#x0A;Contributors (github users): jantje, wimjongman, rlogiacco, MarceloLimori, brodykenrick, neuweiler, darcade, amorellgarcia&#x0A;&#x0A;https://github.com/sloeber/arduino-eclipse-plugin/graphs/contributors">
</property>
</product>
</extension>
<extension
id="io.sloeber.product.intro"
point="org.eclipse.ui.intro">
<intro
class="org.eclipse.ui.intro.config.CustomizableIntroPart"
id="io.sloeber.product.intro">
</intro>
<introProductBinding
introId="io.sloeber.product.intro"
productId="io.sloeber.product.sloeber">
</introProductBinding>
</extension>
<extension
point="org.eclipse.ui.intro.config">
<config
content="introContent.xml"
id="io.sloeber.product.introConfigId"
introId="io.sloeber.product.intro">
<presentation
home-page-id="root">
<implementation
kind="html"
os="win32,linux,macosx"
style="content/shared.css">
</implementation>
</presentation>
</config>
</extension>
</plugin>


Expand Down
2 changes: 1 addition & 1 deletion io.sloeber.core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>io.sloeber.arduino-eclipse-plugin</groupId>
<artifactId>io.sloeber.parent</artifactId>
<version>4.4.2-SNAPSHOT</version>
<version>4.4.3-SNAPSHOT</version>
<relativePath>../io.sloeber.parent</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion io.sloeber.feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="io.sloeber.feature"
label="%featureName"
version="4.4.2.qualifier"
version="4.4.3.qualifier"
provider-name="%provider">

<description url="http://eclipse.baeyens.it">
Expand Down
2 changes: 1 addition & 1 deletion io.sloeber.feature/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>io.sloeber.arduino-eclipse-plugin</groupId>
<artifactId>io.sloeber.parent</artifactId>
<version>4.4.2-SNAPSHOT</version>
<version>4.4.3-SNAPSHOT</version>
<relativePath>../io.sloeber.parent</relativePath>
</parent>

Expand Down
11 changes: 1 addition & 10 deletions io.sloeber.parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>io.sloeber.arduino-eclipse-plugin</groupId>
<artifactId>io.sloeber.parent</artifactId>
<version>4.4.2-SNAPSHOT</version>
<version>4.4.3-SNAPSHOT</version>
<packaging>pom</packaging>

<properties>
Expand Down Expand Up @@ -123,16 +123,7 @@
<profile>
<id>SDK</id>
<modules>
<module>../io.sloeber.autoBuild</module>
<module>../io.sloeber.autoBuild.ui</module>
<module>../io.sloeber.autoBuild.test</module>
<module>../io.sloeber.feature</module>
<module>../io.sloeber.core</module>
<module>../io.sloeber.core.nl1</module>
<module>../io.sloeber.product.sdk</module>
<module>../io.sloeber.ui.nl1</module>
<module>../io.sloeber.ui</module>
<module>../io.sloeber.tests</module>
</modules>
</profile>

Expand Down
1 change: 0 additions & 1 deletion io.sloeber.product.sdk/.classpath
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
Expand Down
2 changes: 1 addition & 1 deletion io.sloeber.product.sdk/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Sloeber SDK
Bundle-SymbolicName: io.sloeber.product.sdk;singleton:=true
Bundle-Version: 4.4.2.qualifier
Bundle-Version: 4.4.3.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-Vendor: baeyens.it
Automatic-Module-Name: io.sloeber.product.sdk
18 changes: 15 additions & 3 deletions io.sloeber.product.sdk/build.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
output.. = bin/
bin.includes = META-INF/,\
.,\
plugin_customization.ini
plugin.xml,\
splash.bmp,\
sdk.product,\
bin/,\
icons/,\
introSDKContent.xml,\
plugin_customization.ini,\
launch/,\
.classpath,\
.gitignore,\
.project,\
.settings/,\
build.properties,\
p2.inf,\
pom.xml

source.. = src/
8 changes: 8 additions & 0 deletions io.sloeber.product.sdk/introSDKContent.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8" ?>
<introContent>
<!-- Root page -->
<page id="root" style="html/style.css" style-id="page" >
<html text="hhh" id="my web site" src="https://eclipse.baeyens.it/product/V4_0_SDK.php" type="inline" />
</page>

</introContent>
Loading