Bug 572799 - Replace arm64 with aarch64
Replace occurrences of arm64 with aarch64 in fragment and arch name.
Change-Id: I336c32a321ceab1cfb1c7a7aebc9cf9f5a24ad5f
Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.swt.binaries/+/179682
Tested-by: Platform Bot <platform-bot@eclipse.org>
Reviewed-by: Lakshmi P Shanmugam <lshanmug@in.ibm.com>
diff --git a/bundles/org.eclipse.swt.cocoa.macosx.arm64/.DS_Store b/bundles/org.eclipse.swt.cocoa.macosx.aarch64/.DS_Store
similarity index 100%
rename from bundles/org.eclipse.swt.cocoa.macosx.arm64/.DS_Store
rename to bundles/org.eclipse.swt.cocoa.macosx.aarch64/.DS_Store
Binary files differ
diff --git a/bundles/org.eclipse.swt.cocoa.macosx.arm64/.project b/bundles/org.eclipse.swt.cocoa.macosx.aarch64/.project
similarity index 92%
rename from bundles/org.eclipse.swt.cocoa.macosx.arm64/.project
rename to bundles/org.eclipse.swt.cocoa.macosx.aarch64/.project
index be3fa8b..7d12b55 100644
--- a/bundles/org.eclipse.swt.cocoa.macosx.arm64/.project
+++ b/bundles/org.eclipse.swt.cocoa.macosx.aarch64/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.swt.cocoa.macosx.arm64</name>
+ <name>org.eclipse.swt.cocoa.macosx.aarch64</name>
<comment></comment>
<projects>
</projects>
diff --git a/bundles/org.eclipse.swt.cocoa.macosx.arm64/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt.cocoa.macosx.aarch64/META-INF/MANIFEST.MF
similarity index 82%
rename from bundles/org.eclipse.swt.cocoa.macosx.arm64/META-INF/MANIFEST.MF
rename to bundles/org.eclipse.swt.cocoa.macosx.aarch64/META-INF/MANIFEST.MF
index 667b5c5..8ff670c 100644
--- a/bundles/org.eclipse.swt.cocoa.macosx.arm64/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.swt.cocoa.macosx.aarch64/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Fragment-Host: org.eclipse.swt;bundle-version="[3.116.0,4.0.0)"
Bundle-Name: %fragmentName
Bundle-Vendor: %providerName
-Bundle-SymbolicName: org.eclipse.swt.cocoa.macosx.arm64; singleton:=true
+Bundle-SymbolicName: org.eclipse.swt.cocoa.macosx.aarch64; singleton:=true
Bundle-Version: 3.116.100.qualifier
Bundle-ManifestVersion: 2
Bundle-Localization: fragment
@@ -23,8 +23,8 @@
org.eclipse.swt.internal; x-friends:="org.eclipse.ui",
org.eclipse.swt.internal.image; x-internal:=true,
org.eclipse.swt.internal.cocoa; x-friends:="org.eclipse.ui"
-Eclipse-PlatformFilter: (& (osgi.ws=cocoa) (osgi.os=macosx) (osgi.arch=arm64) )
+Eclipse-PlatformFilter: (& (osgi.ws=cocoa) (osgi.os=macosx) (osgi.arch=aarch64) )
SWT-WS: cocoa
SWT-OS: macosx
-SWT-Arch: arm64
-Automatic-Module-Name: org.eclipse.swt.cocoa.macosx.arm64
+SWT-Arch: aarch64
+Automatic-Module-Name: org.eclipse.swt.cocoa.macosx.aarch64
diff --git a/bundles/org.eclipse.swt.cocoa.macosx.arm64/about.html b/bundles/org.eclipse.swt.cocoa.macosx.aarch64/about.html
similarity index 100%
rename from bundles/org.eclipse.swt.cocoa.macosx.arm64/about.html
rename to bundles/org.eclipse.swt.cocoa.macosx.aarch64/about.html
diff --git a/bundles/org.eclipse.swt.cocoa.macosx.arm64/about_files/IJG_README b/bundles/org.eclipse.swt.cocoa.macosx.aarch64/about_files/IJG_README
similarity index 100%
rename from bundles/org.eclipse.swt.cocoa.macosx.arm64/about_files/IJG_README
rename to bundles/org.eclipse.swt.cocoa.macosx.aarch64/about_files/IJG_README
diff --git a/bundles/org.eclipse.swt.cocoa.macosx.arm64/about_files/mpl-v11.txt b/bundles/org.eclipse.swt.cocoa.macosx.aarch64/about_files/mpl-v11.txt
similarity index 100%
rename from bundles/org.eclipse.swt.cocoa.macosx.arm64/about_files/mpl-v11.txt
rename to bundles/org.eclipse.swt.cocoa.macosx.aarch64/about_files/mpl-v11.txt
diff --git a/bundles/org.eclipse.swt.cocoa.macosx.arm64/about_files/mpl-v20.txt b/bundles/org.eclipse.swt.cocoa.macosx.aarch64/about_files/mpl-v20.txt
similarity index 100%
rename from bundles/org.eclipse.swt.cocoa.macosx.arm64/about_files/mpl-v20.txt
rename to bundles/org.eclipse.swt.cocoa.macosx.aarch64/about_files/mpl-v20.txt
diff --git a/bundles/org.eclipse.swt.cocoa.macosx.arm64/build.properties b/bundles/org.eclipse.swt.cocoa.macosx.aarch64/build.properties
similarity index 100%
rename from bundles/org.eclipse.swt.cocoa.macosx.arm64/build.properties
rename to bundles/org.eclipse.swt.cocoa.macosx.aarch64/build.properties
diff --git a/bundles/org.eclipse.swt.cocoa.macosx.arm64/build.xml b/bundles/org.eclipse.swt.cocoa.macosx.aarch64/build.xml
similarity index 82%
rename from bundles/org.eclipse.swt.cocoa.macosx.arm64/build.xml
rename to bundles/org.eclipse.swt.cocoa.macosx.aarch64/build.xml
index 8ccd1f4..9de1be1 100644
--- a/bundles/org.eclipse.swt.cocoa.macosx.arm64/build.xml
+++ b/bundles/org.eclipse.swt.cocoa.macosx.aarch64/build.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.swt.cocoa.macosx.arm64" default="build.jars" basedir=".">
+<project name="org.eclipse.swt.cocoa.macosx.aarch64" default="build.jars" basedir=".">
<property name="swt.ws" value="cocoa" />
<property name="swt.os" value="macosx" />
- <property name="swt.arch" value="arm64" />
+ <property name="swt.arch" value="aarch64" />
<!-- These properties are used by eclipse when exporting as Deployable plugin and fragments -->
<property name="version.suffix" value="3.116.0" />
diff --git a/bundles/org.eclipse.swt.cocoa.macosx.arm64/forceQualifierUpdate.txt b/bundles/org.eclipse.swt.cocoa.macosx.aarch64/forceQualifierUpdate.txt
similarity index 100%
rename from bundles/org.eclipse.swt.cocoa.macosx.arm64/forceQualifierUpdate.txt
rename to bundles/org.eclipse.swt.cocoa.macosx.aarch64/forceQualifierUpdate.txt
diff --git a/bundles/org.eclipse.swt.cocoa.macosx.arm64/fragment.properties b/bundles/org.eclipse.swt.cocoa.macosx.aarch64/fragment.properties
similarity index 88%
rename from bundles/org.eclipse.swt.cocoa.macosx.arm64/fragment.properties
rename to bundles/org.eclipse.swt.cocoa.macosx.aarch64/fragment.properties
index 678599c..e6899f7 100644
--- a/bundles/org.eclipse.swt.cocoa.macosx.arm64/fragment.properties
+++ b/bundles/org.eclipse.swt.cocoa.macosx.aarch64/fragment.properties
@@ -8,5 +8,5 @@
# Contributors:
# IBM Corporation - initial API and implementation
###############################################################################
-fragmentName = Standard Widget Toolkit for Mac OS X (Cocoa) ARM64
+fragmentName = Standard Widget Toolkit for Mac OS X (Cocoa) AARCH64
providerName = Eclipse.org
diff --git a/bundles/org.eclipse.swt.cocoa.macosx.aarch64/libswt-awt-cocoa-4944r19.jnilib b/bundles/org.eclipse.swt.cocoa.macosx.aarch64/libswt-awt-cocoa-4944r19.jnilib
new file mode 100644
index 0000000..af0be85
--- /dev/null
+++ b/bundles/org.eclipse.swt.cocoa.macosx.aarch64/libswt-awt-cocoa-4944r19.jnilib
Binary files differ
diff --git a/bundles/org.eclipse.swt.cocoa.macosx.aarch64/libswt-cocoa-4944r19.jnilib b/bundles/org.eclipse.swt.cocoa.macosx.aarch64/libswt-cocoa-4944r19.jnilib
new file mode 100644
index 0000000..eb552cd
--- /dev/null
+++ b/bundles/org.eclipse.swt.cocoa.macosx.aarch64/libswt-cocoa-4944r19.jnilib
Binary files differ
diff --git a/bundles/org.eclipse.swt.cocoa.macosx.aarch64/libswt-pi-cocoa-4944r19.jnilib b/bundles/org.eclipse.swt.cocoa.macosx.aarch64/libswt-pi-cocoa-4944r19.jnilib
new file mode 100644
index 0000000..f509cb6
--- /dev/null
+++ b/bundles/org.eclipse.swt.cocoa.macosx.aarch64/libswt-pi-cocoa-4944r19.jnilib
Binary files differ
diff --git a/bundles/org.eclipse.swt.cocoa.macosx.arm64/pom.xml b/bundles/org.eclipse.swt.cocoa.macosx.aarch64/pom.xml
similarity index 95%
rename from bundles/org.eclipse.swt.cocoa.macosx.arm64/pom.xml
rename to bundles/org.eclipse.swt.cocoa.macosx.aarch64/pom.xml
index 71f5f88..21811d9 100644
--- a/bundles/org.eclipse.swt.cocoa.macosx.arm64/pom.xml
+++ b/bundles/org.eclipse.swt.cocoa.macosx.aarch64/pom.xml
@@ -20,14 +20,14 @@
<relativePath>../binaries-parent/</relativePath>
</parent>
<groupId>org.eclipse.swt</groupId>
- <artifactId>org.eclipse.swt.cocoa.macosx.arm64</artifactId>
+ <artifactId>org.eclipse.swt.cocoa.macosx.aarch64</artifactId>
<version>3.116.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<properties>
<os>macosx</os>
<ws>cocoa</ws>
- <arch>arm64</arch>
+ <arch>aarch64</arch>
<buildid>${buildId}</buildid>
</properties>
@@ -62,7 +62,7 @@
<property>
<!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( -->
<name>native</name>
- <value>cocoa.macosx.arm64</value>
+ <value>cocoa.macosx.aarch64</value>
</property>
</activation>
<build>
diff --git a/pom.xml b/pom.xml
index 44392ed..d3a8e0d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,7 +54,7 @@
<modules>
<module>bundles/org.eclipse.swt.cocoa.macosx.x86_64</module>
- <module>bundles/org.eclipse.swt.cocoa.macosx.arm64</module>
+ <module>bundles/org.eclipse.swt.cocoa.macosx.aarch64</module>
<module>bundles/org.eclipse.swt.gtk.linux.aarch64</module>
<module>bundles/org.eclipse.swt.gtk.linux.ppc64le</module>
<module>bundles/org.eclipse.swt.gtk.linux.x86_64</module>
