diff options
| author | Sravan Kumar Lakkimsetti | 2021-02-05 12:09:51 +0000 |
|---|---|---|
| committer | Sravan Kumar Lakkimsetti | 2021-02-05 12:31:23 +0000 |
| commit | 6ba13815300b3527f1d87536b66f9953dd946954 (patch) | |
| tree | 64060ca3370de963b9660a5c6b1d4e9485f7112c | |
| parent | c4f1aa453a0100b7ac75c86f4deffa0a0eb2df3a (diff) | |
| download | rt.equinox.p2-6ba13815300b3527f1d87536b66f9953dd946954.tar.gz rt.equinox.p2-6ba13815300b3527f1d87536b66f9953dd946954.tar.xz rt.equinox.p2-6ba13815300b3527f1d87536b66f9953dd946954.zip | |
Bug 570960 - Generate IU for launcher with machine architecture on MacY20210205-1200I20210208-1800I20210207-1800I20210206-1800I20210206-0720I20210206-0050I20210205-1800
Change-Id: Iba89254a445fa4cbabbbd8f0682d482c5b3ef9ac
Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
3 files changed, 3 insertions, 9 deletions
diff --git a/bundles/org.eclipse.equinox.p2.publisher.eclipse/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.publisher.eclipse/META-INF/MANIFEST.MF index 41619bd23..f0ca32b78 100644 --- a/bundles/org.eclipse.equinox.p2.publisher.eclipse/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.publisher.eclipse/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %bundleName Bundle-SymbolicName: org.eclipse.equinox.p2.publisher.eclipse;singleton:=true -Bundle-Version: 1.3.700.qualifier +Bundle-Version: 1.3.800.qualifier Bundle-Activator: org.eclipse.pde.internal.publishing.Activator Bundle-ActivationPolicy: lazy Bundle-Vendor: %providerName diff --git a/bundles/org.eclipse.equinox.p2.publisher.eclipse/pom.xml b/bundles/org.eclipse.equinox.p2.publisher.eclipse/pom.xml index 76ab29a45..98319e5aa 100644 --- a/bundles/org.eclipse.equinox.p2.publisher.eclipse/pom.xml +++ b/bundles/org.eclipse.equinox.p2.publisher.eclipse/pom.xml @@ -10,6 +10,6 @@ <groupId>org.eclipse.equinox</groupId> <artifactId>org.eclipse.equinox.p2.publisher.eclipse</artifactId> - <version>1.3.700-SNAPSHOT</version> + <version>1.3.800-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/EquinoxLauncherCUAction.java b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/EquinoxLauncherCUAction.java index 0d15c6408..1c22d094e 100644 --- a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/EquinoxLauncherCUAction.java +++ b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/EquinoxLauncherCUAction.java @@ -24,7 +24,6 @@ import org.eclipse.equinox.p2.metadata.Version; import org.eclipse.equinox.p2.metadata.expression.IMatchExpression; import org.eclipse.equinox.p2.publisher.*; import org.eclipse.equinox.p2.publisher.actions.IVersionAdvice; -import org.eclipse.osgi.service.environment.Constants; /** * Create CUs for all Equinox launcher related IUs for the given set of configurations @@ -63,12 +62,7 @@ public class EquinoxLauncherCUAction extends AbstractPublisherAction { for (String configSpec : configSpecs) { String[] specs = Utils.getTokens(configSpec, "."); //$NON-NLS-1$ if (specs.length > 0 && !AbstractPublisherAction.CONFIG_ANY.equalsIgnoreCase(specs[0])) { - if (specs.length > 2 && Constants.OS_MACOSX.equals(specs[1]) && !Constants.ARCH_X86_64.equals(specs[2])) { - //launcher fragment for mac only has arch for x86_64 - id = ORG_ECLIPSE_EQUINOX_LAUNCHER + '.' + specs[0] + '.' + specs[1]; - } else { - id = ORG_ECLIPSE_EQUINOX_LAUNCHER + '.' + configSpec; - } + id = ORG_ECLIPSE_EQUINOX_LAUNCHER + '.' + configSpec; publishCU(id, configSpec, results); } } |