Minor cleanups.

Author: freakboy3742

.gitignore

@@ -74,7 +74,6 @@ Lib/test/data/*
 /visionOSTestbed.*
 iOS/Frameworks/
 iOS/Resources/Info.plist
-MacCatalyst/Resources/Info.plist
 iOS/testbed/build
 iOS/testbed/Python.xcframework/ios-*/bin
 iOS/testbed/Python.xcframework/ios-*/include
@@ -83,6 +82,7 @@ iOS/testbed/Python.xcframework/ios-*/Python.framework
 iOS/testbed/iOSTestbed.xcodeproj/project.xcworkspace
 iOS/testbed/iOSTestbed.xcodeproj/xcuserdata
 iOS/testbed/iOSTestbed.xcodeproj/xcshareddata
+MacCatalyst/Resources/Info.plist
 visionOS/testbed/Python.xcframework/xr*-*/bin
 visionOS/testbed/Python.xcframework/xr*-*/include
 visionOS/testbed/Python.xcframework/xr*-*/lib

MacCatalyst/Resources/Info.plist.in

@@ -26,10 +26,10 @@
 	<string>%VERSION%</string>
 	<key>CFBundleSupportedPlatforms</key>
 	<array>
-		<string>MacOSX</string>
+		<string>MacCatalyst</string>
 	</array>
 	<key>LSMinimumSystemVersion</key>
-	<string>10.0</string>
+	<string>11.0</string>
 	<key>UIDeviceFamily</key>
 	<array>
 		<integer>2</integer>

MacCatalyst/Resources/dylib-Info-template.plist

@@ -16,10 +16,10 @@
 	<string>1.0</string>
 	<key>CFBundleSupportedPlatforms</key>
 	<array>
-		<string>MacOSX</string>
+		<string>MacCatalyst</string>
 	</array>
 	<key>LSMinimumSystemVersion</key>
-	<string>10.0</string>
+	<string>11.0</string>
 	<key>UIDeviceFamily</key>
 	<array>
 		<integer>2</integer>

configure

@@ -426,11 +426,12 @@ AC_SUBST([host_exec_prefix])
 # configure will fail.
 if test -z "$AR"; then
 	case "$host" in
-		aarch64-apple-ios*-simulator) AR=arm64-apple-ios-simulator-ar ;;
+		x86_64-apple-ios*-macabi)  AR=x86_64-apple-ios-macabi-ar ;;
 		aarch64-apple-ios*-macabi) AR=arm64-apple-ios-macabi-ar ;;
-		aarch64-apple-ios*)           AR=arm64-apple-ios-ar ;;
+
 		x86_64-apple-ios*-simulator)  AR=x86_64-apple-ios-simulator-ar ;;
-		x86_64-apple-ios*-macabi) AR=x86_64-apple-ios-macabi-ar ;;
+		aarch64-apple-ios*-simulator) AR=arm64-apple-ios-simulator-ar ;;
+		aarch64-apple-ios*)           AR=arm64-apple-ios-ar ;;
 
 		aarch64-apple-tvos*-simulator) AR=arm64-apple-tvos-simulator-ar ;;
 		aarch64-apple-tvos*)           AR=arm64-apple-tvos-ar ;;
@@ -447,11 +448,12 @@ if test -z "$AR"; then
 fi
 if test -z "$CC"; then
 	case "$host" in
-		aarch64-apple-ios*-simulator) CC=arm64-apple-ios-simulator-clang ;;
+		x86_64-apple-ios*-macabi)  CC=x86_64-apple-ios-macabi-clang ;;
 		aarch64-apple-ios*-macabi) CC=arm64-apple-ios-macabi-clang ;;
-		aarch64-apple-ios*)           CC=arm64-apple-ios-clang ;;
+
 		x86_64-apple-ios*-simulator)  CC=x86_64-apple-ios-simulator-clang ;;
-		x86_64-apple-ios*-macabi) CC=x86_64-apple-ios-macabi-clang ;;
+		aarch64-apple-ios*-simulator) CC=arm64-apple-ios-simulator-clang ;;
+		aarch64-apple-ios*)           CC=arm64-apple-ios-clang ;;
 
 		aarch64-apple-tvos*-simulator) CC=arm64-apple-tvos-simulator-clang ;;
 		aarch64-apple-tvos*)           CC=arm64-apple-tvos-clang ;;
@@ -468,11 +470,12 @@ if test -z "$CC"; then
 fi
 if test -z "$CPP"; then
 	case "$host" in
-		aarch64-apple-ios*-simulator) CPP=arm64-apple-ios-simulator-cpp ;;
+		x86_64-apple-ios*-macabi)  CPP=x86_64-apple-ios-macabi-cpp ;;
 		aarch64-apple-ios*-macabi) CPP=arm64-apple-ios-macabi-cpp ;;
-		aarch64-apple-ios*)           CPP=arm64-apple-ios-cpp ;;
+
 		x86_64-apple-ios*-simulator)  CPP=x86_64-apple-ios-simulator-cpp ;;
-		x86_64-apple-ios*-macabi) CPP=x86_64-apple-ios-macabi-cpp ;;
+		aarch64-apple-ios*-simulator) CPP=arm64-apple-ios-simulator-cpp ;;
+		aarch64-apple-ios*)           CPP=arm64-apple-ios-cpp ;;
 
 		aarch64-apple-tvos*-simulator) CPP=arm64-apple-tvos-simulator-cpp ;;
 		aarch64-apple-tvos*)           CPP=arm64-apple-tvos-cpp ;;
@@ -489,11 +492,12 @@ if test -z "$CPP"; then
 fi
 if test -z "$CXX"; then
 	case "$host" in
-		aarch64-apple-ios*-simulator) CXX=arm64-apple-ios-simulator-clang++ ;;
+		x86_64-apple-ios*-macabi)  CXX=x86_64-apple-ios-macabi-clang++ ;;
 		aarch64-apple-ios*-macabi) CXX=arm64-apple-ios-macabi-clang++ ;;
-		aarch64-apple-ios*)           CXX=arm64-apple-ios-clang++ ;;
+
 		x86_64-apple-ios*-simulator)  CXX=x86_64-apple-ios-simulator-clang++ ;;
-		x86_64-apple-ios*-macabi) CXX=x86_64-apple-ios-macabi-clang++ ;;
+		aarch64-apple-ios*-simulator) CXX=arm64-apple-ios-simulator-clang++ ;;
+		aarch64-apple-ios*)           CXX=arm64-apple-ios-clang++ ;;
 
 		aarch64-apple-tvos*-simulator) CXX=arm64-apple-tvos-simulator-clang++ ;;
 		aarch64-apple-tvos*)           CXX=arm64-apple-tvos-clang++ ;;
@@ -724,36 +728,23 @@ AC_ARG_ENABLE([framework],
 				AC_CONFIG_FILES([Mac/Resources/app/Info.plist])
 				;;
 			iOS) :
-				_flag_ios_catalyst=`echo $host | cut -d '-' -f4`
-				case $_flag_ios_catalyst in
+				FRAMEWORKINSTALLFIRST="frameworkinstallunversionedstructure"
+				FRAMEWORKALTINSTALLFIRST="frameworkinstallunversionedstructure "
+				FRAMEWORKINSTALLLAST="frameworkinstallmobileheaders"
+				FRAMEWORKALTINSTALLLAST="frameworkinstallmobileheaders"
+				FRAMEWORKPYTHONW=
+				INSTALLTARGETS="libinstall inclinstall sharedinstall"
+				prefix=$PYTHONFRAMEWORKPREFIX
+				PYTHONFRAMEWORKINSTALLNAMEPREFIX="@rpath/$PYTHONFRAMEWORKDIR"
+
+				is_mac_catalyst=`echo $host | cut -d '-' -f4`
+				case $is_mac_catalyst in
 					macabi)
-						FRAMEWORKINSTALLFIRST="frameworkinstallversionedstructure"
-						FRAMEWORKALTINSTALLFIRST="frameworkinstallversionedstructure "
-						FRAMEWORKINSTALLLAST=""
-						FRAMEWORKALTINSTALLLAST=""
-						FRAMEWORKPYTHONW=
-						INSTALLTARGETS="libinstall inclinstall sharedinstall"
-
-						prefix=$PYTHONFRAMEWORKINSTALLDIR/Versions/$VERSION
-						PYTHONFRAMEWORKINSTALLNAMEPREFIX=${prefix}
 						RESSRCDIR=MacCatalyst/Resources
-
-						# Add files for Mac Catalyst specific code to the list of output
-						# files:
 						AC_CONFIG_FILES([MacCatalyst/Resources/Info.plist])
 						;;
 					*)
-						FRAMEWORKINSTALLFIRST="frameworkinstallunversionedstructure"
-						FRAMEWORKALTINSTALLFIRST="frameworkinstallunversionedstructure "
-						FRAMEWORKINSTALLLAST="frameworkinstallmobileheaders"
-						FRAMEWORKALTINSTALLLAST="frameworkinstallmobileheaders"
-						FRAMEWORKPYTHONW=
-						INSTALLTARGETS="libinstall inclinstall sharedinstall"
-
-						prefix=$PYTHONFRAMEWORKPREFIX
-						PYTHONFRAMEWORKINSTALLNAMEPREFIX="@rpath/$PYTHONFRAMEWORKDIR"
 						RESSRCDIR=iOS/Resources
-
 						AC_CONFIG_FILES([iOS/Resources/Info.plist])
 					;;
 				esac
@@ -1467,11 +1458,11 @@ AS_CASE([$host/$ac_cv_cc_name],
   [powerpc64le-*-linux-gnu/clang],   [PY_SUPPORT_TIER=3], dnl Linux on PPC64 little endian, glibc, clang
   [s390x-*-linux-gnu/gcc],           [PY_SUPPORT_TIER=3], dnl Linux on 64bit s390x (big endian), glibc, gcc
   [x86_64-*-freebsd*/clang],         [PY_SUPPORT_TIER=3], dnl FreeBSD on AMD64
+  [aarch64-apple-ios*-macabi/clang],      [PY_SUPPORT_TIER=3], dnl MacCatalyst on arm64
+  [x86_64-apple-ios*-macabi/clang],       [PY_SUPPORT_TIER=3], dnl MacCatalyst on x86_64
   [aarch64-apple-ios*-simulator/clang],   [PY_SUPPORT_TIER=3], dnl iOS Simulator on arm64
   [aarch64-apple-ios*/clang],             [PY_SUPPORT_TIER=3], dnl iOS on ARM64
   [aarch64-apple-tvos*-simulator/clang],  [PY_SUPPORT_TIER=3], dnl tvOS Simulator on arm64
-  [aarch64-apple-ios*-macabi/clang],  [PY_SUPPORT_TIER=3], dnl MacCatalyst on arm64
-  [x86_64-apple-ios*-macabi/clang],  [PY_SUPPORT_TIER=3], dnl MacCatalyst on x86_64
   [aarch64-apple-tvos*/clang],            [PY_SUPPORT_TIER=3], dnl tvOS on ARM64
   [aarch64-apple-watchos*-simulator/clang],   [PY_SUPPORT_TIER=3], dnl watchOS Simulator on arm64
   [arm64_32-apple-watchos*/clang],            [PY_SUPPORT_TIER=3], dnl watchOS on ARM64