Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoug Schaefer2003-09-26 19:54:33 +0000
committerDoug Schaefer2003-09-26 19:54:33 +0000
commitdcbbea5b74a1234e7a9481da96c90e787b644599 (patch)
tree5daf76f7eb466d028c626d7c510f505935fe9286 /build/org.eclipse.cdt.managedbuilder.ui
parenta3a827cf923126be62a941826f9258b99d1e4f19 (diff)
downloadorg.eclipse.cdt-dcbbea5b74a1234e7a9481da96c90e787b644599.tar.gz
org.eclipse.cdt-dcbbea5b74a1234e7a9481da96c90e787b644599.tar.xz
org.eclipse.cdt-dcbbea5b74a1234e7a9481da96c90e787b644599.zip
Patch for Sean Evoy:
Two of the fixes, 43614 and 43756, involved changing property files only, which validates the extra work of externalizing strings from the start! For 43616, I simply took the advice of the bug reporter and added the '-' in front of the RM macro in the clean target and the include directives in the makefile. The largest part of the fix involves 43220. Until just now, this was a critical bug in bugzilla, so I addressed it. It has just been downgraded to an enhancement request. There is now a new entry widget in the linker options for user objects. The makefile will simply add these to the final build target's command. Most of the work was done in the plugin file and the build model to handle the new "type" of option.
Diffstat (limited to 'build/org.eclipse.cdt.managedbuilder.ui')
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui/ChangeLog17
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui/plugin.properties7
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui/plugin.xml360
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/PluginResources.properties2
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildToolSettingsPage.java2
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildToolsSettingsStore.java8
6 files changed, 280 insertions, 116 deletions
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/ChangeLog b/build/org.eclipse.cdt.managedbuilder.ui/ChangeLog
index f0a2e2f0649..3ba04427453 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/ChangeLog
+++ b/build/org.eclipse.cdt.managedbuilder.ui/ChangeLog
@@ -1,4 +1,21 @@
2003-09-25 Sean Evoy
+ For bug (really an enhancement request)43756, I added the word default to a
+ widget label to try and make it clear that a new configuration will be based
+ on default values, not user-overridden stuff. It remains to be seen if this
+ actually helps, but it seems reasonable.
+ * src/org/eclipse/cdt/managedbuilder/internal/ui/PluginResources.properties
+
+ For bug 43220 I now display a widget just for user objects.
+ * src/org/eclipse/cdt/managedbuilder/ui/properties/BuildToolSettingsPage.java
+ * src/org/eclipse/cdt/managedbuilder/ui/properties/BuildToolsSettingsStore.java
+
+ I also reordered the plugin definition for the linker tools, and moved some of
+ the option labels to the plugin property file. I also added a user object option
+ to each linker tool definition.
+ * plugin.properties
+ * plugin.xml
+
+2003-09-25 Sean Evoy
This patch contains a lot of changes needed to implement fixes for 42648 and
43122.
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/plugin.properties b/build/org.eclipse.cdt.managedbuilder.ui/plugin.properties
index 10a64d102da..55075da5be9 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/plugin.properties
+++ b/build/org.eclipse.cdt.managedbuilder.ui/plugin.properties
@@ -37,6 +37,13 @@ Option.Posix.Optimize.Most=Optimize most (-O3)
Option.Posix.Verbose=Verbose (-v)
Option.OtherFlags=Other flags
+Option.Posix.Linker.NoStartFiles=Do not use standard start files (-nostartfiles)
+Option.Posix.Linker.NoDefLibs=Do not use default libraries (-nodefaultlibs)
+Option.Posix.Linker.NoStdLibs=No startup or default libs (-nostdlib)
+Option.Posix.Linker.Strip=Remove symbol table (-s)
+Option.Posix.Linker.Static=No shared libraries (-static)
+Option.Posix.Linker.XLinker=Other options (-Xlinker [option])
Option.Posix.Linker.Flags=Linker flags
Option.Posix.Libs=Libraries (-l)
Option.Posix.Libsearch=Library search path (-L)
+Option.Posix.UserObjs=Other objects
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml b/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
index 7210dbccae4..4c5fa3e7fbc 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
@@ -418,25 +418,88 @@
id="cygwin.linker.category.general">
</optionCategory>
<option
- name="Linker Flags"
+ defaultValue="false"
+ name="%Option.Posix.Linker.NoStartFiles"
category="cygwin.linker.category.general"
- valueType="string"
- id="cygwin.link.ld.flags">
+ command="-nostartfiles"
+ valueType="boolean"
+ id="linux.gnu.linker.options.nostart">
</option>
<option
- name="%Option.Posix.Libs"
+ defaultValue="false"
+ name="%Option.Posix.Linker.NoDefLibs"
+ category="cygwin.linker.category.general"
+ command="-nodefaultlibs"
+ valueType="boolean"
+ id="cygwin.gnu.linker.options.nodeflibs">
+ </option>
+ <option
+ defaultValue="false"
+ name="%Option.Posix.Linker.NoStdLibs"
+ category="cygwin.linker.category.general"
+ command="-nostdlib"
+ valueType="boolean"
+ id="cygwin.gnu.linker.options.nostdlibs">
+ </option>
+ <option
+ defaultValue="false"
+ name="%Option.Posix.Linker.Strip"
+ category="linux.gnu.linker.category.options"
+ command="-s"
+ valueType="boolean"
+ id="cygwin.gnu.linker.options.strip">
+ </option>
+ <option
+ defaultValue="false"
+ name="%Option.Posix.Linker.Static"
category="cygwin.linker.category.general"
+ command="-static"
+ valueType="boolean"
+ id="cygwin.gnu.linker.options.noshared">
+ </option>
+ <optionCategory
+ owner="org.eclipse.cdt.build.tool.cygwin.link"
+ name="%OptionCategory.Libs"
+ id="cygwin.gnu.linker.category.libs">
+ </optionCategory>
+ <option
+ name="%Option.Posix.Libs"
+ category="cygwin.gnu.linker.category.libs"
command="-l"
valueType="libs"
id="cygwin.link.libs">
</option>
<option
name="%Option.Posix.Libsearch"
- category="cygwin.linker.category.general"
+ category="cygwin.gnu.linker.category.libs"
command="-L"
valueType="stringList"
id="cygwin.link.ld.paths">
</option>
+ <optionCategory
+ owner="org.eclipse.cdt.build.tool.cygwin.link"
+ name="%OptionCategory.Misc"
+ id="cygwin.gnu.linker.category.other">
+ </optionCategory>
+ <option
+ name="Linker Flags"
+ category="cygwin.gnu.linker.category.other"
+ valueType="string"
+ id="cygwin.link.ld.flags">
+ </option>
+ <option
+ name="%Option.Posix.Linker.XLinker"
+ category="cygwin.gnu.linker.category.other"
+ command="-Xlinker"
+ valueType="stringList"
+ id="cygwin.gnu.linker.options.other">
+ </option>
+ <option
+ name="%Option.Posix.UserObjs"
+ category="cygwin.gnu.linker.category.other"
+ valueType="userObjs"
+ id="cygwin.gnu.link.ld.userobjs">
+ </option>
</tool>
</target>
<target
@@ -490,29 +553,84 @@
<optionCategory
owner="org.eclipse.cdt.build.tool.cygwin.solink"
name="%OptionCategory.General"
- id="cygwin.solink.category.general">
+ id="cygwin.gnu.solink.category.general">
</optionCategory>
<option
- defaultValue=""
- name="Linker Flags"
- category="cygwin.solink.category.general"
- valueType="string"
- id="cygwin.solink.ld.flags">
+ defaultValue="false"
+ name="%Option.Posix.Linker.NoStartFiles"
+ category="cygwin.gnu.solink.category.general"
+ command="-nostartfiles"
+ valueType="boolean"
+ id="linux.gnu.solink.options.nostart">
+ </option>
+ <option
+ defaultValue="false"
+ name="%Option.Posix.Linker.NoDefLibs"
+ category="cygwin.gnu.solink.category.general"
+ command="-nodefaultlibs"
+ valueType="boolean"
+ id="cygwin.gnu.solink.options.nodeflibs">
+ </option>
+ <option
+ defaultValue="false"
+ name="%Option.Posix.Linker.NoStdLibs"
+ category="cygwin.gnu.solink.category.general"
+ command="-nostdlib"
+ valueType="boolean"
+ id="cygwin.gnu.solink.options.nostdlibs">
</option>
<option
+ defaultValue="false"
+ name="%Option.Posix.Linker.Strip"
+ category="cygwin.gnu.solink.category.general"
+ command="-s"
+ valueType="boolean"
+ id="cygwin.gnu.solink.options.strip">
+ </option>
+ <optionCategory
+ owner="org.eclipse.cdt.build.tool.cygwin.solink"
+ name="%OptionCategory.Libs"
+ id="cygwin.gnu.solink.category.libs">
+ </optionCategory>
+ <option
name="%Option.Posix.Libs"
- category="cygwin.solink.category.general"
+ category="cygwin.gnu.solink.category.libs"
command="-l"
valueType="libs"
id="cygwin.solink.libs">
</option>
<option
name="%Option.Posix.Libsearch"
- category="cygwin.solink.category.general"
+ category="cygwin.gnu.solink.category.libs"
command="-L"
valueType="stringList"
id="cygwin.solink.ld.paths">
</option>
+ <optionCategory
+ owner="org.eclipse.cdt.build.tool.cygwin.solink"
+ name="%OptionCategory.Misc"
+ id="cygwin.gnu.solink.category.other">
+ </optionCategory>
+ <option
+ defaultValue=""
+ name="Linker Flags"
+ category="cygwin.gnu.solink.category.other"
+ valueType="string"
+ id="cygwin.solink.ld.flags">
+ </option>
+ <option
+ name="%Option.Posix.Linker.XLinker"
+ category="cygwin.gnu.solink.category.other"
+ command="-Xlinker"
+ valueType="stringList"
+ id="cygwin.gnu.solinker.options.other">
+ </option>
+ <option
+ name="%Option.Posix.UserObjs"
+ category="cygwin.gnu.solink.category.other"
+ valueType="userObjs"
+ id="cygwin.gnu.solink.userobjs">
+ </option>
</tool>
</target>
<target
@@ -1002,7 +1120,7 @@
</optionCategory>
<option
defaultValue="false"
- name="Do not use standard start files (-nostartfiles)"
+ name="%Option.Posix.Linker.NoStartFiles"
category="linux.gnu.linker.category.options"
command="-nostartfiles"
valueType="boolean"
@@ -1010,7 +1128,7 @@
</option>
<option
defaultValue="false"
- name="Do not use default libraries (-nodefaultlibs)"
+ name="%Option.Posix.Linker.NoDefLibs"
category="linux.gnu.linker.category.options"
command="-nodefaultlibs"
valueType="boolean"
@@ -1018,7 +1136,7 @@
</option>
<option
defaultValue="false"
- name="No startup or default libs (-nostdlib)"
+ name="%Option.Posix.Linker.NoStdLibs"
category="linux.gnu.linker.category.options"
command="-nostdlib"
valueType="boolean"
@@ -1026,7 +1144,7 @@
</option>
<option
defaultValue="false"
- name="Remove symbol table (-s)"
+ name="%Option.Posix.Linker.Strip"
category="linux.gnu.linker.category.options"
command="-s"
valueType="boolean"
@@ -1034,31 +1152,18 @@
</option>
<option
defaultValue="false"
- name="No shared libraries (-static)"
+ name="%Option.Posix.Linker.Static"
category="linux.gnu.linker.category.options"
command="-static"
valueType="boolean"
id="linux.gnu.linker.options.noshared">
</option>
- <option
- name="Other options (-Xlinker [option])"
- category="linux.gnu.linker.category.options"
- command="-Xlinker"
- valueType="stringList"
- id="linux.gnu.linker.options.other">
- </option>
<optionCategory
owner="cdt.build.tool.linux.gnu.link"
name="%OptionCategory.Libs"
id="linux.gnu.linker.category.libs">
</optionCategory>
<option
- name="%Option.Posix.Linker.Flags"
- category="linux.gnu.linker.category.libs"
- valueType="string"
- id="linux.gnu.linker.libs.flags">
- </option>
- <option
name="%Option.Posix.Libs"
category="linux.gnu.linker.category.libs"
command="-l"
@@ -1072,6 +1177,30 @@
valueType="stringList"
id="linux.gnu.linker.libs.paths">
</option>
+ <optionCategory
+ owner="cdt.build.tool.linux.gnu.link"
+ name="%OptionCategory.Misc"
+ id="linux.gnu.linker.category.other">
+ </optionCategory>
+ <option
+ name="%Option.Posix.Linker.Flags"
+ category="linux.gnu.linker.category.other"
+ valueType="string"
+ id="linux.gnu.linker.libs.flags">
+ </option>
+ <option
+ name="%Option.Posix.Linker.XLinker"
+ category="linux.gnu.linker.category.other"
+ command="-Xlinker"
+ valueType="stringList"
+ id="linux.gnu.linker.options.other">
+ </option>
+ <option
+ name="%Option.Posix.UserObjs"
+ category="linux.gnu.linker.category.other"
+ valueType="userObjs"
+ id="linux.gnu.linker.userobjs">
+ </option>
</tool>
</target>
<target
@@ -1127,7 +1256,7 @@
</optionCategory>
<option
defaultValue="false"
- name="Do not use standard start files (-nostartfiles)"
+ name="%Option.Posix.Linker.NoStartFiles"
category="linux.gnu.solink.category.options"
command="-nostartfiles"
valueType="boolean"
@@ -1135,7 +1264,7 @@
</option>
<option
defaultValue="false"
- name="Do not use default libraries (-nodefaultlibs)"
+ name="%Option.Posix.Linker.NoDefLibs"
category="linux.gnu.solink.category.options"
command="-nodefaultlibs"
valueType="boolean"
@@ -1143,7 +1272,7 @@
</option>
<option
defaultValue="false"
- name="No startup or default libs (-nostdlib)"
+ name="%Option.Posix.Linker.NoStdLibs"
category="linux.gnu.solink.category.options"
command="-nostdlib"
valueType="boolean"
@@ -1151,47 +1280,18 @@
</option>
<option
defaultValue="false"
- name="Remove symbol table (-s)"
+ name="%Option.Posix.Linker.Strip"
category="linux.gnu.solink.category.options"
command="-s"
valueType="boolean"
id="linux.gnu.solink.options.strip">
</option>
- <option
- defaultValue="false"
- name="No shared libraries (-static)"
- category="linux.gnu.solink.category.options"
- command="-static"
- valueType="boolean"
- id="linux.gnu.solink.options.noshared">
- </option>
- <option
- defaultValue="false"
- name="Bind global symbol references (-symbolic)"
- category="linux.gnu.solink.category.options"
- command="-symbolic"
- valueType="boolean"
- id="linux.gnu.solink.options.symbolic">
- </option>
- <option
- name="Other options (-Xlinker [option])"
- category="linux.gnu.solink.category.options"
- command="-Xlinker"
- valueType="stringList"
- id="linux.gnu.solink.options.other">
- </option>
<optionCategory
owner="cdt.build.tool.linux.gnu.solink"
name="%OptionCategory.Libs"
id="linux.gnu.solink.category.libs">
</optionCategory>
<option
- category="linux.gnu.solink.category.libs"
- name="%Option.Posix.Linker.Flags"
- id="linux.gnu.solink.libs.flags"
- valueType="string">
- </option>
- <option
name="%Option.Posix.Libs"
category="linux.gnu.solink.category.libs"
command="-l"
@@ -1205,6 +1305,30 @@
valueType="stringList"
id="linux.gnu.solink.libs.paths">
</option>
+ <optionCategory
+ owner="cdt.build.tool.linux.gnu.solink"
+ name="%OptionCategory.Misc"
+ id="linux.gnu.solink.category.other">
+ </optionCategory>
+ <option
+ name="%Option.Posix.Linker.Flags"
+ category="linux.gnu.solink.category.other"
+ valueType="string"
+ id="linux.gnu.solink.libs.flags">
+ </option>
+ <option
+ name="%Option.Posix.Linker.XLinker"
+ category="linux.gnu.solink.category.other"
+ command="-Xlinker"
+ valueType="stringList"
+ id="linux.gnu.solink.options.other">
+ </option>
+ <option
+ name="%Option.Posix.UserObjs"
+ category="linux.gnu.solink.category.other"
+ valueType="userObjs"
+ id="linux.gnu.solink.userobjs">
+ </option>
</tool>
</target>
<target
@@ -1601,7 +1725,7 @@
</optionCategory>
<option
defaultValue="false"
- name="Do not use standard start files (-nostartfiles)"
+ name="%Option.Posix.Linker.NoStartFiles"
category="solaris.gnu.linker.category.options"
command="-nostartfiles"
valueType="boolean"
@@ -1609,7 +1733,7 @@
</option>
<option
defaultValue="false"
- name="Do not use default libraries (-nodefaultlibs)"
+ name="%Option.Posix.Linker.NoDefLibs"
category="solaris.gnu.linker.category.options"
command="-nodefaultlibs"
valueType="boolean"
@@ -1617,7 +1741,7 @@
</option>
<option
defaultValue="false"
- name="No startup or default libs (-nostdlib)"
+ name="%Option.Posix.Linker.NoStdLibs"
category="solaris.gnu.linker.category.options"
command="-nostdlib"
valueType="boolean"
@@ -1625,7 +1749,7 @@
</option>
<option
defaultValue="false"
- name="Remove symbol table (-s)"
+ name="%Option.Posix.Linker.Strip"
category="solaris.gnu.linker.category.options"
command="-s"
valueType="boolean"
@@ -1633,31 +1757,18 @@
</option>
<option
defaultValue="false"
- name="No shared libraries (-static)"
+ name="%Option.Posix.Linker.Static"
category="solaris.gnu.linker.category.options"
command="-static"
valueType="boolean"
id="solaris.gnu.linker.options.noshared">
</option>
- <option
- name="Other options (-Xlinker [option])"
- category="solaris.gnu.linker.category.options"
- command="-Xlinker"
- valueType="stringList"
- id="solaris.gnu.linker.options.other">
- </option>
<optionCategory
owner="cdt.build.tool.solaris.gnu.link"
name="%OptionCategory.Libs"
id="solaris.gnu.linker.category.libs">
</optionCategory>
<option
- category="solaris.gnu.linker.category.libs"
- name="%Option.Posix.Linker.Flags"
- id="solaris.gnu.linker.libs.flags"
- valueType="string">
- </option>
- <option
name="%Option.Posix.Libs"
category="solaris.gnu.linker.category.libs"
command="-l"
@@ -1671,6 +1782,30 @@
valueType="stringList"
id="solaris.gnu.linker.libs.paths">
</option>
+ <optionCategory
+ owner="cdt.build.tool.solaris.gnu.link"
+ name="%OptionCategory.Misc"
+ id="solaris.gnu.linker.category.other">
+ </optionCategory>
+ <option
+ name="%Option.Posix.Linker.Flags"
+ category="solaris.gnu.linker.category.other"
+ valueType="string"
+ id="solaris.gnu.linker.libs.flags">
+ </option>
+ <option
+ name="%Option.Posix.Linker.XLinker"
+ category="solaris.gnu.linker.category.other"
+ command="-Xlinker"
+ valueType="stringList"
+ id="solaris.gnu.linker.options.other">
+ </option>
+ <option
+ name="%Option.Posix.UserObjs"
+ category="solaris.gnu.linker.category.other"
+ valueType="userObjs"
+ id="solaris.gnu.linker.userobjs">
+ </option>
</tool>
</target>
<target
@@ -1726,7 +1861,7 @@
</optionCategory>
<option
defaultValue="false"
- name="Do not use standard start files (-nostartfiles)"
+ name="%Option.Posix.Linker.NoStartFiles"
category="solaris.gnu.solink.category.options"
command="-nostartfiles"
valueType="boolean"
@@ -1734,7 +1869,7 @@
</option>
<option
defaultValue="false"
- name="Do not use default libraries (-nodefaultlibs)"
+ name="%Option.Posix.Linker.NoDefLibs"
category="solaris.gnu.solink.category.options"
command="-nodefaultlibs"
valueType="boolean"
@@ -1742,7 +1877,7 @@
</option>
<option
defaultValue="false"
- name="No startup or default libs (-nostdlib)"
+ name="%Option.Posix.Linker.NoStdLibs"
category="solaris.gnu.solink.category.options"
command="-nostdlib"
valueType="boolean"
@@ -1750,47 +1885,18 @@
</option>
<option
defaultValue="false"
- name="Remove symbol table (-s)"
+ name="%Option.Posix.Linker.Strip"
category="solaris.gnu.solink.category.options"
command="-s"
valueType="boolean"
id="solaris.gnu.solink.options.strip">
</option>
- <option
- defaultValue="false"
- name="No shared libraries (-static)"
- category="solaris.gnu.solink.category.options"
- command="-static"
- valueType="boolean"
- id="solaris.gnu.solink.options.noshared">
- </option>
- <option
- defaultValue="false"
- name="Bind global symbol references (-symbolic)"
- category="solaris.gnu.solink.category.options"
- command="-symbolic"
- valueType="boolean"
- id="solaris.gnu.solink.options.symbolic">
- </option>
- <option
- name="Other options (-Xlinker [option])"
- category="solaris.gnu.solink.category.options"
- command="-Xlinker"
- valueType="stringList"
- id="solaris.gnu.solink.options.other">
- </option>
<optionCategory
owner="cdt.build.tool.solaris.gnu.solink"
name="%OptionCategory.Libs"
id="solaris.gnu.solink.category.libs">
</optionCategory>
<option
- name="%Option.Posix.Linker.Flags"
- category="solaris.gnu.solink.category.libs"
- valueType="string"
- id="solaris.gnu.solink.libs.flags">
- </option>
- <option
name="%Option.Posix.Libs"
category="solaris.gnu.solink.category.libs"
command="-l"
@@ -1804,6 +1910,30 @@
valueType="stringList"
id="solaris.gnu.solink.libs.paths">
</option>
+ <optionCategory
+ owner="cdt.build.tool.solaris.gnu.solink"
+ name="%OptionCategory.Misc"
+ id="solaris.gnu.solink.category.other">
+ </optionCategory>
+ <option
+ name="%Option.Posix.Linker.Flags"
+ category="solaris.gnu.solink.category.other"
+ valueType="string"
+ id="solaris.gnu.solink.libs.flags">
+ </option>
+ <option
+ name="%Option.Posix.Linker.XLinker"
+ category="solaris.gnu.solink.category.other"
+ command="-Xlinker"
+ valueType="stringList"
+ id="solaris.gnu.solink.options.other">
+ </option>
+ <option
+ name="%Option.Posix.UserObjs"
+ category="solaris.gnu.solink.category.other"
+ valueType="userObjs"
+ id="solaris.gnu.solink.userobjs">
+ </option>
</tool>
</target>
<target
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/PluginResources.properties b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/PluginResources.properties
index 7bdbcf4b7f3..4f27ef06003 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/PluginResources.properties
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/PluginResources.properties
@@ -51,7 +51,7 @@ BuildPropertyPage.manage.title=Manage
# ----------- New Configuration -----------
NewConfiguration.label.name=Configuration name:
-NewConfiguration.label.copy=Copy settings from:
+NewConfiguration.label.copy=Copy default settings from:
NewConfiguration.error.title=Error
NewConfiguration.error.duplicateName=A configuration named "{0}" already exists.
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildToolSettingsPage.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildToolSettingsPage.java
index c4d4e41b841..ed3fa75a532 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildToolSettingsPage.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildToolSettingsPage.java
@@ -81,6 +81,7 @@ public class BuildToolSettingsPage extends FieldEditorPreferencePage {
case IOption.INCLUDE_PATH :
case IOption.PREPROCESSOR_SYMBOLS :
case IOption.LIBRARIES :
+ case IOption.OBJECTS:
BuildOptionListFieldEditor listField = new BuildOptionListFieldEditor(opt.getId(), opt.getName(), getFieldEditorParent());
addField(listField);
break;
@@ -131,6 +132,7 @@ public class BuildToolSettingsPage extends FieldEditorPreferencePage {
case IOption.INCLUDE_PATH :
case IOption.PREPROCESSOR_SYMBOLS :
case IOption.LIBRARIES :
+ case IOption.OBJECTS:
String listStr = getPreferenceStore().getString(option.getId());
String[] listVal = BuildToolsSettingsStore.parseString(listStr);
ManagedBuildManager.setOption(configuration, option, listVal);
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildToolsSettingsStore.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildToolsSettingsStore.java
index 85ad989c53d..ab25886350b 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildToolsSettingsStore.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildToolsSettingsStore.java
@@ -259,6 +259,14 @@ public class BuildToolsSettingsStore implements IPreferenceStore {
}
getOptionMap().put(name, value);
break;
+ case IOption.OBJECTS :
+ try {
+ value = createList(opt.getUserObjects());
+ } catch (BuildException e) {
+ break;
+ }
+ getOptionMap().put(name, value);
+ break;
default :
break;
}

Back to the top