Replace Mac/ with Platforms/Mac/

smontanaro · smontanaro · commit 8abf059d70e7 · 2026-03-03T05:57:09.000-06:00
diff --git a/Doc/using/configure.rst b/Doc/using/configure.rst
@@ -1147,7 +1147,7 @@ Security Options
 macOS Options
 -------------
 
-See :source:`Mac/README.rst`.
+See :source:`Platforms/Mac/README.rst`.
 
 .. option:: --enable-universalsdk
 .. option:: --enable-universalsdk=SDKDIR
diff --git a/Doc/using/ios.rst b/Doc/using/ios.rst
@@ -341,7 +341,7 @@ review rules cannot be challenged; so, it is necessary to modify the Python
 standard library for an app to pass App Store review.
 
 The Python source tree contains
-:source:`a patch file <Mac/Resources/app-store-compliance.patch>` that will remove
+:source:`a patch file <Platforms/Mac/Resources/app-store-compliance.patch>` that will remove
 all code that is known to cause issues with the App Store review process. This
 patch is applied automatically when building for iOS.
 
diff --git a/Doc/using/mac.rst b/Doc/using/mac.rst
@@ -455,7 +455,7 @@ review rules cannot be challenged. Therefore, it is necessary to modify the
 Python standard library for an app to pass App Store review.
 
 The Python source tree contains
-:source:`a patch file <Mac/Resources/app-store-compliance.patch>` that will remove
+:source:`a patch file <Platforms/Mac/Resources/app-store-compliance.patch>` that will remove
 all code that is known to cause issues with the App Store review process. This
 patch is applied automatically when CPython is configured with the
 :option:`--with-app-store-compliance` option.
diff --git a/Lib/test/test_os/test_posix.py b/Lib/test/test_os/test_posix.py
@@ -2322,7 +2322,7 @@ class TestPosixWeaklinking(unittest.TestCase):
     # as expected. These cases only test new behaviour introduced by weak linking,
     # regular behaviour is tested by the normal test cases.
     #
-    # See the section on Weak Linking in Mac/README.txt for more information.
+    # See the section on Weak Linking in Platforms/Mac/README.txt for more information.
     def setUp(self):
         import sysconfig
         import platform
diff --git a/Lib/test/test_plistlib.py b/Lib/test/test_plistlib.py
@@ -22,7 +22,7 @@
 
 ALL_FORMATS=(plistlib.FMT_XML, plistlib.FMT_BINARY)
 
-# The testdata is generated using Mac/Tools/plistlib_generate_testdata.py
+# The testdata is generated using Platforms/Mac/Tools/plistlib_generate_testdata.py
 # (which using PyObjC to control the Cocoa classes for generating plists)
 TESTDATA={
     plistlib.FMT_XML: binascii.a2b_base64(b'''
diff --git a/Lib/test/test_time.py b/Lib/test/test_time.py
@@ -1198,7 +1198,7 @@ class TestTimeWeaklinking(unittest.TestCase):
     # as expected. These cases only test new behaviour introduced by weak linking,
     # regular behaviour is tested by the normal test cases.
     #
-    # See the section on Weak Linking in Mac/README.txt for more information.
+    # See the section on Weak Linking in Platforms/Mac/README.txt for more information.
     def test_clock_functions(self):
         import sysconfig
         import platform
diff --git a/Makefile.pre.in b/Makefile.pre.in
@@ -2469,7 +2469,7 @@ altbininstall: $(BUILDPYTHON) @FRAMEWORKPYTHONW@
 	if test "$(PYTHONFRAMEWORKDIR)" = "no-framework" ; then \
 		$(INSTALL_PROGRAM) $(BUILDPYTHON) $(DESTDIR)$(BINDIR)/python$(LDVERSION)$(EXE); \
 	else \
-		$(INSTALL_PROGRAM) $(STRIPFLAG) Mac/pythonw $(DESTDIR)$(BINDIR)/python$(LDVERSION)$(EXE); \
+		$(INSTALL_PROGRAM) $(STRIPFLAG) Platforms/Mac/pythonw $(DESTDIR)$(BINDIR)/python$(LDVERSION)$(EXE); \
 	fi
 	-if test "$(VERSION)" != "$(LDVERSION)"; then \
 		if test -f $(DESTDIR)$(BINDIR)/python$(VERSION)$(EXE) -o -h $(DESTDIR)$(BINDIR)/python$(VERSION)$(EXE); \
@@ -3102,7 +3102,7 @@ frameworkinstallunversionedstructure:	$(LDLIBRARY)
 		$(INSTALL) -m $(EXEMODE) $$file $(DESTDIR)$(BINDIR); \
 	done
 
-# This installs Mac/Lib into the framework
+# This installs Platforms/Mac/Lib into the framework
 # Install a number of symlinks to keep software that expects a normal unix
 # install (which includes python-config) happy.
 .PHONY: frameworkinstallmaclib
diff --git a/Platforms/Mac/BuildScript/build-installer.py b/Platforms/Mac/BuildScript/build-installer.py
@@ -144,12 +144,13 @@ def getFullVersion():
 
 ARCHLIST = universal_opts_map[UNIVERSALARCHS]
 
-# Source directory (assume we're in Mac/BuildScript)
+# Source directory (assume we're in Platforms/Mac/BuildScript)
 SRCDIR = os.path.dirname(
-        os.path.dirname(
+          os.path.dirname(
             os.path.dirname(
-                os.path.abspath(__file__
-        ))))
+                os.path.dirname(
+                    os.path.abspath(__file__
+        )))))
 
 # $MACOSX_DEPLOYMENT_TARGET -> minimum OS X level
 DEPTARGET = '10.5'
diff --git a/Platforms/Mac/Makefile.in b/Platforms/Mac/Makefile.in
@@ -273,4 +273,4 @@ clean:
 	cd PythonLauncher && make clean
 
 Makefile: $(srcdir)/Makefile.in ../config.status
-	cd .. && CONFIG_FILES=Mac/Makefile CONFIG_HEADERS= $(SHELL) ./config.status
+	cd .. && CONFIG_FILES=Platforms/Mac/Makefile CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/Platforms/Mac/README.rst b/Platforms/Mac/README.rst
@@ -317,7 +317,7 @@ How do I create a binary distribution?
 ======================================
 
 Download and unpack the source release from https://www.python.org/download/.
-Go to the directory ``Mac/BuildScript``. There you will find a script
+Go to the directory ``Platofmrs/Mac/BuildScript``. There you will find a script
 ``build-installer.py`` that does all the work. This will download and build
 a number of 3rd-party libraries, configures and builds a framework Python,
 installs it, creates the installer package files and then packs this in a
diff --git a/README.rst b/README.rst
@@ -70,8 +70,8 @@ section of the `Developer Guide`_ for current detailed information on
 dependencies for various Linux distributions and macOS.
 
 On macOS, there are additional configure and build options related
-to macOS framework and universal builds.  Refer to `Mac/README.rst
-<https://github.com/python/cpython/blob/main/Mac/README.rst>`_.
+to macOS framework and universal builds.  Refer to `Platforms/Mac/README.rst
+<https://github.com/python/cpython/blob/main/Platforms/Mac/README.rst>`_.
 
 On Windows, see `PCbuild/readme.txt
 <https://github.com/python/cpython/blob/main/PCbuild/readme.txt>`_.
diff --git a/configure b/configure
diff --git a/configure.ac b/configure.ac
@@ -462,11 +462,11 @@ AC_ARG_ENABLE([universalsdk],
 	AS_HELP_STRING([--enable-universalsdk@<:@=SDKDIR@:>@],
 	               [create a universal binary build.
 	                SDKDIR specifies which macOS SDK should be used to perform the build,
-	                see Mac/README.rst. (default is no)]),
+	                see Platforms/Mac/README.rst. (default is no)]),
 [
 	case $enableval in
 	yes)
-		# Locate the best usable SDK, see Mac/README for more
+		# Locate the best usable SDK, see Platforms/Mac/README for more
 		# information
 		enableval="`/usr/bin/xcodebuild -version -sdk macosx Path 2>/dev/null`"
 		if ! ( echo $enableval | grep -E '\.sdk' 1>/dev/null )
@@ -531,7 +531,7 @@ AC_ARG_WITH([universal-archs],
                     This option is only valid when --enable-universalsdk is set; options are:
                     ("universal2", "intel-64", "intel-32", "intel", "32-bit",
                     "64-bit", "3-way", or "all")
-                    see Mac/README.rst]),
+                    see Platforms/Mac/README.rst]),
 [
 	UNIVERSAL_ARCHS="$withval"
 ],
@@ -546,7 +546,7 @@ fi
 AC_ARG_WITH([framework-name],
               AS_HELP_STRING([--with-framework-name=FRAMEWORK],
                              [specify the name for the python framework on macOS
-                              only valid when --enable-framework is set. see Mac/README.rst
+                              only valid when --enable-framework is set. see Platforms/Mac/README.rst
                               (default is 'Python')]),
 [
     PYTHONFRAMEWORK=${withval}
@@ -561,7 +561,7 @@ dnl quadrigraphs "@<:@" and "@:>@" produce "[" and "]" in the output
 AC_ARG_ENABLE([framework],
               AS_HELP_STRING([--enable-framework@<:@=INSTALLDIR@:>@],
                              [create a Python.framework rather than a traditional Unix install.
-                              optional INSTALLDIR specifies the installation path. see Mac/README.rst
+                              optional INSTALLDIR specifies the installation path. see Platforms/Mac/README.rst
                               (default is no)]),
 [
 	case $enableval in
@@ -656,14 +656,14 @@ AC_ARG_ENABLE([framework],
 
 				prefix=$PYTHONFRAMEWORKINSTALLDIR/Versions/$VERSION
 				PYTHONFRAMEWORKINSTALLNAMEPREFIX=${prefix}
-				RESSRCDIR=Mac/Resources/framework
+				RESSRCDIR=Platforms/Mac/Resources/framework
 
 				# Add files for Mac specific code to the list of output
 				# files:
-				AC_CONFIG_FILES([Mac/Makefile])
-				AC_CONFIG_FILES([Mac/PythonLauncher/Makefile])
-				AC_CONFIG_FILES([Mac/Resources/framework/Info.plist])
-				AC_CONFIG_FILES([Mac/Resources/app/Info.plist])
+				AC_CONFIG_FILES([Platforms/Mac/Makefile])
+				AC_CONFIG_FILES([Platforms/Mac/PythonLauncher/Makefile])
+				AC_CONFIG_FILES([Platforms/Mac/Resources/framework/Info.plist])
+				AC_CONFIG_FILES([Platforms/Mac/Resources/app/Info.plist])
 				;;
 			iOS) :
 				FRAMEWORKINSTALLFIRST="frameworkinstallunversionedstructure"
@@ -741,7 +741,7 @@ AC_ARG_WITH(
       case $ac_sys_system in
         Darwin|iOS)
           # iOS is able to share the macOS patch
-          APP_STORE_COMPLIANCE_PATCH="Mac/Resources/app-store-compliance.patch"
+          APP_STORE_COMPLIANCE_PATCH="Platforms/Mac/Resources/app-store-compliance.patch"
           ;;
         *) AC_MSG_ERROR([no default app store compliance patch available for $ac_sys_system]) ;;
       esac
@@ -756,7 +756,7 @@ AC_ARG_WITH(
     case $ac_sys_system in
       iOS)
         # Always apply the compliance patch on iOS; we can use the macOS patch
-        APP_STORE_COMPLIANCE_PATCH="Mac/Resources/app-store-compliance.patch"
+        APP_STORE_COMPLIANCE_PATCH="Platforms/Mac/Resources/app-store-compliance.patch"
         AC_MSG_RESULT([applying default app store compliance patch])
         ;;
       *)
@@ -1014,7 +1014,7 @@ then
   AC_MSG_RESULT([$SDKROOT])
 
 	# Compiler selection on MacOSX is more complicated than
-	# AC_PROG_CC can handle, see Mac/README for more
+	# AC_PROG_CC can handle, see Platforms/Mac/README for more
 	# information
 	if test -z "${CC}"
 	then

Original file line number	Diff line number	Diff line change
`@@ -2322,7 +2322,7 @@ class TestPosixWeaklinking(unittest.TestCase):`
`2322`	`2322`	`# as expected. These cases only test new behaviour introduced by weak linking,`
`2323`	`2323`	`# regular behaviour is tested by the normal test cases.`
`2324`	`2324`	`#`
`2325`		`- # See the section on Weak Linking in Mac/README.txt for more information.`
	`2325`	`+ # See the section on Weak Linking in Platforms/Mac/README.txt for more information.`
`2326`	`2326`	`def setUp(self):`
`2327`	`2327`	`import sysconfig`
`2328`	`2328`	`import platform`
Original file line number	Diff line number	Diff line change
`@@ -1198,7 +1198,7 @@ class TestTimeWeaklinking(unittest.TestCase):`
`1198`	`1198`	`# as expected. These cases only test new behaviour introduced by weak linking,`
`1199`	`1199`	`# regular behaviour is tested by the normal test cases.`
`1200`	`1200`	`#`
`1201`		`- # See the section on Weak Linking in Mac/README.txt for more information.`
	`1201`	`+ # See the section on Weak Linking in Platforms/Mac/README.txt for more information.`
`1202`	`1202`	`def test_clock_functions(self):`
`1203`	`1203`	`import sysconfig`
`1204`	`1204`	`import platform`