Modify macOS support package to be a lib-based package.

Author: freakboy3742

Makefile

@@ -94,7 +94,7 @@ update-patch:
 	# Generate a diff from the clone of the python/cpython Github repository
 	# Requireds patchutils (installable via `brew install patchutils`)
 	if [ -z "$(PYTHON_REPO_DIR)" ]; then echo "\n\nPYTHON_REPO_DIR must be set to the root of your Python github checkout\n\n"; fi
-	cd $(PYTHON_REPO_DIR) && git diff -D v$(PYTHON_VERSION) $(PYTHON_VER) | filterdiff -X $(PROJECT_DIR)/patch/Python/diff-exclude.lst -p 1 --clean > $(PROJECT_DIR)/patch/Python/Python.patch
+	cd $(PYTHON_REPO_DIR) && git diff -D v$(PYTHON_VERSION) $(PYTHON_VER) | filterdiff -X $(PROJECT_DIR)/patch/Python/diff.exclude -p 1 --clean > $(PROJECT_DIR)/patch/Python/Python.patch
 
 ###########################################################################
 # OpenSSL
@@ -377,16 +377,11 @@ endif
 	echo "BZip2: $(BZIP2_VERSION)" >> build/$1/Support/VERSIONS
 	echo "OpenSSL: $(OPENSSL_VERSION)" >> build/$1/Support/VERSIONS
 	echo "XZ: $(XZ_VERSION)" >> build/$1/Support/VERSIONS
-ifeq ($1,macOS)
-	cp -r build/$1/Python-$(PYTHON_VERSION)-macOS/dist build/$1/python
-	mv build/$1/Support/VERSIONS build/$1/python/VERSIONS
-	tar zcvf $$@ -X patch/Python/exclude.macOS -C build/$1/python `ls -A build/$1/python`
-else
+
 	# Build a "full" tarball with all content for test purposes
-	tar zcvf dist/Python-$(PYTHON_VER)-$1-support.test-$(BUILD_NUMBER).tar.gz -X patch/Python/test-exclude.embedded -C build/$1/Support `ls -A build/$1/Support`
+	tar zcvf dist/Python-$(PYTHON_VER)-$1-support.test-$(BUILD_NUMBER).tar.gz -X patch/Python/test.exclude -C build/$1/Support `ls -A build/$1/Support`
 	# Build a distributable tarball
-	tar zcvf $$@ -X patch/Python/exclude.embedded -C build/$1/Support `ls -A build/$1/Support`
-endif
+	tar zcvf $$@ -X patch/Python/release.exclude -C build/$1/Support `ls -A build/$1/Support`
 
 # Build OpenSSL
 OpenSSL-$1: $$(OPENSSL_FRAMEWORK-$1)

patch/Python/diff-exclude.lst renamed to patch/Python/diff.exclude

@@ -2,7 +2,7 @@
 # we exclude from the embedded device Python-Apple-support tarballs.
 # It is used by `tar -X` during the Makefile build.
 #
-# Remove binaries; not needed for
+# Remove binaries; not needed for embedded builds
 Python/Resources/bin
 # Remove includes; use the version packaged in Headers
 Python/Resources/include
@@ -21,12 +21,13 @@ Python/Resources/lib/python*/test
 Python/Resources/lib/python*/lib-dynload/_test*.so
 Python/Resources/lib/python*/lib-dynload/_ctypes_test*.so
 Python/Resources/lib/python*/lib-dynload/xxlimited*.so
-Python/Resources/lib/python*/lib-dynload/_xxtestfuzz.so
+Python/Resources/lib/python*/lib-dynload/_xx*.so
 # Remove wsgiref web app module; it's unusual that mobile apps would
 # start a web app server with it.
 Python/Resources/lib/python*/wsgiref
 # Remove command-line curses toolkit.
 Python/Resources/lib/python*/curses
+Python/Resources/lib/python*/lib-dynload/_curses*.so
 # Remove config-* directory, which is used for compiling C extension modules.
 Python/Resources/lib/python*/config-*
 # Remove ensurepip. If user code needs pip, it can add it to
@@ -37,6 +38,7 @@ Python/Resources/lib/python*/idlelib
 Python/Resources/lib/python*/tkinter
 Python/Resources/lib/python*/turtle.py
 Python/Resources/lib/python*/turtledemo
+Python/Resources/lib/python*/lib-dynload/_tkinter*.so
 # Remove site-packages directory. The template unpacks user code and
 # dependencies to a different path.
 Python/Resources/lib/python*/site-packages