diff options
| author | Lakshmi Shanmugam | 2021-04-21 22:43:32 +0000 |
|---|---|---|
| committer | Thomas Watson | 2021-04-27 20:01:44 +0000 |
| commit | 49f17862d789ecaf98b712fd509f1a157d4fdb58 (patch) | |
| tree | a691909f7aea05a7dae2a32f21607c0fe151914d | |
| parent | fe7c590145edab0f74a395ac26b3ee36fa5ac174 (diff) | |
| download | rt.equinox.framework-49f17862d789ecaf98b712fd509f1a157d4fdb58.tar.gz rt.equinox.framework-49f17862d789ecaf98b712fd509f1a157d4fdb58.tar.xz rt.equinox.framework-49f17862d789ecaf98b712fd509f1a157d4fdb58.zip | |
Bug 572799 - Replace arm64 with aarch64I20210428-1800I20210428-0330I20210428-0040I20210427-1800
Replace occurrences of arm64 with aarch64 in fragment and arch name.
build.sh changes:
Use -arch arm64 for building as aarch64 gives invalid arch name error,
set DEFAULT_OS_ARCH to aarch64
Change-Id: Ie724754dba974e157031682cac25f9f2c833b286
Reviewed-on: https://git.eclipse.org/r/c/equinox/rt.equinox.framework/+/179845
Tested-by: Thomas Watson <tjwatson@us.ibm.com>
Reviewed-by: Thomas Watson <tjwatson@us.ibm.com>
21 files changed, 35 insertions, 32 deletions
diff --git a/bundles/org.eclipse.equinox.launcher.cocoa.macosx.arm64/.project b/bundles/org.eclipse.equinox.launcher.cocoa.macosx.aarch64/.project index 5efe02e83..3adb2902b 100644 --- a/bundles/org.eclipse.equinox.launcher.cocoa.macosx.arm64/.project +++ b/bundles/org.eclipse.equinox.launcher.cocoa.macosx.aarch64/.project @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>org.eclipse.equinox.launcher.cocoa.macosx.arm64</name> + <name>org.eclipse.equinox.launcher.cocoa.macosx.aarch64</name> <comment></comment> <projects> </projects> diff --git a/bundles/org.eclipse.equinox.launcher.cocoa.macosx.arm64/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.launcher.cocoa.macosx.aarch64/META-INF/MANIFEST.MF index 0f1ab5903..9507c59e3 100644 --- a/bundles/org.eclipse.equinox.launcher.cocoa.macosx.arm64/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.launcher.cocoa.macosx.aarch64/META-INF/MANIFEST.MF @@ -2,9 +2,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-Vendor: %providerName -Bundle-SymbolicName: org.eclipse.equinox.launcher.cocoa.macosx.arm64;singleton:=true +Bundle-SymbolicName: org.eclipse.equinox.launcher.cocoa.macosx.aarch64;singleton:=true Bundle-Version: 1.2.200.qualifier Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.5.0,1.7.0)" -Eclipse-PlatformFilter: (& (osgi.ws=cocoa) (osgi.os=macosx) (osgi.arch=arm64) ) -Bundle-Localization: launcher.cocoa.macosx.arm64 +Eclipse-PlatformFilter: (& (osgi.ws=cocoa) (osgi.os=macosx) (osgi.arch=aarch64) ) +Bundle-Localization: launcher.cocoa.macosx.aarch64 Eclipse-BundleShape: dir diff --git a/bundles/org.eclipse.equinox.launcher.cocoa.macosx.arm64/about.html b/bundles/org.eclipse.equinox.launcher.cocoa.macosx.aarch64/about.html index 164f781a8..164f781a8 100644 --- a/bundles/org.eclipse.equinox.launcher.cocoa.macosx.arm64/about.html +++ b/bundles/org.eclipse.equinox.launcher.cocoa.macosx.aarch64/about.html diff --git a/bundles/org.eclipse.equinox.launcher.cocoa.macosx.arm64/build.properties b/bundles/org.eclipse.equinox.launcher.cocoa.macosx.aarch64/build.properties index ab3f6567f..27c538b1b 100644 --- a/bundles/org.eclipse.equinox.launcher.cocoa.macosx.arm64/build.properties +++ b/bundles/org.eclipse.equinox.launcher.cocoa.macosx.aarch64/build.properties @@ -12,7 +12,7 @@ # IBM Corporation - initial API and implementation ############################################################################### bin.includes = META-INF/,\ - launcher.cocoa.macosx.arm64.properties,\ + launcher.cocoa.macosx.aarch64.properties,\ about.html customBuildCallbacks=customBuildCallbacks.xml diff --git a/bundles/org.eclipse.equinox.launcher.cocoa.macosx.arm64/customBuildCallbacks.xml b/bundles/org.eclipse.equinox.launcher.cocoa.macosx.aarch64/customBuildCallbacks.xml index 3773f016f..3773f016f 100644 --- a/bundles/org.eclipse.equinox.launcher.cocoa.macosx.arm64/customBuildCallbacks.xml +++ b/bundles/org.eclipse.equinox.launcher.cocoa.macosx.aarch64/customBuildCallbacks.xml diff --git a/bundles/org.eclipse.equinox.launcher.cocoa.macosx.arm64/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.launcher.cocoa.macosx.aarch64/forceQualifierUpdate.txt index 9d4f218a3..9d4f218a3 100644 --- a/bundles/org.eclipse.equinox.launcher.cocoa.macosx.arm64/forceQualifierUpdate.txt +++ b/bundles/org.eclipse.equinox.launcher.cocoa.macosx.aarch64/forceQualifierUpdate.txt diff --git a/bundles/org.eclipse.equinox.launcher.cocoa.macosx.arm64/launcher.cocoa.macosx.arm64.properties b/bundles/org.eclipse.equinox.launcher.cocoa.macosx.aarch64/launcher.cocoa.macosx.aarch64.properties index 8db0544da..c13c830c6 100644 --- a/bundles/org.eclipse.equinox.launcher.cocoa.macosx.arm64/launcher.cocoa.macosx.arm64.properties +++ b/bundles/org.eclipse.equinox.launcher.cocoa.macosx.aarch64/launcher.cocoa.macosx.aarch64.properties @@ -11,5 +11,5 @@ # Contributors: # IBM Corporation - initial API and implementation ############################################################################### -pluginName = Equinox Launcher MacOSX Cocoa ARM64 Fragment +pluginName = Equinox Launcher MacOSX Cocoa AARCH64/ARM64 Fragment providerName = Eclipse.org - Equinox diff --git a/bundles/org.eclipse.equinox.launcher.cocoa.macosx.arm64/pom.xml b/bundles/org.eclipse.equinox.launcher.cocoa.macosx.aarch64/pom.xml index 44752128c..f014d73e0 100644 --- a/bundles/org.eclipse.equinox.launcher.cocoa.macosx.arm64/pom.xml +++ b/bundles/org.eclipse.equinox.launcher.cocoa.macosx.aarch64/pom.xml @@ -18,14 +18,14 @@ <relativePath>../../launcher-binary-parent</relativePath> </parent> <groupId>org.eclipse.equinox</groupId> - <artifactId>org.eclipse.equinox.launcher.cocoa.macosx.arm64</artifactId> + <artifactId>org.eclipse.equinox.launcher.cocoa.macosx.aarch64</artifactId> <version>1.2.200-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <properties> <os>macosx</os> <ws>cocoa</ws> - <arch>arm64</arch> + <arch>aarch64</arch> <skipAPIAnalysis>true</skipAPIAnalysis> </properties> diff --git a/bundles/org.eclipse.equinox.launcher.cocoa.macosx/.project b/bundles/org.eclipse.equinox.launcher.cocoa.macosx/.project index 5efe02e83..3adb2902b 100644 --- a/bundles/org.eclipse.equinox.launcher.cocoa.macosx/.project +++ b/bundles/org.eclipse.equinox.launcher.cocoa.macosx/.project @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>org.eclipse.equinox.launcher.cocoa.macosx.arm64</name> + <name>org.eclipse.equinox.launcher.cocoa.macosx.aarch64</name> <comment></comment> <projects> </projects> diff --git a/bundles/org.eclipse.equinox.launcher.cocoa.macosx/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.launcher.cocoa.macosx/META-INF/MANIFEST.MF index 6b44c855c..d5c7fa0b3 100644 --- a/bundles/org.eclipse.equinox.launcher.cocoa.macosx/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.launcher.cocoa.macosx/META-INF/MANIFEST.MF @@ -5,6 +5,6 @@ Bundle-Vendor: %providerName Bundle-SymbolicName: org.eclipse.equinox.launcher.cocoa.macosx;singleton:=true Bundle-Version: 1.2.200.qualifier Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.5.0,1.7.0)" -Eclipse-PlatformFilter: (& (osgi.ws=cocoa) (osgi.os=macosx) (osgi.arch=arm64) ) -Bundle-Localization: launcher.cocoa.macosx.arm64 +Eclipse-PlatformFilter: (& (osgi.ws=cocoa) (osgi.os=macosx) (osgi.arch=aarch64) ) +Bundle-Localization: launcher.cocoa.macosx.aarch64 Eclipse-BundleShape: dir diff --git a/bundles/org.eclipse.equinox.launcher.cocoa.macosx/build.properties b/bundles/org.eclipse.equinox.launcher.cocoa.macosx/build.properties index ab3f6567f..27c538b1b 100644 --- a/bundles/org.eclipse.equinox.launcher.cocoa.macosx/build.properties +++ b/bundles/org.eclipse.equinox.launcher.cocoa.macosx/build.properties @@ -12,7 +12,7 @@ # IBM Corporation - initial API and implementation ############################################################################### bin.includes = META-INF/,\ - launcher.cocoa.macosx.arm64.properties,\ + launcher.cocoa.macosx.aarch64.properties,\ about.html customBuildCallbacks=customBuildCallbacks.xml diff --git a/bundles/org.eclipse.equinox.launcher.cocoa.macosx/launcher.cocoa.macosx.arm64.properties b/bundles/org.eclipse.equinox.launcher.cocoa.macosx/launcher.cocoa.macosx.aarch64.properties index 8db0544da..c13c830c6 100644 --- a/bundles/org.eclipse.equinox.launcher.cocoa.macosx/launcher.cocoa.macosx.arm64.properties +++ b/bundles/org.eclipse.equinox.launcher.cocoa.macosx/launcher.cocoa.macosx.aarch64.properties @@ -11,5 +11,5 @@ # Contributors: # IBM Corporation - initial API and implementation ############################################################################### -pluginName = Equinox Launcher MacOSX Cocoa ARM64 Fragment +pluginName = Equinox Launcher MacOSX Cocoa AARCH64/ARM64 Fragment providerName = Eclipse.org - Equinox diff --git a/bundles/org.eclipse.equinox.launcher.cocoa.macosx/pom.xml b/bundles/org.eclipse.equinox.launcher.cocoa.macosx/pom.xml index 27e7b82fa..91cfc8ec7 100644 --- a/bundles/org.eclipse.equinox.launcher.cocoa.macosx/pom.xml +++ b/bundles/org.eclipse.equinox.launcher.cocoa.macosx/pom.xml @@ -25,7 +25,7 @@ <properties> <os>macosx</os> <ws>cocoa</ws> - <arch>arm64</arch> + <arch>aarch64</arch> <skipAPIAnalysis>true</skipAPIAnalysis> </properties> diff --git a/features/org.eclipse.equinox.executable.feature/bin/cocoa/macosx/arm64/Eclipse.app/Contents/Info.plist b/features/org.eclipse.equinox.executable.feature/bin/cocoa/macosx/aarch64/Eclipse.app/Contents/Info.plist index 9e82bca38..9e82bca38 100644 --- a/features/org.eclipse.equinox.executable.feature/bin/cocoa/macosx/arm64/Eclipse.app/Contents/Info.plist +++ b/features/org.eclipse.equinox.executable.feature/bin/cocoa/macosx/aarch64/Eclipse.app/Contents/Info.plist diff --git a/features/org.eclipse.equinox.executable.feature/build.properties b/features/org.eclipse.equinox.executable.feature/build.properties index cee61174f..2ab3c26d5 100644 --- a/features/org.eclipse.equinox.executable.feature/build.properties +++ b/features/org.eclipse.equinox.executable.feature/build.properties @@ -33,8 +33,8 @@ root.linux.gtk.aarch64.permissions.755=launcher root.macosx.cocoa.x86_64=bin/cocoa/macosx/x86_64 root.macosx.cocoa.x86_64.permissions.755=Eclipse.app/Contents/MacOS/launcher -root.macosx.cocoa.arm64=bin/cocoa/macosx/arm64 -root.macosx.cocoa.arm64.permissions.755=Eclipse.app/Contents/MacOS/launcher +root.macosx.cocoa.aarch64=bin/cocoa/macosx/aarch64 +root.macosx.cocoa.aarch64.permissions.755=Eclipse.app/Contents/MacOS/launcher root.linux.gtk.x86_64=bin/gtk/linux/x86_64,gtk_root root.linux.gtk.x86_64.permissions.755=libcairo-swt.so diff --git a/features/org.eclipse.equinox.executable.feature/feature.xml b/features/org.eclipse.equinox.executable.feature/feature.xml index 3d4b3ec7c..d33185405 100755 --- a/features/org.eclipse.equinox.executable.feature/feature.xml +++ b/features/org.eclipse.equinox.executable.feature/feature.xml @@ -33,10 +33,10 @@ fragment="true"/> <plugin - id="org.eclipse.equinox.launcher.cocoa.macosx.arm64" + id="org.eclipse.equinox.launcher.cocoa.macosx.aarch64" os="macosx" ws="cocoa" - arch="arm64" + arch="aarch64" download-size="0" install-size="0" version="0.0.0" @@ -46,7 +46,7 @@ id="org.eclipse.equinox.launcher.cocoa.macosx" os="macosx" ws="cocoa" - arch="arm64" + arch="aarch64" download-size="0" install-size="0" version="0.0.0" diff --git a/features/org.eclipse.equinox.executable.feature/library/cocoa/build.sh b/features/org.eclipse.equinox.executable.feature/library/cocoa/build.sh index f049eec87..cba8a60f3 100755 --- a/features/org.eclipse.equinox.executable.feature/library/cocoa/build.sh +++ b/features/org.eclipse.equinox.executable.feature/library/cocoa/build.sh @@ -60,18 +60,21 @@ echo "build $defaultOSArch" # Set up environment variables needed by the makefiles. PROGRAM_OUTPUT="$programOutput" DEFAULT_OS="$defaultOS" -DEFAULT_OS_ARCH="$defaultOSArch" DEFAULT_WS="$defaultWS" DEPLOYMENT_TARGET=10.10 EXEC_DIR=../../../../../rt.equinox.binaries/org.eclipse.equinox.executable -PROGRAM_OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch/Eclipse.app/Contents/MacOS" -if [ "$defaultOSArch" == "arm64" ] +if [ "$defaultOSArch" == "arm64" ] || [ "$defaultOSArch" == "aarch64" ] then SDKROOT_PATH="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk" + DEFAULT_OS_ARCH="aarch64" + defaultOSArch="arm64" else SDKROOT_PATH="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk" + DEFAULT_OS_ARCH="$defaultOSArch" fi +PROGRAM_OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$DEFAULT_OS_ARCH/Eclipse.app/Contents/MacOS" + # /System/Library/Frameworks/JavaVM.framework/Headers does not exist anymore on Yosemite if [ -e /System/Library/Frameworks/JavaVM.framework/Headers ]; then JAVA_HEADERS="-I/System/Library/Frameworks/JavaVM.framework/Headers" diff --git a/features/org.eclipse.equinox.executable.feature/pom.xml b/features/org.eclipse.equinox.executable.feature/pom.xml index e41627513..e12604d20 100644 --- a/features/org.eclipse.equinox.executable.feature/pom.xml +++ b/features/org.eclipse.equinox.executable.feature/pom.xml @@ -123,7 +123,7 @@ <copy todir="bin" verbose="true" includeEmptyDirs="false" failonerror="true"> <fileset dir="${rt.equinox.binaries.loc}/org.eclipse.equinox.executable/bin/"> <include name="cocoa/macosx/x86_64/**/*"/> - <include name="cocoa/macosx/arm64/**/*"/> + <include name="cocoa/macosx/aarch64/**/*"/> <include name="gtk/linux/ppc64le/**/*"/> <include name="gtk/linux/aarch64/**/*"/> <include name="gtk/linux/x86_64/**/*"/> diff --git a/features/org.eclipse.equinox.executable.feature/resources/build.properties b/features/org.eclipse.equinox.executable.feature/resources/build.properties index aa8ac04ae..44f1fcca9 100644 --- a/features/org.eclipse.equinox.executable.feature/resources/build.properties +++ b/features/org.eclipse.equinox.executable.feature/resources/build.properties @@ -26,8 +26,8 @@ root.linux.gtk.ppc64le.permissions.755=launcher root.macosx.cocoa.x86_64=bin/cocoa/macosx/x86_64 root.macosx.cocoa.x86_64.permissions.755=Contents/MacOS/${launcherName} -root.macosx.cocoa.arm64=bin/cocoa/macosx/arm64 -root.macosx.cocoa.arm64.permissions.755=Contents/MacOS/${launcherName} +root.macosx.cocoa.aarch64=bin/cocoa/macosx/aarch64 +root.macosx.cocoa.aarch64.permissions.755=Contents/MacOS/${launcherName} root.linux.gtk.x86_64=bin/gtk/linux/x86_64,gtk_root root.linux.gtk.x86_64.permissions.755=libcairo-swt.so diff --git a/features/org.eclipse.equinox.executable.feature/resources/build.xml b/features/org.eclipse.equinox.executable.feature/resources/build.xml index 5c7055dde..fa0a16cb1 100644 --- a/features/org.eclipse.equinox.executable.feature/resources/build.xml +++ b/features/org.eclipse.equinox.executable.feature/resources/build.xml @@ -76,13 +76,13 @@ <chmod perm="755" dir="${feature.base}/macosx.cocoa.x86_64/${collectingFolder}" includes="${launcherName}" /> <chmod perm="755" dir="${feature.base}/macosx.cocoa.x86_64/${collectingFolder}" includes="Eclipse.app/Contents/MacOS/launcher" /> </target> - <target name="rootFilesmacosx_cocoa_arm64"> - <mkdir dir="${feature.base}/macosx.cocoa.arm64/${collectingFolder}"/> - <copy todir="${feature.base}/macosx.cocoa.arm64/${collectingFolder}" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/bin/cocoa/macosx/arm64" includes="**" /> + <target name="rootFilesmacosx_cocoa_aarch64"> + <mkdir dir="${feature.base}/macosx.cocoa.aarch64/${collectingFolder}"/> + <copy todir="${feature.base}/macosx.cocoa.aarch64/${collectingFolder}" failonerror="true" overwrite="true"> + <fileset dir="${basedir}/bin/cocoa/macosx/aarch64" includes="**" /> </copy> - <chmod perm="755" dir="${feature.base}/macosx.cocoa.arm64/${collectingFolder}" includes="${launcherName}" /> - <chmod perm="755" dir="${feature.base}/macosx.cocoa.arm64/${collectingFolder}" includes="Eclipse.app/Contents/MacOS/launcher" /> + <chmod perm="755" dir="${feature.base}/macosx.cocoa.aarch64/${collectingFolder}" includes="${launcherName}" /> + <chmod perm="755" dir="${feature.base}/macosx.cocoa.aarch64/${collectingFolder}" includes="Eclipse.app/Contents/MacOS/launcher" /> </target> <target name="rootFileslinux_gtk_ppc64le"> <mkdir dir="${feature.base}/linux.gtk.ppc64le/${collectingFolder}"/> @@ -88,7 +88,7 @@ <module>bundles/org.eclipse.equinox.launcher</module> <module>bundles/org.eclipse.equinox.launcher.cocoa.macosx</module> <module>bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64</module> - <module>bundles/org.eclipse.equinox.launcher.cocoa.macosx.arm64</module> + <module>bundles/org.eclipse.equinox.launcher.cocoa.macosx.aarch64</module> <module>bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64</module> <module>bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le</module> <module>bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64</module> |