Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Rennie2011-02-01 11:03:41 -0500
committerMichael Rennie2011-02-01 11:03:41 -0500
commit975d1f16840a2666b5e6215883157c85906b648e (patch)
treecd22213d5a504ea5f24cd04f3d2be6ded1acd8cf
parentd1939c2438ddd5c1977675b425556e324445c6c0 (diff)
downloadeclipse.platform.debug-975d1f16840a2666b5e6215883157c85906b648e.tar.gz
eclipse.platform.debug-975d1f16840a2666b5e6215883157c85906b648e.tar.xz
eclipse.platform.debug-975d1f16840a2666b5e6215883157c85906b648e.zip
Bug 335967 - [launching] [builders] Ant Builder doesn't build with Target set to <default>
-rw-r--r--org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsBuilderTab.java39
-rw-r--r--org.eclipse.ui.externaltools/META-INF/MANIFEST.MF2
2 files changed, 26 insertions, 15 deletions
diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsBuilderTab.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsBuilderTab.java
index 38f59a96c..b96fdc078 100644
--- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsBuilderTab.java
+++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsBuilderTab.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -12,6 +12,9 @@
package org.eclipse.ui.externaltools.internal.launchConfigurations;
+import java.util.HashSet;
+import java.util.Iterator;
+
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IncrementalProjectBuilder;
import org.eclipse.core.resources.ResourcesPlugin;
@@ -408,20 +411,28 @@ public class ExternalToolsBuilderTab extends AbstractLaunchConfigurationTab {
*/
public void performApply(ILaunchConfigurationWorkingCopy configuration) {
if (fCreateBuildScheduleComponent) {
- StringBuffer buffer= new StringBuffer();
- if (afterClean.getSelection()) {
- buffer.append(IExternalToolConstants.BUILD_TYPE_FULL).append(',');
- }
- if (manualBuild.getSelection()){
- buffer.append(IExternalToolConstants.BUILD_TYPE_INCREMENTAL).append(',');
- }
- if (autoBuildButton.getSelection()) {
- buffer.append(IExternalToolConstants.BUILD_TYPE_AUTO).append(',');
- }
-
- if (fDuringClean.getSelection()) {
- buffer.append(IExternalToolConstants.BUILD_TYPE_CLEAN);
+ HashSet kinds = new HashSet(4);
+ if (afterClean.getSelection()) {
+ kinds.add(IExternalToolConstants.BUILD_TYPE_FULL);
+ }
+ if(manualBuild.getSelection()){
+ kinds.add(IExternalToolConstants.BUILD_TYPE_FULL);
+ kinds.add(IExternalToolConstants.BUILD_TYPE_INCREMENTAL);
+ }
+ if (autoBuildButton.getSelection()) {
+ kinds.add(IExternalToolConstants.BUILD_TYPE_AUTO);
+ }
+
+ if (fDuringClean.getSelection()) {
+ kinds.add(IExternalToolConstants.BUILD_TYPE_CLEAN);
}
+ StringBuffer buffer= new StringBuffer();
+ for(Iterator i = kinds.iterator(); i.hasNext();) {
+ buffer.append(i.next());
+ if(i.hasNext()) {
+ buffer.append(',');
+ }
+ }
configuration.setAttribute(IExternalToolConstants.ATTR_RUN_BUILD_KINDS, buffer.toString());
}
if (workingSetButton.getSelection()) {
diff --git a/org.eclipse.ui.externaltools/META-INF/MANIFEST.MF b/org.eclipse.ui.externaltools/META-INF/MANIFEST.MF
index 5dce95ff1..89e0223ee 100644
--- a/org.eclipse.ui.externaltools/META-INF/MANIFEST.MF
+++ b/org.eclipse.ui.externaltools/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Plugin.name
Bundle-SymbolicName: org.eclipse.ui.externaltools; singleton:=true
-Bundle-Version: 3.2.0.qualifier
+Bundle-Version: 3.2.1.qualifier
Bundle-Activator: org.eclipse.ui.externaltools.internal.model.ExternalToolsPlugin
Bundle-Vendor: %Plugin.providerName
Bundle-Localization: plugin

Back to the top