Skip to content

Commit 1d91027

Browse files
ilg-ulilg-ul
committed
move code around, fix activators and preferences stores
1 parent 0047635 commit 1d91027

File tree

212 files changed

+3395
-13703
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

212 files changed

+3395
-13703
lines changed

‎.github/workflows/ci.yml

+34-34
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
1-
name: CI
2-
3-
on: [push, pull_request]
4-
5-
jobs:
6-
build:
7-
8-
runs-on: ubuntu-latest
9-
10-
steps:
11-
- name: Checkout
12-
uses: actions/checkout@v2
13-
with:
14-
submodules: true
15-
- name: Set up JDK 11
16-
uses: actions/setup-java@v1
17-
with:
18-
java-version: 11
19-
- name: Setup Maven
20-
run: echo "MAVEN_OPTS='-Xmx2048m'" > ~/.mavenrc
21-
- name: Cache maven repo
22-
uses: actions/cache@v2
23-
env:
24-
cache-name: cache-maven-repo
25-
with:
26-
# maven files are stored in `~/.m2/repository` on Linux/macOS
27-
path: ~/.m2/repository
28-
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/*.sha1') }}
29-
restore-keys: |
30-
${{ runner.os }}-build-${{ env.cache-name }}-
31-
${{ runner.os }}-build-
32-
${{ runner.os }}-
33-
- name: Build with Maven
34-
run: mvn clean verify --no-transfer-progress --batch-mode --show-version
1+
name: CI
2+
3+
on: [push, pull_request]
4+
5+
jobs:
6+
build:
7+
8+
runs-on: ubuntu-latest
9+
10+
steps:
11+
- name: Checkout
12+
uses: actions/checkout@v2
13+
with:
14+
submodules: true
15+
- name: Set up JDK 11
16+
uses: actions/setup-java@v1
17+
with:
18+
java-version: 11
19+
- name: Setup Maven
20+
run: echo "MAVEN_OPTS='-Xmx2048m'" > ~/.mavenrc
21+
- name: Cache maven repo
22+
uses: actions/cache@v2
23+
env:
24+
cache-name: cache-maven-repo
25+
with:
26+
# maven files are stored in `~/.m2/repository` on Linux/macOS
27+
path: ~/.m2/repository
28+
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/*.sha1') }}
29+
restore-keys: |
30+
${{ runner.os }}-build-${{ env.cache-name }}-
31+
${{ runner.os }}-build-
32+
${{ runner.os }}-
33+
- name: Build with Maven
34+
run: mvn clean verify --no-transfer-progress --batch-mode --show-version

‎.mvn/extensions.xml

+20-20
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<!--
3-
Copyright (c) 2020 Liviu Ionescu and others.
4-
This program and the accompanying materials
5-
are made available under the terms of the Eclipse Public License 2.0
6-
which accompanies this distribution, and is available at
7-
https://www.eclipse.org/legal/epl-2.0/
8-
9-
SPDX-License-Identifier: EPL-2.0
10-
11-
Contributors:
12-
Liviu Ionescu
13-
Alexander Fedorov
14-
-->
15-
<extensions>
16-
<extension>
17-
<groupId>org.eclipse.tycho.extras</groupId>
18-
<artifactId>tycho-pomless</artifactId>
19-
<version>1.7.0</version>
20-
</extension>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
Copyright (c) 2020 Liviu Ionescu and others.
4+
This program and the accompanying materials
5+
are made available under the terms of the Eclipse Public License 2.0
6+
which accompanies this distribution, and is available at
7+
https://www.eclipse.org/legal/epl-2.0/
8+
9+
SPDX-License-Identifier: EPL-2.0
10+
11+
Contributors:
12+
Liviu Ionescu
13+
Alexander Fedorov
14+
-->
15+
<extensions>
16+
<extension>
17+
<groupId>org.eclipse.tycho.extras</groupId>
18+
<artifactId>tycho-pomless</artifactId>
19+
<version>1.7.0</version>
20+
</extension>
2121
</extensions>

‎.project

+5
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@
1010
<arguments>
1111
</arguments>
1212
</buildCommand>
13+
<buildCommand>
14+
<name>org.eclipse.pde.ds.core.builder</name>
15+
<arguments>
16+
</arguments>
17+
</buildCommand>
1318
</buildSpec>
1419
<natures>
1520
<nature>org.eclipse.m2e.core.maven2Nature</nature>

‎debug.options

+23-14
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,41 @@
11
# Enable all debug options
2-
org.eclipse.embedcdt.codered/debug=true
2+
org.eclipse.embedcdt.codered.ui/debug=true
33

44
org.eclipse.embedcdt.core/debug=true
55

66
org.eclipse.embedcdt.debug.core/debug=true
7-
org.eclipse.embedcdt.debug.gdbjtag/debug=true
7+
org.eclipse.embedcdt.debug.gdbjtag.core/debug=true
88

9-
org.eclipse.embedcdt.debug.gdbjtag.jlink/debug=true
10-
org.eclipse.embedcdt.debug.gdbjtag.openocd/debug=true
11-
org.eclipse.embedcdt.debug.gdbjtag.pyocd/debug=true
12-
org.eclipse.embedcdt.debug.gdbjtag.qemu/debug=true
13-
org.eclipse.embedcdt.debug.gdbjtag.restart/debug=true
14-
org.eclipse.embedcdt.debug.packs/debug=true
9+
org.eclipse.embedcdt.debug.gdbjtag.jlink.core/debug=true
10+
org.eclipse.embedcdt.debug.gdbjtag.jlink.ui/debug=true
11+
org.eclipse.embedcdt.debug.gdbjtag.openocd.core/debug=true
12+
org.eclipse.embedcdt.debug.gdbjtag.openocd.ui/debug=true
13+
org.eclipse.embedcdt.debug.gdbjtag.pyocd.core/debug=true
14+
org.eclipse.embedcdt.debug.gdbjtag.pyocd.ui/debug=true
15+
org.eclipse.embedcdt.debug.gdbjtag.qemu.core/debug=true
16+
org.eclipse.embedcdt.debug.gdbjtag.qemu.ui/debug=true
1517

16-
org.eclipse.embedcdt.managedbuild.cross/debug=true
17-
org.eclipse.embedcdt.managedbuild.cross.arm/debug=true
18-
org.eclipse.embedcdt.managedbuild.cross.riscv/debug=true
18+
org.eclipse.embedcdt.debug.gdbjtag.restart.ui/debug=true
1919

20-
org.eclipse.embedcdt.managedbuild.packs/debug=true
20+
org.eclipse.embedcdt.debug.gdbjtag.ui/debug=true
21+
22+
org.eclipse.embedcdt.managedbuild.cross.arm.core/debug=true
23+
org.eclipse.embedcdt.managedbuild.cross.arm.ui/debug=true
24+
25+
org.eclipse.embedcdt.managedbuild.cross.core/debug=true
26+
org.eclipse.embedcdt.managedbuild.cross.riscv.core/debug=true
27+
org.eclipse.embedcdt.managedbuild.cross.riscv.ui/debug=true
28+
org.eclipse.embedcdt.managedbuild.cross.ui/debug=true
29+
30+
org.eclipse.embedcdt.managedbuild.packs.ui/debug=true
2131

22-
org.eclipse.embedcdt.packs/debug=true
2332
org.eclipse.embedcdt.packs.core/debug=true
24-
org.eclipse.embedcdt.packs.data/debug=true
2533
org.eclipse.embedcdt.packs.ui/debug=true
2634

2735
org.eclipse.embedcdt.templates.ad/debug=true
2836
org.eclipse.embedcdt.templates.core/debug=true
2937
org.eclipse.embedcdt.templates.cortexm/debug=true
3038
org.eclipse.embedcdt.templates.freescale/debug=true
3139
org.eclipse.embedcdt.templates.freescale.pe/debug=true
40+
org.eclipse.embedcdt.templates.sifive/debug=true
3241
org.eclipse.embedcdt.templates.stm/debug=true

‎features/org.eclipse.embedcdt.managedbuild.cross.arm-feature/feature.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
unpack="false"/>
8787

8888
<plugin
89-
id="org.eclipse.embedcdt.managedbuild.packs"
89+
id="org.eclipse.embedcdt.managedbuild.packs.ui"
9090
download-size="0"
9191
install-size="0"
9292
version="0.0.0"

‎features/org.eclipse.embedcdt.managedbuild.cross.riscv-feature/feature.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
unpack="false"/>
8787

8888
<plugin
89-
id="org.eclipse.embedcdt.managedbuild.packs"
89+
id="org.eclipse.embedcdt.managedbuild.packs.ui"
9090
download-size="0"
9191
install-size="0"
9292
version="0.0.0"

‎features/org.eclipse.embedcdt.packs-feature/feature.xml

+1-8
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,6 @@
4343
version="0.0.0"
4444
unpack="false"/>
4545

46-
<plugin
47-
id="org.eclipse.embedcdt.packs.data"
48-
download-size="0"
49-
install-size="0"
50-
version="0.0.0"
51-
unpack="false"/>
52-
5346
<plugin
5447
id="org.eclipse.embedcdt.packs.ui"
5548
download-size="0"
@@ -58,7 +51,7 @@
5851
unpack="false"/>
5952

6053
<plugin
61-
id="org.eclipse.embedcdt.managedbuild.packs"
54+
id="org.eclipse.embedcdt.managedbuild.packs.ui"
6255
download-size="0"
6356
install-size="0"
6457
version="0.0.0"

‎info/Compatibility IDs.md

-2
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,13 @@
22
## Launcher Type IDs
33

44
- "ilg.gnumcueclipse.debug.gdbjtag.jlink.launchConfigurationType"
5-
- "ilg.gnumcueclipse.debug.gdbjtag.jumper.launchConfigurationType"
65
- "ilg.gnumcueclipse.debug.gdbjtag.openocd.launchConfigurationType"
76
- "ilg.gnumcueclipse.debug.gdbjtag.pyocd.launchConfigurationType"
87
- "ilg.gnumcueclipse.debug.gdbjtag.qemu.launchConfigurationType"
98

109
## Launcher configuration prefixes
1110

1211
- "ilg.gnumcueclipse.debug.gdbjtag.jlink.*"
13-
- "ilg.gnumcueclipse.debug.gdbjtag.jumper.*"
1412
- "ilg.gnumcueclipse.debug.gdbjtag.openocd.*"
1513
- "ilg.gnumcueclipse.debug.gdbjtag.pyocd.*"
1614
- "ilg.gnumcueclipse.debug.gdbjtag.qemu.*"

‎plugins/org.eclipse.embedcdt.codered.ui/plugin.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@
1616
<plugin>
1717
<extension point="org.eclipse.ui.perspectives">
1818
<perspective
19-
class="org.eclipse.embedcdt.internal.codered.ui.perspectives.CodeRedPerspectiveFactory"
19+
class="org.eclipse.embedcdt.codered.ui.internal.codered.ui.perspectives.CodeRedPerspectiveFactory"
2020
icon="icons/cr.gif"
21-
id="org.eclipse.embedcdt.codered.ui.perspectives.CodeRedPerspective"
21+
id="org.eclipse.embedcdt.internal.codered.ui.perspectives.CodeRedPerspective"
2222
name="%perspectives.codered">
2323
</perspective>
2424
</extension>
2525

2626
<extension point="org.eclipse.ui.perspectiveExtensions">
2727
<perspectiveExtension
28-
targetID="org.eclipse.embedcdt.codered.ui.perspectives.CodeRedPerspective">
28+
targetID="org.eclipse.embedcdt.internal.codered.ui.perspectives.CodeRedPerspective">
2929
<view
3030
id="org.eclipse.debug.ui.ExpressionView"
3131
minimized="false"
@@ -64,7 +64,7 @@
6464
<viewShortcut id="org.eclipse.cdt.dsf.debug.ui.disassembly.view" />
6565

6666
<viewShortcut
67-
id="org.eclipse.embedcdt.debug.gdbjtag.ui.views.PeripheralsView" />
67+
id="org.eclipse.embedcdt.codered.ui.debug.gdbjtag.ui.views.PeripheralsView" />
6868

6969
<showInPart id="org.eclipse.cdt.ui.includeBrowser" />
7070
<showInPart id="org.eclipse.cdt.ui.CView" />
@@ -74,12 +74,12 @@
7474

7575
<perspectiveExtension targetID="org.eclipse.cdt.ui.CPerspective">
7676
<perspectiveShortcut
77-
id="org.eclipse.embedcdt.codered.ui.perspectives.CodeRedPerspective" />
77+
id="org.eclipse.embedcdt.internal.codered.ui.perspectives.CodeRedPerspective" />
7878
</perspectiveExtension>
7979

8080
<perspectiveExtension targetID="org.eclipse.debug.ui.DebugPerspective">
8181
<perspectiveShortcut
82-
id="org.eclipse.embedcdt.codered.ui.perspectives.CodeRedPerspective" />
82+
id="org.eclipse.embedcdt.internal.codered.ui.perspectives.CodeRedPerspective" />
8383
</perspectiveExtension>
8484

8585
</extension>

‎plugins/org.eclipse.embedcdt.codered.ui/src/org/eclipse/embedcdt/internal/codered/ui/Activator.java ‎plugins/org.eclipse.embedcdt.codered.ui/src/org/eclipse/embedcdt/codered/ui/Activator.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* Liviu Ionescu - initial implementation.
1313
*******************************************************************************/
1414

15-
package org.eclipse.embedcdt.internal.codered.ui;
15+
package org.eclipse.embedcdt.codered.ui;
1616

1717
import org.eclipse.embedcdt.ui.AbstractUIActivator;
1818
import org.osgi.framework.BundleContext;

‎plugins/org.eclipse.embedcdt.codered.ui/src/org/eclipse/embedcdt/internal/codered/ui/perspectives/CodeRedPerspectiveFactory.java

+5-4
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
* Contributors:
1212
* Liviu Ionescu - initial implementation.
1313
* (many thanks to Code Red for providing the inspiration)
14+
* Liviu Ionescu - UI part extraction.
1415
*******************************************************************************/
1516

1617
package org.eclipse.embedcdt.internal.codered.ui.perspectives;
@@ -24,7 +25,7 @@
2425
import org.eclipse.debug.core.ILaunchManager;
2526
import org.eclipse.debug.ui.DebugUITools;
2627
import org.eclipse.debug.ui.IDebugUIConstants;
27-
import org.eclipse.embedcdt.internal.codered.ui.Activator;
28+
import org.eclipse.embedcdt.codered.ui.Activator;
2829
import org.eclipse.swt.widgets.Display;
2930
import org.eclipse.ui.IFolderLayout;
3031
import org.eclipse.ui.IPageLayout;
@@ -45,7 +46,7 @@ public class CodeRedPerspectiveFactory implements IPerspectiveFactory {
4546

4647
// ------------------------------------------------------------------------
4748

48-
public static final String ID = "org.eclipse.embedcdt.codered.ui.perspectives.CodeRedPerspective";
49+
public static final String ID = "org.eclipse.embedcdt.internal.codered.ui.perspectives.CodeRedPerspective";
4950

5051
// ------------------------------------------------------------------------
5152

@@ -92,9 +93,9 @@ private void createLayout(IPageLayout layout) {
9293
topLeftLayout.addPlaceholder(IPageLayout.ID_BOOKMARKS);
9394

9495
topLeftLayout.addView(IDebugUIConstants.ID_REGISTER_VIEW);
95-
bundle = Platform.getBundle("org.eclipse.embedcdt.debug.gdbjtag");
96+
bundle = Platform.getBundle("org.eclipse.embedcdt.codered.ui.debug.gdbjtag");
9697
if (bundle != null) {
97-
topLeftLayout.addView("org.eclipse.embedcdt.debug.gdbjtag.ui.views.PeripheralsView");
98+
topLeftLayout.addView("org.eclipse.embedcdt.codered.ui.debug.gdbjtag.ui.views.PeripheralsView");
9899
}
99100

100101
IFolderLayout bottomLeftLayout = layout.createFolder("bottomLeft", IPageLayout.BOTTOM, 0.5F, "topLeft");

‎plugins/org.eclipse.embedcdt.core/plugin.xml

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<?eclipse version="3.4"?>
3+
<!--
4+
Copyright (c) 2012, 2017 Liviu Ionescu.
5+
This program and the accompanying materials
6+
are made available under the terms of the Eclipse Public License 2.0
7+
which accompanies this distribution, and is available at
8+
https://www.eclipse.org/legal/epl-2.0/
9+
10+
SPDX-License-Identifier: EPL-2.0
11+
12+
Contributors:
13+
Liviu Ionescu
14+
-->
15+
16+
<plugin>
17+
18+
</plugin>

‎plugins/org.eclipse.embedcdt.debug.gdbjtag.core/plugin.xml

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<?eclipse version="3.4"?>
3+
<!--
4+
Copyright (c) 2012, 2017 Liviu Ionescu.
5+
This program and the accompanying materials
6+
are made available under the terms of the Eclipse Public License 2.0
7+
which accompanies this distribution, and is available at
8+
https://www.eclipse.org/legal/epl-2.0/
9+
10+
SPDX-License-Identifier: EPL-2.0
11+
12+
Contributors:
13+
Liviu Ionescu
14+
-->
15+
16+
<plugin>
17+
18+
</plugin>

0 commit comments

Comments
 (0)