Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MacOS AArch64 launcher is its own fragment now. #1429

Merged
merged 1 commit into from
Oct 3, 2024
Merged

MacOS AArch64 launcher is its own fragment now. #1429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/FeatureGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2006, 2021 IBM Corporation and others.
* Copyright (c) 2006, 2024 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
Expand Down Expand Up @@ -347,11 +347,7 @@ private void addLauncher(PDEState state, Set<Entry> plugins, Set<Entry> fragment
// only include the fragments for the platforms we are attempting to build, since the others
// probably aren't around
for (Config config : configs) {
String fragment = BUNDLE_EQUINOX_LAUNCHER + '.' + config.getWs() + '.' + config.getOs();
//macosx doesn't have the arch on its fragment
if (config.getOs().compareToIgnoreCase("macosx") != 0 || config.getArch().equals("x86_64")) {//$NON-NLS-1$ //$NON-NLS-2$
fragment += '.' + config.getArch();
}
String fragment = BUNDLE_EQUINOX_LAUNCHER + '.' + config.getWs() + '.' + config.getOs() + '.' + config.getArch();
if (!contains(fragments, fragment)) {
Entry entry = new Entry(fragment);
entry.addAttribute("unpack", "true"); //$NON-NLS-1$//$NON-NLS-2$
Expand Down
6 changes: 2 additions & 4 deletions build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ProductGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2006, 2021 IBM Corporation and others.
* Copyright (c) 2006, 2024 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
Expand Down Expand Up @@ -279,9 +279,7 @@ private void generateP2InfCUs(StringBuffer buffer, int startIndex, boolean cus,
for (Config config : configs) {
if (config.equals(Config.genericConfig()))
continue;
String fragmentName = BUNDLE_EQUINOX_LAUNCHER + '.' + config.getWs() + '.' + config.getOs();
if (config.getOs().compareToIgnoreCase("macosx") != 0 || config.getArch().equals("x86_64")) //$NON-NLS-1$ //$NON-NLS-2$
fragmentName += '.' + config.getArch();
String fragmentName = BUNDLE_EQUINOX_LAUNCHER + '.' + config.getWs() + '.' + config.getOs() + '.' + config.getArch();
BundleDescription fragment = assembly.getPlugin(fragmentName, null);
if (fragment != null) {
VersionRange fragmentRange = Utils.createExactVersionRange(fragment.getVersion());
Expand Down
Loading