toolchain family renamed architecture; toolchain tab added and

functional
eclipse-embed-cdt · Oct 11, 2013 · 2dba51f · 2dba51f
1 parent 21cabe9
commit 2dba51f
Show file tree

Hide file tree

Showing 16 changed files with 1,162 additions and 193 deletions.
diff --git a/ilg.gnuarmeclipse.managedbuild.cross/META-INF/MANIFEST.MF b/ilg.gnuarmeclipse.managedbuild.cross/META-INF/MANIFEST.MF
@@ -11,7 +11,8 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources;bundle-version="3.5.0",
  org.eclipse.cdt.managedbuilder.ui;bundle-version="8.1.0",
  org.eclipse.jface,
- org.eclipse.ui.ide
+ org.eclipse.ui.ide,
+ org.eclipse.cdt.ui;bundle-version="5.7.0"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Vendor: %Bundle-Vendor

diff --git a/ilg.gnuarmeclipse.managedbuild.cross/build.properties b/ilg.gnuarmeclipse.managedbuild.cross/build.properties
@@ -19,4 +19,5 @@ bin.includes = META-INF/,\
                about.properties,\
                plugin.properties,\
                cdt_logo_icon32.png,\
-               templates/
+               templates/,\
+               icons/
diff --git a/ilg.gnuarmeclipse.managedbuild.cross/icons/elcl16/config-tool.gif b/ilg.gnuarmeclipse.managedbuild.cross/icons/elcl16/config-tool.gif
diff --git a/ilg.gnuarmeclipse.managedbuild.cross/plugin.properties b/ilg.gnuarmeclipse.managedbuild.cross/plugin.properties
@@ -31,9 +31,9 @@ option.toolchain.index.8 = Linaro AArch64 big-endian bare-metal ELF
 option.toolchain.index.9 = Linaro AArch64 Linux GNU
 option.toolchain.index.10 = Linaro AArch64 big-endian Linux GNU
 
-option.toolchain.family = Family
-option.toolchain.family.arm = ARM (AArch32)
-option.toolchain.family.aarch64 = ARM64 (AArch64)
+option.toolchain.architecture = Architecture
+option.toolchain.architecture.arm = ARM (AArch32)
+option.toolchain.architecture.aarch64 = ARM64 (AArch64)
 
 option.toolchain.prefix = Prefix
 option.toolchain.suffix = Suffix
@@ -308,4 +308,7 @@ option.print.hex = Hex
 option.print.totals = Show totals
 option.print.other = Other flags
 
-GCCBuiltinSpecsDetector.name = CDT GCC Built-in Compiler Settings Cross ARM
+GCCBuiltinSpecsDetector.name = CDT GCC Built-in Compiler Settings Cross ARM
+
+tab.toolchainSettings = Toolchain Settings
+
diff --git a/ilg.gnuarmeclipse.managedbuild.cross/plugin.xml b/ilg.gnuarmeclipse.managedbuild.cross/plugin.xml
@@ -846,8 +846,8 @@
                <checkOption
                      holderId="ilg.gnuarmeclipse.managedbuild.cross.toolchain.base"
                      isRegex="false"
-                     optionId="ilg.gnuarmeclipse.managedbuild.cross.option.family"
-                     value="ilg.gnuarmeclipse.managedbuild.cross.option.family.arm">
+                     optionId="ilg.gnuarmeclipse.managedbuild.cross.option.architecture"
+                     value="ilg.gnuarmeclipse.managedbuild.cross.option.architecture.arm">
                </checkOption>
             </enablement>
             <enumeratedOptionValue
@@ -1292,8 +1292,8 @@
                <checkOption
                      holderId="ilg.gnuarmeclipse.managedbuild.cross.toolchain.base"
                      isRegex="false"
-                     optionId="ilg.gnuarmeclipse.managedbuild.cross.option.family"
-                     value="ilg.gnuarmeclipse.managedbuild.cross.option.family.arm">
+                     optionId="ilg.gnuarmeclipse.managedbuild.cross.option.architecture"
+                     value="ilg.gnuarmeclipse.managedbuild.cross.option.architecture.arm">
                </checkOption>
             </enablement>
             <enumeratedOptionValue
@@ -1439,8 +1439,8 @@
                <checkOption
                      holderId="ilg.gnuarmeclipse.managedbuild.cross.toolchain.base"
                      isRegex="false"
-                     optionId="ilg.gnuarmeclipse.managedbuild.cross.option.family"
-                     value="ilg.gnuarmeclipse.managedbuild.cross.option.family.arm">
+                     optionId="ilg.gnuarmeclipse.managedbuild.cross.option.architecture"
+                     value="ilg.gnuarmeclipse.managedbuild.cross.option.architecture.arm">
                </checkOption>
             </enablement>
             <enumeratedOptionValue
@@ -1472,8 +1472,8 @@
                <checkOption
                      holderId="ilg.gnuarmeclipse.managedbuild.cross.toolchain.base"
                      isRegex="false"
-                     optionId="ilg.gnuarmeclipse.managedbuild.cross.option.family"
-                     value="ilg.gnuarmeclipse.managedbuild.cross.option.family.arm">
+                     optionId="ilg.gnuarmeclipse.managedbuild.cross.option.architecture"
+                     value="ilg.gnuarmeclipse.managedbuild.cross.option.architecture.arm">
                </checkOption>
             </enablement>
          </option>
@@ -1487,8 +1487,8 @@
                <checkOption
                      holderId="ilg.gnuarmeclipse.managedbuild.cross.toolchain.base"
                      isRegex="false"
-                     optionId="ilg.gnuarmeclipse.managedbuild.cross.option.family"
-                     value="ilg.gnuarmeclipse.managedbuild.cross.option.family.arm">
+                     optionId="ilg.gnuarmeclipse.managedbuild.cross.option.architecture"
+                     value="ilg.gnuarmeclipse.managedbuild.cross.option.architecture.arm">
                </checkOption>
             </enablement>
             <enumeratedOptionValue
@@ -1518,8 +1518,8 @@
                <checkOption
                      holderId="ilg.gnuarmeclipse.managedbuild.cross.toolchain.base"
                      isRegex="false"
-                     optionId="ilg.gnuarmeclipse.managedbuild.cross.option.family"
-                     value="ilg.gnuarmeclipse.managedbuild.cross.option.family.arm">
+                     optionId="ilg.gnuarmeclipse.managedbuild.cross.option.architecture"
+                     value="ilg.gnuarmeclipse.managedbuild.cross.option.architecture.arm">
                </checkOption>
             </enablement>
             <enablement
@@ -1578,8 +1578,8 @@
                <checkOption
                      holderId="ilg.gnuarmeclipse.managedbuild.cross.toolchain.base"
                      isRegex="false"
-                     optionId="ilg.gnuarmeclipse.managedbuild.cross.option.family"
-                     value="ilg.gnuarmeclipse.managedbuild.cross.option.family.arm">
+                     optionId="ilg.gnuarmeclipse.managedbuild.cross.option.architecture"
+                     value="ilg.gnuarmeclipse.managedbuild.cross.option.architecture.arm">
                </checkOption>
             </enablement>
             <enablement
@@ -1743,8 +1743,8 @@
                <checkOption
                      holderId="ilg.gnuarmeclipse.managedbuild.cross.toolchain.base"
                      isRegex="false"
-                     optionId="ilg.gnuarmeclipse.managedbuild.cross.option.family"
-                     value="ilg.gnuarmeclipse.managedbuild.cross.option.family.arm">
+                     optionId="ilg.gnuarmeclipse.managedbuild.cross.option.architecture"
+                     value="ilg.gnuarmeclipse.managedbuild.cross.option.architecture.arm">
                </checkOption>
             </enablement>
             <enumeratedOptionValue
@@ -1781,8 +1781,8 @@
                <checkOption
                      holderId="ilg.gnuarmeclipse.managedbuild.cross.toolchain.base"
                      isRegex="false"
-                     optionId="ilg.gnuarmeclipse.managedbuild.cross.option.family"
-                     value="ilg.gnuarmeclipse.managedbuild.cross.option.family.aarch64">
+                     optionId="ilg.gnuarmeclipse.managedbuild.cross.option.architecture"
+                     value="ilg.gnuarmeclipse.managedbuild.cross.option.architecture.aarch64">
                </checkOption>
             </enablement>
             <enumeratedOptionValue
@@ -1811,8 +1811,8 @@
                <checkOption
                      holderId="ilg.gnuarmeclipse.managedbuild.cross.toolchain.base"
                      isRegex="false"
-                     optionId="ilg.gnuarmeclipse.managedbuild.cross.option.family"
-                     value="ilg.gnuarmeclipse.managedbuild.cross.option.family.aarch64">
+                     optionId="ilg.gnuarmeclipse.managedbuild.cross.option.architecture"
+                     value="ilg.gnuarmeclipse.managedbuild.cross.option.architecture.aarch64">
                </checkOption>
             </enablement>
             <enablement
@@ -1850,8 +1850,8 @@
                <checkOption
                      holderId="ilg.gnuarmeclipse.managedbuild.cross.toolchain.base"
                      isRegex="false"
-                     optionId="ilg.gnuarmeclipse.managedbuild.cross.option.family"
-                     value="ilg.gnuarmeclipse.managedbuild.cross.option.family.aarch64">
+                     optionId="ilg.gnuarmeclipse.managedbuild.cross.option.architecture"
+                     value="ilg.gnuarmeclipse.managedbuild.cross.option.architecture.aarch64">
                </checkOption>
             </enablement>
             <enablement
@@ -1889,8 +1889,8 @@
                <checkOption
                      holderId="ilg.gnuarmeclipse.managedbuild.cross.toolchain.base"
                      isRegex="false"
-                     optionId="ilg.gnuarmeclipse.managedbuild.cross.option.family"
-                     value="ilg.gnuarmeclipse.managedbuild.cross.option.family.aarch64">
+                     optionId="ilg.gnuarmeclipse.managedbuild.cross.option.architecture"
+                     value="ilg.gnuarmeclipse.managedbuild.cross.option.architecture.aarch64">
                </checkOption>
             </enablement>
             <enablement
@@ -1929,8 +1929,8 @@
                <checkOption
                      holderId="ilg.gnuarmeclipse.managedbuild.cross.toolchain.base"
                      isRegex="false"
-                     optionId="ilg.gnuarmeclipse.managedbuild.cross.option.family"
-                     value="ilg.gnuarmeclipse.managedbuild.cross.option.family.aarch64">
+                     optionId="ilg.gnuarmeclipse.managedbuild.cross.option.architecture"
+                     value="ilg.gnuarmeclipse.managedbuild.cross.option.architecture.aarch64">
                </checkOption>
             </enablement>
             <enablement
@@ -1969,8 +1969,8 @@
                <checkOption
                      holderId="ilg.gnuarmeclipse.managedbuild.cross.toolchain.base"
                      isRegex="false"
-                     optionId="ilg.gnuarmeclipse.managedbuild.cross.option.family"
-                     value="ilg.gnuarmeclipse.managedbuild.cross.option.family.aarch64">
+                     optionId="ilg.gnuarmeclipse.managedbuild.cross.option.architecture"
+                     value="ilg.gnuarmeclipse.managedbuild.cross.option.architecture.aarch64">
                </checkOption>
             </enablement>
             <enumeratedOptionValue
@@ -2005,8 +2005,8 @@
                <checkOption
                      holderId="ilg.gnuarmeclipse.managedbuild.cross.toolchain.base"
                      isRegex="false"
-                     optionId="ilg.gnuarmeclipse.managedbuild.cross.option.family"
-                     value="ilg.gnuarmeclipse.managedbuild.cross.option.family.aarch64">
+                     optionId="ilg.gnuarmeclipse.managedbuild.cross.option.architecture"
+                     value="ilg.gnuarmeclipse.managedbuild.cross.option.architecture.aarch64">
                </checkOption>
             </enablement>
          </option>
@@ -2040,6 +2040,12 @@
          <optionCategory
                id="ilg.gnuarmeclipse.managedbuild.cross.optionCategory.toolchain"
                name="%optionCategory.toolchain">
+            <enablement
+                  type="UI_VISIBILITY">
+               <false>
+                  false body text
+               </false>
+            </enablement>
          </optionCategory>
          <option
                category="ilg.gnuarmeclipse.managedbuild.cross.optionCategory.toolchain"
@@ -2101,18 +2107,21 @@
          </option>
          <option
                category="ilg.gnuarmeclipse.managedbuild.cross.optionCategory.toolchain"
-               id="ilg.gnuarmeclipse.managedbuild.cross.option.family"
+               defaultValue="?"
+               id="ilg.gnuarmeclipse.managedbuild.cross.option.architecture"
                isAbstract="false"
-               name="%option.toolchain.family"
+               name="%option.toolchain.architecture"
+               value="?"
                valueHandler="ilg.gnuarmeclipse.managedbuild.cross.ToolchainFamilyManagedOptionValueHandler"
                valueType="enumerated">
             <enumeratedOptionValue
-                  id="ilg.gnuarmeclipse.managedbuild.cross.option.family.arm"
-                  name="%option.toolchain.family.arm">
+                  id="ilg.gnuarmeclipse.managedbuild.cross.option.architecture.arm"
+                  isDefault="true"
+                  name="%option.toolchain.architecture.arm">
             </enumeratedOptionValue>
             <enumeratedOptionValue
-                  id="ilg.gnuarmeclipse.managedbuild.cross.option.family.aarch64"
-                  name="%option.toolchain.family.aarch64">
+                  id="ilg.gnuarmeclipse.managedbuild.cross.option.architecture.aarch64"
+                  name="%option.toolchain.architecture.aarch64">
             </enumeratedOptionValue>
          </option>
          <option
@@ -2232,7 +2241,7 @@
          <option
                browseType="directory"
                category="ilg.gnuarmeclipse.managedbuild.cross.optionCategory.toolchain"
-               id="ilg.gnuarmeclipse.managedbuild.cross.option.path"
+               id="ilg.gnuarmeclipse.managedbuild.cross.option.toolchain.path"
                isAbstract="false"
                name="%option.toolchain.path"
                resourceFilter="all"
@@ -3917,4 +3926,16 @@
          </language-scope>
       </provider>
    </extension>
+   <extension
+           point="org.eclipse.cdt.ui.cPropertyTab">
+      <tab
+            class="ilg.gnuarmeclipse.managedbuild.cross.ToolchainSettingsTab"
+            helpId="cdt_u_prop_build_setting_tool"
+            icon="icons/elcl16/config-tool.gif"
+            name="%tab.toolchainSettings"
+            parent="org.eclipse.cdt.managedbuilder.ui.properties.Page_BuildSettings"
+            weight="012">
+      </tab>
+   </extension>
+
 </plugin>
diff --git a/...e.managedbuild.cross/src/ilg/gnuarmeclipse/managedbuild/cross/ARMOptionApplicability.java b/...e.managedbuild.cross/src/ilg/gnuarmeclipse/managedbuild/cross/ARMOptionApplicability.java
@@ -45,13 +45,13 @@ private boolean isOption(IBuildObject configuration, IHoldsOptions holder,
 			IOption option) {
 
 		IToolChain toolchain = (IToolChain) holder;
-		String sFamilyId = Activator.getOptionPrefix() + ".family";
-		IOption checkedOption = toolchain.getOptionBySuperClassId(sFamilyId); //$NON-NLS-1$
+		String sArchitectureId = Option.OPTION_ARCHITECTURE;
+		IOption checkedOption = toolchain.getOptionBySuperClassId(sArchitectureId); //$NON-NLS-1$
 		if (checkedOption != null) {
 			String sValue;
 			try {
 				sValue = checkedOption.getStringValue();
-				if (sValue.endsWith(".arm"))
+				if (sValue.endsWith("."+Option.ARCHITECTURE_ARM))
 					return true;
 			} catch (BuildException e) {
 				// TODO Auto-generated catch block

diff --git a/...agedbuild.cross/src/ilg/gnuarmeclipse/managedbuild/cross/EnvironmentVariableSupplier.java b/...agedbuild.cross/src/ilg/gnuarmeclipse/managedbuild/cross/EnvironmentVariableSupplier.java
@@ -52,7 +52,7 @@ private PathEnvironmentVariable(File path) {
 
 		public static PathEnvironmentVariable create(IConfiguration configuration) {
 			IToolChain toolchain = configuration.getToolChain();
-			IOption option = toolchain.getOptionBySuperClassId(Activator.getOptionPrefix()+".path"); //$NON-NLS-1$
+			IOption option = toolchain.getOptionBySuperClassId(Option.OPTION_TOOLCHAIN_PATH); //$NON-NLS-1$
 			String path = (String)option.getValue();
 			File sysroot = new File(path);
 			File bin = new File(sysroot, "bin"); //$NON-NLS-1$

diff --git a/ilg.gnuarmeclipse.managedbuild.cross/src/ilg/gnuarmeclipse/managedbuild/cross/Messages.java b/ilg.gnuarmeclipse.managedbuild.cross/src/ilg/gnuarmeclipse/managedbuild/cross/Messages.java
@@ -15,14 +15,38 @@
 import org.eclipse.osgi.util.NLS;
 
 public class Messages extends NLS {
-	private static final String BUNDLE_NAME = Activator.getPrefix()+".messages"; //$NON-NLS-1$
+	private static final String BUNDLE_NAME = Activator.getPrefix()
+			+ ".messages"; //$NON-NLS-1$
 	public static String SetCrossCommandWizardPage_browse;
 	public static String SetCrossCommandWizardPage_description;
 	public static String SetCrossCommandWizardPage_name;
 	public static String SetCrossCommandWizardPage_toolchain;
 	public static String SetCrossCommandWizardPage_path;
 	public static String SetCrossCommandWizardPage_prefix;
 	public static String SetCrossCommandWizardPage_title;
+	public static String ArtifactTab_0;
+	public static String ArtifactTab_1;
+	public static String ArtifactTab_2;
+	public static String ArtifactTab_3;
+
+	public static String ToolChainSettingsTab_name;
+	public static String ToolChainSettingsTab_architecture;
+	public static String ToolChainSettingsTab_prefix;
+	public static String ToolChainSettingsTab_suffix;
+	public static String ToolChainSettingsTab_cCmd;
+	public static String ToolChainSettingsTab_cppCmd;
+	public static String ToolChainSettingsTab_arCmd;
+	public static String ToolChainSettingsTab_objcopyCmd;
+	public static String ToolChainSettingsTab_objdumpCmd;
+	public static String ToolChainSettingsTab_sizeCmd;
+	public static String ToolChainSettingsTab_makeCmd;
+	public static String ToolChainSettingsTab_rmCmd;
+	public static String ToolChainSettingsTab_path;
+	public static String ToolChainSettingsTab_browse;
+	public static String ToolChainSettingsTab_flash;
+	public static String ToolChainSettingsTab_listing;
+	public static String ToolChainSettingsTab_size;
+
 	static {
 		// initialize resource bundle
 		NLS.initializeMessages(BUNDLE_NAME, Messages.class);