From ba9ca8c9ac697374720e881a5a9a9f83a83cf0b5 Mon Sep 17 00:00:00 2001 From: Liviu Ionescu Date: Thu, 11 Jan 2024 18:12:48 +0200 Subject: [PATCH 1/4] README update --- README-MAINTAINER.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/README-MAINTAINER.md b/README-MAINTAINER.md index 56d362147..52dddd638 100644 --- a/README-MAINTAINER.md +++ b/README-MAINTAINER.md @@ -42,7 +42,7 @@ For archiving purposes, the release is also published in a separate folder for each version, with the archive in the top folder and the p2 repo as a sub-folder -- +- - The official download page is @@ -272,7 +272,7 @@ In Eclipse: - right click: **Show Properties View** - in the right side, edit the **Location** field to the new release candidate p2 URL (like -`https://download.eclipse.org/embed-cdt/release-candidates/6.5.0-202307251916/p2/` +`https://download.eclipse.org/embed-cdt/release-candidates/6.5.0-202401111557/p2/` and press Enter - select all the features in the contribution, right-click and choose **Fix Versions** @@ -281,7 +281,7 @@ and press Enter - Save - stage `simrel.aggr` & `embedcdt.aggrcon` - commit with a message like: - - _embedcdt: update for 6.5.0-202307251916_, + - _embedcdt: update for 6.5.0-202401111557_, - _Signed-off-by: Liviu Ionescu _ - click the **Commit** button (do not Push yet) - right click, Show in local Terminal @@ -311,7 +311,7 @@ In about 7-8 minutes it'll automatically rebuild the staging repo: Announce the release candidate to the **embed-cdt-dev@eclipse.org** list; use a subject like -**Embed CDT v6.5.0-202307251916 release candidate**, +**Embed CDT v6.5.0-202401111557 release candidate**, and pass a link to the release page, available at: - @@ -326,7 +326,7 @@ Go to the release candidate folder - [https://download.eclipse.org/embed-cdt/release-candidates/](https://download.eclipse.org/embed-cdt/release-candidates/) -Copy the tag and enter it in Git, like `v6.5.0-202307251916` (with `v`). +Copy the tag and enter it in Git, like `v6.5.0-202401111557` (with `v`). ## Publish the final release @@ -380,12 +380,12 @@ In the `develop` branch, in `_posts/plugins/releases`, add a new release page. As links for the latest two, open and get the archive URL, like: -- +- Isolate the part starting with `/embed-cdt/...` and update the URLs to use the download redirect: -- -- +- +- Go to and update the fixed issues. From 2032ba74905a874f2976118500868ca64f7da225 Mon Sep 17 00:00:00 2001 From: Liviu Ionescu Date: Thu, 11 Jan 2024 20:49:08 +0200 Subject: [PATCH 2/4] add 6.5.0 to composite --- .../composite/compositeArtifacts.xml | 3 ++- .../composite/compositeContent.xml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/repositories/org.eclipse.embedcdt-repository/composite/compositeArtifacts.xml b/repositories/org.eclipse.embedcdt-repository/composite/compositeArtifacts.xml index 9d435ab4d..454855862 100644 --- a/repositories/org.eclipse.embedcdt-repository/composite/compositeArtifacts.xml +++ b/repositories/org.eclipse.embedcdt-repository/composite/compositeArtifacts.xml @@ -4,7 +4,7 @@ type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'> - + @@ -16,5 +16,6 @@ + diff --git a/repositories/org.eclipse.embedcdt-repository/composite/compositeContent.xml b/repositories/org.eclipse.embedcdt-repository/composite/compositeContent.xml index 3374f11b6..e2ba07f0b 100644 --- a/repositories/org.eclipse.embedcdt-repository/composite/compositeContent.xml +++ b/repositories/org.eclipse.embedcdt-repository/composite/compositeContent.xml @@ -4,7 +4,7 @@ type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'> - + @@ -16,5 +16,6 @@ + From 78e3ebef53ea5b33465a412f837efe80356ddb05 Mon Sep 17 00:00:00 2001 From: Liviu Ionescu Date: Thu, 11 Jan 2024 20:49:26 +0200 Subject: [PATCH 3/4] README update --- README-MAINTAINER.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/README-MAINTAINER.md b/README-MAINTAINER.md index 52dddd638..6b40c16be 100644 --- a/README-MAINTAINER.md +++ b/README-MAINTAINER.md @@ -57,12 +57,13 @@ Install the **CBI Aggregator Editor** from: - -At first use, clone the SimRel Git repo: +At first use, fork the SimRel Git repo from: -```bash -git clone ssh://lionescu@git.eclipse.org:29418/simrel/org.eclipse.simrel.build org.eclipse.simrel.build.git -scp -p -P 29418 lionescu@git.eclipse.org:hooks/commit-msg org.eclipse.simrel.build.git/.git/hooks/ -``` +- + +to + +- ### SimRel deadline From db8846cc29721ed4031e0da1e0c17de1d7a35444 Mon Sep 17 00:00:00 2001 From: laomaolaile <116530487@qq.com> Date: Fri, 15 Mar 2024 16:56:12 +0800 Subject: [PATCH 4/4] added the librar group function. --- .../plugin.xml | 10 +++ .../META-INF/MANIFEST.MF | 3 +- .../plugin.properties | 1 + .../plugin.xml | 8 +++ .../core/GnuCppLibrariesCommandGenerator.java | 11 ++++ .../cross/core/GnuMcuMakefileGenerator.java | 63 ++++++++++++++++++- .../plugin.xml | 10 +++ 7 files changed, 104 insertions(+), 2 deletions(-) create mode 100644 plugins/org.eclipse.embedcdt.managedbuild.cross.core/src/org/eclipse/embedcdt/managedbuild/cross/core/GnuCppLibrariesCommandGenerator.java diff --git a/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.core/plugin.xml b/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.core/plugin.xml index 1ab74caf4..1123aacb7 100644 --- a/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.core/plugin.xml +++ b/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.core/plugin.xml @@ -2908,6 +2908,11 @@ id="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.paths" superClass="ilg.gnumcueclipse.managedbuild.cross.option.base.linker.paths"> + @@ -3098,6 +3103,11 @@ id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.paths" superClass="ilg.gnumcueclipse.managedbuild.cross.option.base.linker.paths"> + diff --git a/plugins/org.eclipse.embedcdt.managedbuild.cross.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.embedcdt.managedbuild.cross.core/META-INF/MANIFEST.MF index a45b265d5..5a50b6ca0 100644 --- a/plugins/org.eclipse.embedcdt.managedbuild.cross.core/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.embedcdt.managedbuild.cross.core/META-INF/MANIFEST.MF @@ -10,7 +10,8 @@ Require-Bundle: org.eclipse.embedcdt.core;bundle-version="6.5.0", org.eclipse.cdt.managedbuilder.core;bundle-version="9.0.0", org.eclipse.core.expressions;bundle-version="3.7.0", org.eclipse.core.resources;bundle-version="3.13.800", - org.eclipse.core.runtime;bundle-version="3.19.0" + org.eclipse.core.runtime;bundle-version="3.19.0", + org.eclipse.cdt.managedbuilder.gnu.ui;bundle-version="8.6.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Vendor: %bundle.vendor diff --git a/plugins/org.eclipse.embedcdt.managedbuild.cross.core/plugin.properties b/plugins/org.eclipse.embedcdt.managedbuild.cross.core/plugin.properties index 6c8977d44..8ceb47f94 100644 --- a/plugins/org.eclipse.embedcdt.managedbuild.cross.core/plugin.properties +++ b/plugins/org.eclipse.embedcdt.managedbuild.cross.core/plugin.properties @@ -91,6 +91,7 @@ option.linker.printgcsections=Print removed sections (-Xlinker --print-gc-sectio option.linker.strip=Omit all symbol information (-s) option.linker.libs=Libraries (-l) option.linker.paths=Library search path (-L) +option.linker.libs.group=Group libraries (-Wl,--start-group ... -Wl,--end-group) option.linker.flags=Linker flags (-Xlinker [option]) option.linker.otherobjs=Other objects option.linker.other=Other linker flags diff --git a/plugins/org.eclipse.embedcdt.managedbuild.cross.core/plugin.xml b/plugins/org.eclipse.embedcdt.managedbuild.cross.core/plugin.xml index 4ee55876d..9119cd7f5 100644 --- a/plugins/org.eclipse.embedcdt.managedbuild.cross.core/plugin.xml +++ b/plugins/org.eclipse.embedcdt.managedbuild.cross.core/plugin.xml @@ -651,6 +651,7 @@ command="-l" id="ilg.gnumcueclipse.managedbuild.cross.option.base.linker.libs" isAbstract="true" + commandGenerator="org.eclipse.embedcdt.managedbuild.cross.core.GnuCppLibrariesCommandGenerator" name="%option.linker.libs" valueType="libs"> @@ -662,6 +663,13 @@ name="%option.linker.paths" valueType="libPaths"> + + @@ -2009,6 +2014,11 @@ id="ilg.gnumcueclipse.managedbuild.cross.riscv.option.cpp.linker.paths" superClass="ilg.gnumcueclipse.managedbuild.cross.option.base.linker.paths"> +