Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

gh-145465: Move Mac dir into Platforms#145483

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Open
smontanaro wants to merge2 commits intopython:main
base:main
Choose a base branch
Loading
fromsmontanaro:plat-mac
Open
Show file tree
Hide file tree
Changes fromall commits
Commits
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletionDoc/using/configure.rst
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down
2 changes: 1 addition & 1 deletionDoc/using/ios.rst
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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.

Expand Down
2 changes: 1 addition & 1 deletionDoc/using/mac.rst
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
Expand Down
2 changes: 1 addition & 1 deletionLib/test/test_os/test_posix.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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 inPlatforms/Mac/README.txt for more information.
def setUp(self):
import sysconfig
import platform
Expand Down
2 changes: 1 addition & 1 deletionLib/test/test_plistlib.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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 usingPlatforms/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'''
Expand Down
2 changes: 1 addition & 1 deletionLib/test/test_time.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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 inPlatforms/Mac/README.txt for more information.
def test_clock_functions(self):
import sysconfig
import platform
Expand Down
4 changes: 2 additions & 2 deletionsMakefile.pre.in
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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); \
Expand DownExpand Up@@ -3102,7 +3102,7 @@ frameworkinstallunversionedstructure:$(LDLIBRARY)
$(INSTALL) -m $(EXEMODE) $$file $(DESTDIR)$(BINDIR); \
done

# This installs Mac/Lib into the framework
# This installsPlatforms/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
Expand Down
File renamed without changes.
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -144,12 +144,13 @@ def getFullVersion():

ARCHLIST = universal_opts_map[UNIVERSALARCHS]

# Source directory (assume we're in Mac/BuildScript)
# Source directory (assume we're inPlatforms/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'
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletionMac/Makefile.in → Platforms/Mac/Makefile.in
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletionMac/README.rst → Platforms/Mac/README.rst
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletionsREADME.rst
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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>`_.
Expand Down
36 changes: 18 additions & 18 deletionsconfigure
View file
Open in desktop

Some generated files are not rendered by default. Learn more abouthow customized files appear on GitHub.

26 changes: 13 additions & 13 deletionsconfigure.ac
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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)]),
seePlatforms/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, seePlatforms/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 )
Expand DownExpand Up@@ -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]),
seePlatforms/Mac/README.rst]),
[
UNIVERSAL_ARCHS="$withval"
],
Expand All@@ -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. seePlatforms/Mac/README.rst
(default is 'Python')]),
[
PYTHONFRAMEWORK=${withval}
Expand All@@ -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. seePlatforms/Mac/README.rst
(default is no)]),
[
case $enableval in
Expand DownExpand Up@@ -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"
Expand DownExpand Up@@ -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
Expand All@@ -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])
;;
*)
Expand DownExpand Up@@ -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, seePlatforms/Mac/README for more
# information
if test -z "${CC}"
then
Expand Down
Loading
[8]ページ先頭
©2009-2026 Movatter.jp