diff options
2 files changed, 6 insertions, 4 deletions
diff --git a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/Generator.java b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/Generator.java index ce62b91b8..64a2e19e4 100644 --- a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/Generator.java +++ b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/Generator.java @@ -358,10 +358,11 @@ public class Generator { IArtifactKey key = MetadataGeneratorHelper.createBundleArtifactKey(bd.getSymbolicName(), bd.getVersion().toString()); IArtifactDescriptor ad = MetadataGeneratorHelper.createArtifactDescriptor(key, new File(bd.getLocation()), true, false); - if (isDir) - publishArtifact(ad, new File(bd.getLocation()).listFiles(), destination, false); + File bundleFile = new File(bd.getLocation()); + if (bundleFile.isDirectory()) + publishArtifact(ad, bundleFile.listFiles(), destination, false); else - publishArtifact(ad, new File[] {new File(bd.getLocation())}, destination, true); + publishArtifact(ad, new File[] {bundleFile}, destination, true); if (info.reuseExistingPack200Files() && !info.publishArtifacts()) { File packFile = new Path(bd.getLocation()).addFileExtension("pack.gz").toFile(); //$NON-NLS-1$ if (packFile.exists()) { diff --git a/org.eclipse.equinox.p2.releng/buildtime-features/org.eclipse.equinox.p2.generator.feature/feature.xml b/org.eclipse.equinox.p2.releng/buildtime-features/org.eclipse.equinox.p2.generator.feature/feature.xml index 613990ec4..79a4c6eef 100644 --- a/org.eclipse.equinox.p2.releng/buildtime-features/org.eclipse.equinox.p2.generator.feature/feature.xml +++ b/org.eclipse.equinox.p2.releng/buildtime-features/org.eclipse.equinox.p2.generator.feature/feature.xml @@ -76,7 +76,8 @@ id="org.eclipse.equinox.p2.metadata.generator" download-size="0" install-size="0" - version="0.0.0"/> + version="0.0.0" + unpack="false"/> <plugin id="org.eclipse.equinox.p2.metadata.repository" |