diff options
| author | Pascal Rapicault | 2008-02-28 13:54:01 +0000 |
|---|---|---|
| committer | Pascal Rapicault | 2008-02-28 13:54:01 +0000 |
| commit | 778444a878e703523b0cb7bf55794b5e3f1d7c49 (patch) | |
| tree | 25496d6fc1dfa5adf7bc23e95afb7394bf802c53 /bundles | |
| parent | 212837594a8381863c0c12862d8d06072bee0fcd (diff) | |
| download | rt.equinox.p2-778444a878e703523b0cb7bf55794b5e3f1d7c49.tar.gz rt.equinox.p2-778444a878e703523b0cb7bf55794b5e3f1d7c49.tar.xz rt.equinox.p2-778444a878e703523b0cb7bf55794b5e3f1d7c49.zip | |
Reuse the copy of simpleconfigurator in the configuration being built
Diffstat (limited to 'bundles')
| -rw-r--r-- | bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/Generator.java | 16 |
1 files changed, 12 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 a8587e55f..90d1c3002 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 @@ -838,15 +838,23 @@ public class Generator { if (bundleLocations == null) return new BundleDescription[0]; boolean addSimpleConfigurator = false; + boolean scIn = false; for (int i = 0; i < bundleLocations.length; i++) { - addSimpleConfigurator = bundleLocations[i].toString().indexOf(ORG_ECLIPSE_UPDATE_CONFIGURATOR) > 0; - if (addSimpleConfigurator) - break; + if (!addSimpleConfigurator) + addSimpleConfigurator = bundleLocations[i].toString().indexOf(ORG_ECLIPSE_UPDATE_CONFIGURATOR) > 0; + if (!scIn) { + scIn = bundleLocations[i].toString().indexOf(ORG_ECLIPSE_EQUINOX_SIMPLECONFIGURATOR) > 0; + if (scIn) + break; + } } + if (scIn) + addSimpleConfigurator = false; BundleDescription[] result = new BundleDescription[bundleLocations.length + (addSimpleConfigurator ? 1 : 0)]; BundleDescriptionFactory factory = getBundleFactory(); - for (int i = 0; i < bundleLocations.length; i++) + for (int i = 0; i < bundleLocations.length; i++) { result[i] = factory.getBundleDescription(bundleLocations[i]); + } if (addSimpleConfigurator) { //Add simple configurator to the list of bundles try { |