Bug 572799 - Replace arm64 with aarch64
Replace occurrences of arm64 with aarch64 in fragment and arch name.
However, continue to use '-arch arm64' and __arm64__ for building the
native
library as '-arch aarch64' gives invalid arch name.
Change-Id: If4fb7a7ac8e75270a5ddaa8c0f33170972c63dc0
Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.swt/+/179657
Tested-by: Lakshmi P Shanmugam <lshanmug@in.ibm.com>
Reviewed-by: Lakshmi P Shanmugam <lshanmug@in.ibm.com>
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/build.sh b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/build.sh
old mode 100644
new mode 100755
index 2b3114e..0e67c36
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/build.sh
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/build.sh
@@ -31,10 +31,10 @@
else
export CHROMIUM_HEADERS=$CHROMIUM_OUTPUT_DIR/../../../../eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_subp/cef_macosx
fi
-elif [ "x${MODEL}" = "xarm64" ]; then
+elif [ "x${MODEL}" = "xarm64" ] || [ "x${MODEL}" = "xaarch64" ]; then
export ARCHS="-arch arm64"
if [ "x${OUTPUT_DIR}" = "x" ]; then
- export OUTPUT_DIR=../../../org.eclipse.swt.cocoa.macosx.arm64
+ export OUTPUT_DIR=../../../org.eclipse.swt.cocoa.macosx.aarch64
fi
fi
diff --git a/bundles/org.eclipse.swt/META-INF/p2.inf b/bundles/org.eclipse.swt/META-INF/p2.inf
index 60447b5..110a883 100644
--- a/bundles/org.eclipse.swt/META-INF/p2.inf
+++ b/bundles/org.eclipse.swt/META-INF/p2.inf
@@ -31,6 +31,6 @@
requires.6.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=aarch64)(!(org.eclipse.swt.buildtime=true)))
requires.7.namespace = org.eclipse.equinox.p2.iu
-requires.7.name = org.eclipse.swt.cocoa.macosx.arm64
+requires.7.name = org.eclipse.swt.cocoa.macosx.aarch64
requires.7.range = [$version$,$version$]
-requires.7.filter = (&(osgi.os=macosx)(osgi.ws=cocoa)(osgi.arch=arm64)(!(org.eclipse.swt.buildtime=true)))
+requires.7.filter = (&(osgi.os=macosx)(osgi.ws=cocoa)(osgi.arch=aarch64)(!(org.eclipse.swt.buildtime=true)))
diff --git a/bundles/org.eclipse.swt/buildSWT.xml b/bundles/org.eclipse.swt/buildSWT.xml
index fec169c..b59eda2 100644
--- a/bundles/org.eclipse.swt/buildSWT.xml
+++ b/bundles/org.eclipse.swt/buildSWT.xml
@@ -60,7 +60,7 @@
<target name="check_libraries" depends="get_version">
<antcall target="check_fragment_libraries">
<param name="library_count" value="3"/>
- <param name="fragment" value="org.eclipse.swt.cocoa.macosx.arm64"/>
+ <param name="fragment" value="org.eclipse.swt.cocoa.macosx.aarch64"/>
</antcall>
<antcall target="check_fragment_libraries">
<param name="library_count" value="3"/>
@@ -89,13 +89,13 @@
<property name="checkdir" value="~/build/check_libraries"/>
<property name="library_count" value="34"/>
<property name="fragment" value=""/>
- <fileset id="match" dir="${repo.bin}/bundles/${fragment}" includes="**/org.eclipse.swt.gtk.linux.aarch64/**, **/org.eclipse.swt.gtk.linux.ppc64le/**, **/org.eclipse.swt.gtk.linux.x86_64/**, **/org.eclipse.swt.win32.win32.x86_64/**, **/org.eclipse.swt.cocoa.macosx.arm64/**, **/org.eclipse.swt.cocoa.macosx.x86_64/**">
+ <fileset id="match" dir="${repo.bin}/bundles/${fragment}" includes="**/org.eclipse.swt.gtk.linux.aarch64/**, **/org.eclipse.swt.gtk.linux.ppc64le/**, **/org.eclipse.swt.gtk.linux.x86_64/**, **/org.eclipse.swt.win32.win32.x86_64/**, **/org.eclipse.swt.cocoa.macosx.aarch64/**, **/org.eclipse.swt.cocoa.macosx.x86_64/**">
<filename regex="[0-9][0-9][0-9][0-9]"/>
<filename regex="${swt_version}"/>
<exclude name="**/.git/**"/>
</fileset>
<echo>Matched files ${toString:match}</echo>
- <fileset id="not_match" dir="${repo.bin}/bundles/${fragment}" includes="**/org.eclipse.swt.gtk.linux.aarch64/**, **/org.eclipse.swt.gtk.linux.ppc64le/**, **/org.eclipse.swt.gtk.linux.x86_64/**, **/org.eclipse.swt.win32.win32.x86_64/**, **/org.eclipse.swt.cocoa.macosx.arm64/**, **/org.eclipse.swt.cocoa.macosx.x86_64/**">
+ <fileset id="not_match" dir="${repo.bin}/bundles/${fragment}" includes="**/org.eclipse.swt.gtk.linux.aarch64/**, **/org.eclipse.swt.gtk.linux.ppc64le/**, **/org.eclipse.swt.gtk.linux.x86_64/**, **/org.eclipse.swt.win32.win32.x86_64/**, **/org.eclipse.swt.cocoa.macosx.aarch64/**, **/org.eclipse.swt.cocoa.macosx.x86_64/**">
<filename regex="[0-9][0-9][0-9][0-9]"/>
<filename regex="${swt_version}" negate="true"/>
<exclude name="**/.git/**"/>
diff --git a/local-build/org.eclipse.swt.fragments.localbuild/META-INF/p2.inf b/local-build/org.eclipse.swt.fragments.localbuild/META-INF/p2.inf
index 736ab3c..078e5e9 100644
--- a/local-build/org.eclipse.swt.fragments.localbuild/META-INF/p2.inf
+++ b/local-build/org.eclipse.swt.fragments.localbuild/META-INF/p2.inf
@@ -25,6 +25,6 @@
requires.5.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=aarch64))
requires.6.namespace = org.eclipse.equinox.p2.iu
-requires.6.name = org.eclipse.swt.cocoa.macosx.arm64
+requires.6.name = org.eclipse.swt.cocoa.macosx.aarch64
requires.6.range = 0.0.0
-requires.6.filter = (&(osgi.os=macosx)(osgi.ws=cocoa)(osgi.arch=arm64))
+requires.6.filter = (&(osgi.os=macosx)(osgi.ws=cocoa)(osgi.arch=aarch64))
diff --git a/tests/org.eclipse.swt.tests.fragments.feature/feature.xml b/tests/org.eclipse.swt.tests.fragments.feature/feature.xml
index 66a0e79..5f506bd 100644
--- a/tests/org.eclipse.swt.tests.fragments.feature/feature.xml
+++ b/tests/org.eclipse.swt.tests.fragments.feature/feature.xml
@@ -75,10 +75,10 @@
unpack="false"/>
<plugin
- id="org.eclipse.swt.cocoa.macosx.arm64"
+ id="org.eclipse.swt.cocoa.macosx.aarch64"
os="macosx"
ws="cocoa"
- arch="arm64"
+ arch="aarch64"
download-size="0"
install-size="0"
version="0.0.0"
