Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSean Evoy2004-12-07 15:12:00 +0000
committerSean Evoy2004-12-07 15:12:00 +0000
commitbd35367d7c48875b57b6390902e7b72247dcf098 (patch)
treeac0c9e87f96b77022c6ba2379c14db7331826fcf /build/org.eclipse.cdt.managedbuilder.ui/src
parent02ba697651ef3a199d9d96f8b07ebcf439d33822 (diff)
downloadorg.eclipse.cdt-bd35367d7c48875b57b6390902e7b72247dcf098.tar.gz
org.eclipse.cdt-bd35367d7c48875b57b6390902e7b72247dcf098.tar.xz
org.eclipse.cdt-bd35367d7c48875b57b6390902e7b72247dcf098.zip
Commit for Leo Treggiari:
44568 - [Managed Build] -Xlinker option requires space separator 80119 - [Managed Build] Error in the Xlinker option's generated output The code and the manifest file have been changed to correctly deal with the -Xlinker option. Multiple entries have separate -Xlinker options, and there is a space between -Xlinker and the value. The space is handled by the new option.command functionality - "${VALUE}". 77399 - Managed Make Builder mangles subdir.mk if configuration of linked resource was changed This was partially fixed before and was partially a user error. Code has been added to output an error message to the console when MBS sees a duplicate identifier in the loaded manifest files. Partial fix: 80067 - [Managed Build] Wrong command for building in MMS A fix has been added so that a command is not stored with a Tool unless the user changes the value - i.e the Tool will inherit the value from its suoer-class. There is still an error with the Gnu makefile generator when a configuration tool and a resource configuration tool have different commands specified by the user. This will be fixed later.
Diffstat (limited to 'build/org.eclipse.cdt.managedbuilder.ui/src')
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildToolSettingsPage.java27
1 files changed, 15 insertions, 12 deletions
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 091f0c8b25..dc939ff005 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
@@ -174,12 +174,16 @@ public class BuildToolSettingsPage extends BuildSettingsPage {
}
/**
- * Look for $(VALUE) in the command string
+ * Look for ${VALUE} in the command string
*/
private String evaluateCommand( String command, String values ) {
if( command == null ) return values.trim();
- if( command.indexOf( "$(" ) > 0 ) return command.replaceAll( "\\$\\([value|Value|VALUE]\\)", values.trim() ).trim(); //$NON-NLS-1$ //$NON-NLS-2$
- else return (new String(command + values)).trim();
+ if( command.indexOf( "${" ) >= 0 ) { //$NON-NLS-1$
+ return command.replaceAll( "\\$\\{[vV][aA][lL][uU][eE]\\}", values.trim() ).trim(); //$NON-NLS-1$
+ }
+ else {
+ return (new String(command + values)).trim();
+ }
}
/**
@@ -544,17 +548,16 @@ public class BuildToolSettingsPage extends BuildSettingsPage {
} catch (BuildException e) {}
}
+ // Save the tool command if it has changed
// Get the actual value out of the field editor
String command = getToolSettingsPreferenceStore().getString(tool.getId());
- if (command.length() == 0) {
- return result;
- }
-
- // Ask the build system manager to change the tool command
- if ( isItResourceConfigPage ) {
- ManagedBuildManager.setToolCommand(resConfig, tool, command);
- } else {
- ManagedBuildManager.setToolCommand(configuration, tool, command);
+ if (command.length() > 0 &&
+ (!command.equals(tool.getToolCommand()))) {
+ if ( isItResourceConfigPage ) {
+ ManagedBuildManager.setToolCommand(resConfig, tool, command);
+ } else {
+ ManagedBuildManager.setToolCommand(configuration, tool, command);
+ }
}
return result;

Back to the top