Skip to content

Commit 2dba51f

Browse files
ilg-ulilg-ul
committed
toolchain family renamed architecture; toolchain tab added and
functional
1 parent 21cabe9 commit 2dba51f

16 files changed

+1162
-193
lines changed

‎ilg.gnuarmeclipse.managedbuild.cross/META-INF/MANIFEST.MF

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ Require-Bundle: org.eclipse.core.runtime,
1111
org.eclipse.core.resources;bundle-version="3.5.0",
1212
org.eclipse.cdt.managedbuilder.ui;bundle-version="8.1.0",
1313
org.eclipse.jface,
14-
org.eclipse.ui.ide
14+
org.eclipse.ui.ide,
15+
org.eclipse.cdt.ui;bundle-version="5.7.0"
1516
Bundle-ActivationPolicy: lazy
1617
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
1718
Bundle-Vendor: %Bundle-Vendor

‎ilg.gnuarmeclipse.managedbuild.cross/build.properties

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,5 @@ bin.includes = META-INF/,\
1919
about.properties,\
2020
plugin.properties,\
2121
cdt_logo_icon32.png,\
22-
templates/
22+
templates/,\
23+
icons/

‎ilg.gnuarmeclipse.managedbuild.cross/icons/elcl16/config-tool.gif

368 Bytes
Loading

‎ilg.gnuarmeclipse.managedbuild.cross/plugin.properties

+7-4
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ option.toolchain.index.8 = Linaro AArch64 big-endian bare-metal ELF
3131
option.toolchain.index.9 = Linaro AArch64 Linux GNU
3232
option.toolchain.index.10 = Linaro AArch64 big-endian Linux GNU
3333

34-
option.toolchain.family = Family
35-
option.toolchain.family.arm = ARM (AArch32)
36-
option.toolchain.family.aarch64 = ARM64 (AArch64)
34+
option.toolchain.architecture = Architecture
35+
option.toolchain.architecture.arm = ARM (AArch32)
36+
option.toolchain.architecture.aarch64 = ARM64 (AArch64)
3737

3838
option.toolchain.prefix = Prefix
3939
option.toolchain.suffix = Suffix
@@ -308,4 +308,7 @@ option.print.hex = Hex
308308
option.print.totals = Show totals
309309
option.print.other = Other flags
310310

311-
GCCBuiltinSpecsDetector.name = CDT GCC Built-in Compiler Settings Cross ARM
311+
GCCBuiltinSpecsDetector.name = CDT GCC Built-in Compiler Settings Cross ARM
312+
313+
tab.toolchainSettings = Toolchain Settings
314+

‎ilg.gnuarmeclipse.managedbuild.cross/plugin.xml

+58-37
Original file line numberDiff line numberDiff line change
@@ -846,8 +846,8 @@
846846
<checkOption
847847
holderId="ilg.gnuarmeclipse.managedbuild.cross.toolchain.base"
848848
isRegex="false"
849-
optionId="ilg.gnuarmeclipse.managedbuild.cross.option.family"
850-
value="ilg.gnuarmeclipse.managedbuild.cross.option.family.arm">
849+
optionId="ilg.gnuarmeclipse.managedbuild.cross.option.architecture"
850+
value="ilg.gnuarmeclipse.managedbuild.cross.option.architecture.arm">
851851
</checkOption>
852852
</enablement>
853853
<enumeratedOptionValue
@@ -1292,8 +1292,8 @@
12921292
<checkOption
12931293
holderId="ilg.gnuarmeclipse.managedbuild.cross.toolchain.base"
12941294
isRegex="false"
1295-
optionId="ilg.gnuarmeclipse.managedbuild.cross.option.family"
1296-
value="ilg.gnuarmeclipse.managedbuild.cross.option.family.arm">
1295+
optionId="ilg.gnuarmeclipse.managedbuild.cross.option.architecture"
1296+
value="ilg.gnuarmeclipse.managedbuild.cross.option.architecture.arm">
12971297
</checkOption>
12981298
</enablement>
12991299
<enumeratedOptionValue
@@ -1439,8 +1439,8 @@
14391439
<checkOption
14401440
holderId="ilg.gnuarmeclipse.managedbuild.cross.toolchain.base"
14411441
isRegex="false"
1442-
optionId="ilg.gnuarmeclipse.managedbuild.cross.option.family"
1443-
value="ilg.gnuarmeclipse.managedbuild.cross.option.family.arm">
1442+
optionId="ilg.gnuarmeclipse.managedbuild.cross.option.architecture"
1443+
value="ilg.gnuarmeclipse.managedbuild.cross.option.architecture.arm">
14441444
</checkOption>
14451445
</enablement>
14461446
<enumeratedOptionValue
@@ -1472,8 +1472,8 @@
14721472
<checkOption
14731473
holderId="ilg.gnuarmeclipse.managedbuild.cross.toolchain.base"
14741474
isRegex="false"
1475-
optionId="ilg.gnuarmeclipse.managedbuild.cross.option.family"
1476-
value="ilg.gnuarmeclipse.managedbuild.cross.option.family.arm">
1475+
optionId="ilg.gnuarmeclipse.managedbuild.cross.option.architecture"
1476+
value="ilg.gnuarmeclipse.managedbuild.cross.option.architecture.arm">
14771477
</checkOption>
14781478
</enablement>
14791479
</option>
@@ -1487,8 +1487,8 @@
14871487
<checkOption
14881488
holderId="ilg.gnuarmeclipse.managedbuild.cross.toolchain.base"
14891489
isRegex="false"
1490-
optionId="ilg.gnuarmeclipse.managedbuild.cross.option.family"
1491-
value="ilg.gnuarmeclipse.managedbuild.cross.option.family.arm">
1490+
optionId="ilg.gnuarmeclipse.managedbuild.cross.option.architecture"
1491+
value="ilg.gnuarmeclipse.managedbuild.cross.option.architecture.arm">
14921492
</checkOption>
14931493
</enablement>
14941494
<enumeratedOptionValue
@@ -1518,8 +1518,8 @@
15181518
<checkOption
15191519
holderId="ilg.gnuarmeclipse.managedbuild.cross.toolchain.base"
15201520
isRegex="false"
1521-
optionId="ilg.gnuarmeclipse.managedbuild.cross.option.family"
1522-
value="ilg.gnuarmeclipse.managedbuild.cross.option.family.arm">
1521+
optionId="ilg.gnuarmeclipse.managedbuild.cross.option.architecture"
1522+
value="ilg.gnuarmeclipse.managedbuild.cross.option.architecture.arm">
15231523
</checkOption>
15241524
</enablement>
15251525
<enablement
@@ -1578,8 +1578,8 @@
15781578
<checkOption
15791579
holderId="ilg.gnuarmeclipse.managedbuild.cross.toolchain.base"
15801580
isRegex="false"
1581-
optionId="ilg.gnuarmeclipse.managedbuild.cross.option.family"
1582-
value="ilg.gnuarmeclipse.managedbuild.cross.option.family.arm">
1581+
optionId="ilg.gnuarmeclipse.managedbuild.cross.option.architecture"
1582+
value="ilg.gnuarmeclipse.managedbuild.cross.option.architecture.arm">
15831583
</checkOption>
15841584
</enablement>
15851585
<enablement
@@ -1743,8 +1743,8 @@
17431743
<checkOption
17441744
holderId="ilg.gnuarmeclipse.managedbuild.cross.toolchain.base"
17451745
isRegex="false"
1746-
optionId="ilg.gnuarmeclipse.managedbuild.cross.option.family"
1747-
value="ilg.gnuarmeclipse.managedbuild.cross.option.family.arm">
1746+
optionId="ilg.gnuarmeclipse.managedbuild.cross.option.architecture"
1747+
value="ilg.gnuarmeclipse.managedbuild.cross.option.architecture.arm">
17481748
</checkOption>
17491749
</enablement>
17501750
<enumeratedOptionValue
@@ -1781,8 +1781,8 @@
17811781
<checkOption
17821782
holderId="ilg.gnuarmeclipse.managedbuild.cross.toolchain.base"
17831783
isRegex="false"
1784-
optionId="ilg.gnuarmeclipse.managedbuild.cross.option.family"
1785-
value="ilg.gnuarmeclipse.managedbuild.cross.option.family.aarch64">
1784+
optionId="ilg.gnuarmeclipse.managedbuild.cross.option.architecture"
1785+
value="ilg.gnuarmeclipse.managedbuild.cross.option.architecture.aarch64">
17861786
</checkOption>
17871787
</enablement>
17881788
<enumeratedOptionValue
@@ -1811,8 +1811,8 @@
18111811
<checkOption
18121812
holderId="ilg.gnuarmeclipse.managedbuild.cross.toolchain.base"
18131813
isRegex="false"
1814-
optionId="ilg.gnuarmeclipse.managedbuild.cross.option.family"
1815-
value="ilg.gnuarmeclipse.managedbuild.cross.option.family.aarch64">
1814+
optionId="ilg.gnuarmeclipse.managedbuild.cross.option.architecture"
1815+
value="ilg.gnuarmeclipse.managedbuild.cross.option.architecture.aarch64">
18161816
</checkOption>
18171817
</enablement>
18181818
<enablement
@@ -1850,8 +1850,8 @@
18501850
<checkOption
18511851
holderId="ilg.gnuarmeclipse.managedbuild.cross.toolchain.base"
18521852
isRegex="false"
1853-
optionId="ilg.gnuarmeclipse.managedbuild.cross.option.family"
1854-
value="ilg.gnuarmeclipse.managedbuild.cross.option.family.aarch64">
1853+
optionId="ilg.gnuarmeclipse.managedbuild.cross.option.architecture"
1854+
value="ilg.gnuarmeclipse.managedbuild.cross.option.architecture.aarch64">
18551855
</checkOption>
18561856
</enablement>
18571857
<enablement
@@ -1889,8 +1889,8 @@
18891889
<checkOption
18901890
holderId="ilg.gnuarmeclipse.managedbuild.cross.toolchain.base"
18911891
isRegex="false"
1892-
optionId="ilg.gnuarmeclipse.managedbuild.cross.option.family"
1893-
value="ilg.gnuarmeclipse.managedbuild.cross.option.family.aarch64">
1892+
optionId="ilg.gnuarmeclipse.managedbuild.cross.option.architecture"
1893+
value="ilg.gnuarmeclipse.managedbuild.cross.option.architecture.aarch64">
18941894
</checkOption>
18951895
</enablement>
18961896
<enablement
@@ -1929,8 +1929,8 @@
19291929
<checkOption
19301930
holderId="ilg.gnuarmeclipse.managedbuild.cross.toolchain.base"
19311931
isRegex="false"
1932-
optionId="ilg.gnuarmeclipse.managedbuild.cross.option.family"
1933-
value="ilg.gnuarmeclipse.managedbuild.cross.option.family.aarch64">
1932+
optionId="ilg.gnuarmeclipse.managedbuild.cross.option.architecture"
1933+
value="ilg.gnuarmeclipse.managedbuild.cross.option.architecture.aarch64">
19341934
</checkOption>
19351935
</enablement>
19361936
<enablement
@@ -1969,8 +1969,8 @@
19691969
<checkOption
19701970
holderId="ilg.gnuarmeclipse.managedbuild.cross.toolchain.base"
19711971
isRegex="false"
1972-
optionId="ilg.gnuarmeclipse.managedbuild.cross.option.family"
1973-
value="ilg.gnuarmeclipse.managedbuild.cross.option.family.aarch64">
1972+
optionId="ilg.gnuarmeclipse.managedbuild.cross.option.architecture"
1973+
value="ilg.gnuarmeclipse.managedbuild.cross.option.architecture.aarch64">
19741974
</checkOption>
19751975
</enablement>
19761976
<enumeratedOptionValue
@@ -2005,8 +2005,8 @@
20052005
<checkOption
20062006
holderId="ilg.gnuarmeclipse.managedbuild.cross.toolchain.base"
20072007
isRegex="false"
2008-
optionId="ilg.gnuarmeclipse.managedbuild.cross.option.family"
2009-
value="ilg.gnuarmeclipse.managedbuild.cross.option.family.aarch64">
2008+
optionId="ilg.gnuarmeclipse.managedbuild.cross.option.architecture"
2009+
value="ilg.gnuarmeclipse.managedbuild.cross.option.architecture.aarch64">
20102010
</checkOption>
20112011
</enablement>
20122012
</option>
@@ -2040,6 +2040,12 @@
20402040
<optionCategory
20412041
id="ilg.gnuarmeclipse.managedbuild.cross.optionCategory.toolchain"
20422042
name="%optionCategory.toolchain">
2043+
<enablement
2044+
type="UI_VISIBILITY">
2045+
<false>
2046+
false body text
2047+
</false>
2048+
</enablement>
20432049
</optionCategory>
20442050
<option
20452051
category="ilg.gnuarmeclipse.managedbuild.cross.optionCategory.toolchain"
@@ -2101,18 +2107,21 @@
21012107
</option>
21022108
<option
21032109
category="ilg.gnuarmeclipse.managedbuild.cross.optionCategory.toolchain"
2104-
id="ilg.gnuarmeclipse.managedbuild.cross.option.family"
2110+
defaultValue="?"
2111+
id="ilg.gnuarmeclipse.managedbuild.cross.option.architecture"
21052112
isAbstract="false"
2106-
name="%option.toolchain.family"
2113+
name="%option.toolchain.architecture"
2114+
value="?"
21072115
valueHandler="ilg.gnuarmeclipse.managedbuild.cross.ToolchainFamilyManagedOptionValueHandler"
21082116
valueType="enumerated">
21092117
<enumeratedOptionValue
2110-
id="ilg.gnuarmeclipse.managedbuild.cross.option.family.arm"
2111-
name="%option.toolchain.family.arm">
2118+
id="ilg.gnuarmeclipse.managedbuild.cross.option.architecture.arm"
2119+
isDefault="true"
2120+
name="%option.toolchain.architecture.arm">
21122121
</enumeratedOptionValue>
21132122
<enumeratedOptionValue
2114-
id="ilg.gnuarmeclipse.managedbuild.cross.option.family.aarch64"
2115-
name="%option.toolchain.family.aarch64">
2123+
id="ilg.gnuarmeclipse.managedbuild.cross.option.architecture.aarch64"
2124+
name="%option.toolchain.architecture.aarch64">
21162125
</enumeratedOptionValue>
21172126
</option>
21182127
<option
@@ -2232,7 +2241,7 @@
22322241
<option
22332242
browseType="directory"
22342243
category="ilg.gnuarmeclipse.managedbuild.cross.optionCategory.toolchain"
2235-
id="ilg.gnuarmeclipse.managedbuild.cross.option.path"
2244+
id="ilg.gnuarmeclipse.managedbuild.cross.option.toolchain.path"
22362245
isAbstract="false"
22372246
name="%option.toolchain.path"
22382247
resourceFilter="all"
@@ -3917,4 +3926,16 @@
39173926
</language-scope>
39183927
</provider>
39193928
</extension>
3929+
<extension
3930+
point="org.eclipse.cdt.ui.cPropertyTab">
3931+
<tab
3932+
class="ilg.gnuarmeclipse.managedbuild.cross.ToolchainSettingsTab"
3933+
helpId="cdt_u_prop_build_setting_tool"
3934+
icon="icons/elcl16/config-tool.gif"
3935+
name="%tab.toolchainSettings"
3936+
parent="org.eclipse.cdt.managedbuilder.ui.properties.Page_BuildSettings"
3937+
weight="012">
3938+
</tab>
3939+
</extension>
3940+
39203941
</plugin>

‎ilg.gnuarmeclipse.managedbuild.cross/src/ilg/gnuarmeclipse/managedbuild/cross/ARMOptionApplicability.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@ private boolean isOption(IBuildObject configuration, IHoldsOptions holder,
4545
IOption option) {
4646

4747
IToolChain toolchain = (IToolChain) holder;
48-
String sFamilyId = Activator.getOptionPrefix() + ".family";
49-
IOption checkedOption = toolchain.getOptionBySuperClassId(sFamilyId); //$NON-NLS-1$
48+
String sArchitectureId = Option.OPTION_ARCHITECTURE;
49+
IOption checkedOption = toolchain.getOptionBySuperClassId(sArchitectureId); //$NON-NLS-1$
5050
if (checkedOption != null) {
5151
String sValue;
5252
try {
5353
sValue = checkedOption.getStringValue();
54-
if (sValue.endsWith(".arm"))
54+
if (sValue.endsWith("."+Option.ARCHITECTURE_ARM))
5555
return true;
5656
} catch (BuildException e) {
5757
// TODO Auto-generated catch block

‎ilg.gnuarmeclipse.managedbuild.cross/src/ilg/gnuarmeclipse/managedbuild/cross/EnvironmentVariableSupplier.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ private PathEnvironmentVariable(File path) {
5252

5353
public static PathEnvironmentVariable create(IConfiguration configuration) {
5454
IToolChain toolchain = configuration.getToolChain();
55-
IOption option = toolchain.getOptionBySuperClassId(Activator.getOptionPrefix()+".path"); //$NON-NLS-1$
55+
IOption option = toolchain.getOptionBySuperClassId(Option.OPTION_TOOLCHAIN_PATH); //$NON-NLS-1$
5656
String path = (String)option.getValue();
5757
File sysroot = new File(path);
5858
File bin = new File(sysroot, "bin"); //$NON-NLS-1$

‎ilg.gnuarmeclipse.managedbuild.cross/src/ilg/gnuarmeclipse/managedbuild/cross/Messages.java

+25-1
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,38 @@
1515
import org.eclipse.osgi.util.NLS;
1616

1717
public class Messages extends NLS {
18-
private static final String BUNDLE_NAME = Activator.getPrefix()+".messages"; //$NON-NLS-1$
18+
private static final String BUNDLE_NAME = Activator.getPrefix()
19+
+ ".messages"; //$NON-NLS-1$
1920
public static String SetCrossCommandWizardPage_browse;
2021
public static String SetCrossCommandWizardPage_description;
2122
public static String SetCrossCommandWizardPage_name;
2223
public static String SetCrossCommandWizardPage_toolchain;
2324
public static String SetCrossCommandWizardPage_path;
2425
public static String SetCrossCommandWizardPage_prefix;
2526
public static String SetCrossCommandWizardPage_title;
27+
public static String ArtifactTab_0;
28+
public static String ArtifactTab_1;
29+
public static String ArtifactTab_2;
30+
public static String ArtifactTab_3;
31+
32+
public static String ToolChainSettingsTab_name;
33+
public static String ToolChainSettingsTab_architecture;
34+
public static String ToolChainSettingsTab_prefix;
35+
public static String ToolChainSettingsTab_suffix;
36+
public static String ToolChainSettingsTab_cCmd;
37+
public static String ToolChainSettingsTab_cppCmd;
38+
public static String ToolChainSettingsTab_arCmd;
39+
public static String ToolChainSettingsTab_objcopyCmd;
40+
public static String ToolChainSettingsTab_objdumpCmd;
41+
public static String ToolChainSettingsTab_sizeCmd;
42+
public static String ToolChainSettingsTab_makeCmd;
43+
public static String ToolChainSettingsTab_rmCmd;
44+
public static String ToolChainSettingsTab_path;
45+
public static String ToolChainSettingsTab_browse;
46+
public static String ToolChainSettingsTab_flash;
47+
public static String ToolChainSettingsTab_listing;
48+
public static String ToolChainSettingsTab_size;
49+
2650
static {
2751
// initialize resource bundle
2852
NLS.initializeMessages(BUNDLE_NAME, Messages.class);

0 commit comments

Comments
 (0)