cross: create listing default false

- secondary targets defauts added to Option and used - plugin.xml also updated, although overriden by code
eclipse-embed-cdt · Jan 11, 2014 · 4711243 · 4711243
1 parent 9569fa6
commit 4711243
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/ilg.gnuarmeclipse.managedbuild.cross/plugin.xml b/ilg.gnuarmeclipse.managedbuild.cross/plugin.xml
@@ -571,7 +571,7 @@
             <enablement
                   attribute="value"
                   type="ALL"
-                  value="true">
+                  value="false">
                <checkBuildProperty
                      property="org.eclipse.cdt.build.core.buildArtefactType"
                      value="org.eclipse.cdt.build.core.buildArtefactType.exe">

diff --git a/ilg.gnuarmeclipse.managedbuild.cross/src/ilg/gnuarmeclipse/managedbuild/cross/Option.java b/ilg.gnuarmeclipse.managedbuild.cross/src/ilg/gnuarmeclipse/managedbuild/cross/Option.java
@@ -186,6 +186,11 @@ public class Option {
 	public static final String OPTION_CREATEFLASH_CHOICE = OPTION_PREFIX
 			+ ".createflash.choice";
 
+	// These should be in sync with plugin.xml definitions
+	public static final boolean OPTION_ADDTOOLS_CREATEFLASH_DEFAULT = true;
+	public static final boolean OPTION_ADDTOOLS_CREATELISTING_DEFAULT = false;
+	public static final boolean OPTION_ADDTOOLS_PRINTSIZE_DEFAULT = true;
+
 	public static final String CHOICE_IHEX = "ihex";
 	public static final String CHOICE_SREC = "srec";
 	public static final String CHOICE_SYMBOLSREC = "symbolsrec";

diff --git a/...pse.managedbuild.cross/src/ilg/gnuarmeclipse/managedbuild/cross/ToolchainSettingsTab.java b/...pse.managedbuild.cross/src/ilg/gnuarmeclipse/managedbuild/cross/ToolchainSettingsTab.java
@@ -798,15 +798,15 @@ public static void setOptionsForToolchain(IConfiguration config,
 		if (isExecutable) {
 			option = toolchain
 					.getOptionBySuperClassId(Option.OPTION_ADDTOOLS_CREATEFLASH); //$NON-NLS-1$
-			config.setOption(toolchain, option, true);
+			config.setOption(toolchain, option, Option.OPTION_ADDTOOLS_CREATEFLASH_DEFAULT);
 
 			option = toolchain
 					.getOptionBySuperClassId(Option.OPTION_ADDTOOLS_CREATELISTING); //$NON-NLS-1$
-			config.setOption(toolchain, option, true);
+			config.setOption(toolchain, option, Option.OPTION_ADDTOOLS_CREATELISTING_DEFAULT);
 
 			option = toolchain
 					.getOptionBySuperClassId(Option.OPTION_ADDTOOLS_PRINTSIZE); //$NON-NLS-1$
-			config.setOption(toolchain, option, true);
+			config.setOption(toolchain, option, Option.OPTION_ADDTOOLS_PRINTSIZE_DEFAULT);
 		}
 	}
 
@@ -842,9 +842,9 @@ protected void performDefaults() {
 		updateInterfaceAfterToolchainChange();
 
 		if (m_isExecutable) {
-			m_flashButton.setSelection(true);
-			m_listingButton.setSelection(true);
-			m_sizeButton.setSelection(true);
+			m_flashButton.setSelection(Option.OPTION_ADDTOOLS_CREATEFLASH_DEFAULT);
+			m_listingButton.setSelection(Option.OPTION_ADDTOOLS_CREATELISTING_DEFAULT);
+			m_sizeButton.setSelection(Option.OPTION_ADDTOOLS_PRINTSIZE_DEFAULT);
 		}
 		// System.out.println("performDefaults()");
 	}