Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 186204 | Differences between
and this patch

Collapse All | Expand All

(-)src/org/eclipse/pde/internal/ui/build/BuildPluginAction.java (-3 / +4 lines)
Lines 11-21 Link Here
11
package org.eclipse.pde.internal.ui.build;
11
package org.eclipse.pde.internal.ui.build;
12
12
13
import java.lang.reflect.InvocationTargetException;
13
import java.lang.reflect.InvocationTargetException;
14
15
import org.eclipse.core.resources.IProject;
14
import org.eclipse.core.resources.IProject;
16
import org.eclipse.core.runtime.CoreException;
15
import org.eclipse.core.runtime.CoreException;
17
import org.eclipse.core.runtime.IProgressMonitor;
16
import org.eclipse.core.runtime.IProgressMonitor;
18
import org.eclipse.jface.dialogs.MessageDialog;
17
import org.eclipse.jface.dialogs.MessageDialog;
18
import org.eclipse.osgi.service.resolver.BundleDescription;
19
import org.eclipse.pde.core.plugin.IPluginModelBase;
19
import org.eclipse.pde.core.plugin.IPluginModelBase;
20
import org.eclipse.pde.core.plugin.PluginRegistry;
20
import org.eclipse.pde.core.plugin.PluginRegistry;
21
import org.eclipse.pde.internal.build.AbstractScriptGenerator;
21
import org.eclipse.pde.internal.build.AbstractScriptGenerator;
Lines 43-50 Link Here
43
		generator.setStateExtraData(TargetPlatformHelper.getBundleClasspaths(TargetPlatformHelper.getPDEState()), TargetPlatformHelper.getPatchMap(TargetPlatformHelper.getPDEState()));
43
		generator.setStateExtraData(TargetPlatformHelper.getBundleClasspaths(TargetPlatformHelper.getPDEState()), TargetPlatformHelper.getPatchMap(TargetPlatformHelper.getPDEState()));
44
		generator.setBuildingOSGi(true);
44
		generator.setBuildingOSGi(true);
45
		IPluginModelBase model = PluginRegistry.findModel(project);
45
		IPluginModelBase model = PluginRegistry.findModel(project);
46
		if(model != null && model.getPluginBase().getId() != null)
46
		if(model != null && model.getPluginBase().getId() != null) {
47
		{	generator.setElements(new String[] { "plugin@" + model.getPluginBase().getId() }); //$NON-NLS-1$
47
			generator.setBundles(new BundleDescription[] {model.getBundleDescription()});
48
//			generator.setElements(new String[] { "plugin@" + model.getPluginBase().getId() }); //$NON-NLS-1$
48
			generator.generate();
49
			generator.generate();
49
		}
50
		}
50
		else
51
		else

Return to bug 186204