*** empty log message ***
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/build/BuildFeatureAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/build/BuildFeatureAction.java
index 7583d2f..25c6927 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/build/BuildFeatureAction.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/build/BuildFeatureAction.java
@@ -54,8 +54,8 @@
String url = ClasspathHelper.getDevEntriesProperties(fManifestFile.getProject().getLocation().addTrailingSeparator().toString() + "dev.properties", false); //$NON-NLS-1$
generator.setDevEntries(url);
generator.setWorkingDirectory(fManifestFile.getProject().getLocation().toOSString());
- AbstractScriptGenerator.setOutputFormat(AbstractScriptGenerator.getDefaultOutputFormat());
- AbstractScriptGenerator.setConfigInfo(AbstractScriptGenerator.getDefaultConfigInfos());
+ AbstractScriptGenerator.setConfigInfo(AbstractScriptGenerator.getDefaultConfigInfos()); //This needs to be set before we set the format
+ generator.setArchivesFormat(AbstractScriptGenerator.getDefaultConfigInfos() + '-' + IXMLConstants.FORMAT_ANTZIP);
generator.setElements(new String[] { "feature@" + model.getFeature().getId() + (model.getFeature().getVersion() == null ? "" : ":" + model.getFeature().getVersion()) }); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
generator.setPluginPath(all);
generator.setGenerateAssembleScript(false);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/build/BuildPluginAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/build/BuildPluginAction.java
index a6d685c..d4330ce 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/build/BuildPluginAction.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/build/BuildPluginAction.java
@@ -26,7 +26,6 @@
throws InvocationTargetException, CoreException {
ModelBuildScriptGenerator generator = new ModelBuildScriptGenerator();
- ModelBuildScriptGenerator.setOutputFormat(AbstractScriptGenerator.getDefaultOutputFormat());
ModelBuildScriptGenerator.setEmbeddedSource(AbstractScriptGenerator.getDefaultEmbeddedSource());
ModelBuildScriptGenerator.setForceUpdateJar(AbstractScriptGenerator.getForceUpdateJarFormat());
ModelBuildScriptGenerator.setConfigInfo(AbstractScriptGenerator.getDefaultConfigInfos());
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/FeatureExportJob.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/FeatureExportJob.java
index aabad1e..d19613b 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/FeatureExportJob.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/FeatureExportJob.java
@@ -310,16 +310,16 @@
generator.setIgnoreMissingPropertiesFile(true);
generator.setSignJars(fSigningInfo != null);
generator.setGenerateJnlp(fJnlpInfo != null);
+ String config = os + ',' + ws + ',' + arch;
+ AbstractScriptGenerator.setConfigInfo(config); //This needs to be set before we set the format
String format;
if (fExportToDirectory)
- format = "folder"; //$NON-NLS-1$
+ format = config + '-' + IXMLConstants.FORMAT_FOLDER;
else
- format = "antZip"; //$NON-NLS-1$
-
- AbstractScriptGenerator.setOutputFormat(format);
+ format = config + '-' + IXMLConstants.FORMAT_ANTZIP;
+ generator.setArchivesFormat(format);
AbstractScriptGenerator.setForceUpdateJar(false);
AbstractScriptGenerator.setEmbeddedSource(fExportSource);
- AbstractScriptGenerator.setConfigInfo(os + "," + ws + "," + arch); //$NON-NLS-1$ //$NON-NLS-2$
generator.generate();
}
