### Eclipse Workspace Patch 1.0
#P org.eclipse.pde.core
Index: src/org/eclipse/pde/internal/core/exports/FeatureExportOperation.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/exports/FeatureExportOperation.java,v
retrieving revision 1.11
diff -u -r1.11 FeatureExportOperation.java
--- src/org/eclipse/pde/internal/core/exports/FeatureExportOperation.java	5 Feb 2008 22:11:23 -0000	1.11
+++ src/org/eclipse/pde/internal/core/exports/FeatureExportOperation.java	11 Apr 2008 18:24:18 -0000
@@ -172,6 +172,7 @@
 			runScript(getAssemblyScriptName(featureID, os, ws, arch, featureLocation), new String[] {"main"}, //$NON-NLS-1$
 					properties, new SubProgressMonitor(monitor, 2));
 			runScript(getPackagerScriptName(featureID, os, ws, arch, featureLocation), null, properties, new SubProgressMonitor(monitor, 2));
+			runScript(getPackagerAllScriptName(featureID, featureLocation), new String[] {IXMLConstants.TARGET_P2_METADATA}, properties, new SubProgressMonitor(monitor, 2));
 			properties.put("destination.temp.folder", fBuildTempLocation + "/pde.logs"); //$NON-NLS-1$ //$NON-NLS-2$
 			runScript(getBuildScriptName(featureLocation), new String[] {"gather.logs"}, properties, new SubProgressMonitor(monitor, 2)); //$NON-NLS-1$
 		} finally {
@@ -249,6 +250,16 @@
 		return new String[] {"build.jars"}; //$NON-NLS-1$ 
 	}
 
+	/**
+	 * Execute the script at the given location.
+	 * 
+	 * @param location the script to run
+	 * @param targets the targets in the script to run, use <code>null</code> to run all
+	 * @param properties map of user properties
+	 * @param monitor progress monitor
+	 * @throws InvocationTargetException
+	 * @throws CoreException
+	 */
 	protected void runScript(String location, String[] targets, Map properties, IProgressMonitor monitor) throws InvocationTargetException, CoreException {
 		AntRunner runner = new AntRunner();
 		runner.addUserProperties(properties);
@@ -287,6 +298,12 @@
 				+ ".xml"; //$NON-NLS-1$
 	}
 
+	protected String getPackagerAllScriptName(String featureID, String featureLocation) {
+		return featureLocation + IPath.SEPARATOR + "package." //$NON-NLS-1$
+				+ featureID + ".all" //$NON-NLS-1$
+				+ ".xml"; //$NON-NLS-1$
+	}
+
 	protected HashMap createAntBuildProperties(String os, String ws, String arch) {
 		if (fAntBuildProperties == null) {
 			fAntBuildProperties = new HashMap(15);
@@ -357,7 +374,6 @@
 			fAntBuildProperties.put(IXMLConstants.PROPERTY_TAR_ARGS, ""); //$NON-NLS-1$
 
 			// P2 Build Properties
-			// TODO update this stuff
 			if (fInfo.toDirectory) {
 				fAntBuildProperties.put("generate.p2.metadata", "true"); //$NON-NLS-1$ //$NON-NLS-2$
 				fAntBuildProperties.put("p2.flavor", "tooling"); //$NON-NLS-1$ //$NON-NLS-2$