Cleaned up spacing in Makefile.

Author: freakboy3742

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2014 Russell Keith-Magee.
+Copyright (c) 2014-2016 Russell Keith-Magee.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Makefile

@@ -1,22 +1,22 @@
 #
 # Useful targets:
-# - all						 - build everything
-# - iOS						 - build everything for iOS
-# - tvOS						- build everything for tvOS
-# - watchOS					 - build everything for watchOS
-# - OpenSSL.framework-iOS	   - build OpenSSL.framework for iOS
-# - OpenSSL.framework-tvOS	  - build OpenSSL.framework for tvOS
-# - OpenSSL.framework-watchOS   - build OpenSSL.framework for watchOS
-# - BZip2-iOS				   - build BZip2 library for iOS
-# - BZip2-tvOS				  - build BZip2 library for tvOS
-# - BZip2-watchOS			   - build BZip2 library for watchOS
-# - XZ-iOS					  - build XZ library for iOS
-# - XZ-tvOS					 - build XZ library for tvOS
-# - XZ-watchOS				  - build XZ library for watchOS
-# - Python.framework-iOS		- build Python.framework for iOS
-# - Python.framework-tvOS	   - build Python.framework for tvOS
-# - Python.framework-watchOS	- build Python.framework for watchOS
-# - Python-host				 - build host python
+# - all                       - build everything
+# - iOS                       - build everything for iOS
+# - tvOS                      - build everything for tvOS
+# - watchOS                   - build everything for watchOS
+# - OpenSSL.framework-iOS     - build OpenSSL.framework for iOS
+# - OpenSSL.framework-tvOS    - build OpenSSL.framework for tvOS
+# - OpenSSL.framework-watchOS - build OpenSSL.framework for watchOS
+# - BZip2-iOS                 - build BZip2 library for iOS
+# - BZip2-tvOS                - build BZip2 library for tvOS
+# - BZip2-watchOS             - build BZip2 library for watchOS
+# - XZ-iOS                    - build XZ library for iOS
+# - XZ-tvOS                   - build XZ library for tvOS
+# - XZ-watchOS                - build XZ library for watchOS
+# - Python.framework-iOS      - build Python.framework for iOS
+# - Python.framework-tvOS     - build Python.framework for tvOS
+# - Python.framework-watchOS  - build Python.framework for watchOS
+# - Python-host               - build host python
 
 # Current director
 PROJECT_DIR=$(shell pwd)
@@ -25,7 +25,7 @@ BUILD_NUMBER=5
 
 # Version of packages that will be compiled by this meta-package
 PYTHON_VERSION=3.4.2
-PYTHON_VER= $(basename $(PYTHON_VERSION))
+PYTHON_VER=$(basename $(PYTHON_VERSION))
 
 OPENSSL_VERSION_NUMBER=1.0.2
 OPENSSL_REVISION=f
@@ -36,25 +36,25 @@ BZIP2_VERSION=1.0.6
 XZ_VERSION=5.2.2
 
 # Supported OS
-OS= iOS tvOS watchOS
+OS=iOS tvOS watchOS
 
 # iOS targets
 TARGETS-iOS=iphonesimulator.x86_64 iphonesimulator.i386 iphoneos.armv7 iphoneos.armv7s iphoneos.arm64
 CFLAGS-iOS=-miphoneos-version-min=7.0
-CFLAGS-iphoneos.armv7=  -fembed-bitcode
-CFLAGS-iphoneos.armv7s= -fembed-bitcode
-CFLAGS-iphoneos.arm64=  -fembed-bitcode
+CFLAGS-iphoneos.armv7=-fembed-bitcode
+CFLAGS-iphoneos.armv7s=-fembed-bitcode
+CFLAGS-iphoneos.arm64=-fembed-bitcode
 
 # tvOS targets
 TARGETS-tvOS=appletvsimulator.x86_64 appletvos.arm64
 CFLAGS-tvOS=-mtvos-version-min=9.0
-CFLAGS-appletvos.arm64= -fembed-bitcode
-PYTHON_CONFIGURE-tvOS=  ac_cv_func_sigaltstack=no
+CFLAGS-appletvos.arm64=-fembed-bitcode
+PYTHON_CONFIGURE-tvOS=ac_cv_func_sigaltstack=no
 
 # watchOS targets
 TARGETS-watchOS=watchsimulator.i386 watchos.armv7k
 CFLAGS-watchOS=-mwatchos-version-min=2.0
-CFLAGS-watchos.armv7k=  -fembed-bitcode
+CFLAGS-watchos.armv7k=-fembed-bitcode
 PYTHON_CONFIGURE-watchOS=ac_cv_func_sigaltstack=no
 
 # override machine types for arm64
@@ -160,29 +160,29 @@ $(PYTHON_DIR-host)/dist/bin/python$(PYTHON_VER): $(PYTHON_DIR-host)/Makefile
 # - $1 - target
 # - $2 - OS
 define build-target
-ARCH-$1=	$$(subst .,,$$(suffix $1))
+ARCH-$1=$$(subst .,,$$(suffix $1))
 ifdef MACHINE_DETAILED-$$(ARCH-$1)
-MACHINE_DETAILED-$1= $$(MACHINE_DETAILED-$$(ARCH-$1))
+MACHINE_DETAILED-$1=$$(MACHINE_DETAILED-$$(ARCH-$1))
 else
-MACHINE_DETAILED-$1= $$(ARCH-$1)
+MACHINE_DETAILED-$1=$$(ARCH-$1)
 endif
 ifdef MACHINE_SIMPLE-$$(ARCH-$1)
-MACHINE_SIMPLE-$1= $$(MACHINE_SIMPLE-$$(ARCH-$1))
+MACHINE_SIMPLE-$1=$$(MACHINE_SIMPLE-$$(ARCH-$1))
 else
-MACHINE_SIMPLE-$1= $$(ARCH-$1)
+MACHINE_SIMPLE-$1=$$(ARCH-$1)
 endif
-SDK-$1=  $$(basename $1)
+SDK-$1=$$(basename $1)
 
-SDK_ROOT-$1=	$$(shell xcrun --sdk $$(SDK-$1) --show-sdk-path)
-CC-$1=			xcrun --sdk $$(SDK-$1) clang\
+SDK_ROOT-$1=$$(shell xcrun --sdk $$(SDK-$1) --show-sdk-path)
+CC-$1=xcrun --sdk $$(SDK-$1) clang\
 					-arch $$(ARCH-$1) --sysroot=$$(SDK_ROOT-$1) $$(CFLAGS-$2) $$(CFLAGS-$1)
-LDFLAGS-$1=	 -arch $$(ARCH-$1) -isysroot=$$(SDK_ROOT-$1)
+LDFLAGS-$1=-arch $$(ARCH-$1) -isysroot=$$(SDK_ROOT-$1)
 
-OPENSSL_DIR-$1= build/$2/openssl-$(OPENSSL_VERSION)-$1
-BZIP2_DIR-$1=   build/$2/bzip2-$(BZIP2_VERSION)-$1
-XZ_DIR-$1=	  build/$2/xz-$(XZ_VERSION)-$1
-PYTHON_DIR-$1=  build/$2/Python-$(PYTHON_VERSION)-$1
-pyconfig.h-$1=  pyconfig-$$(ARCH-$1).h
+OPENSSL_DIR-$1=build/$2/openssl-$(OPENSSL_VERSION)-$1
+BZIP2_DIR-$1=build/$2/bzip2-$(BZIP2_VERSION)-$1
+XZ_DIR-$1=build/$2/xz-$(XZ_VERSION)-$1
+PYTHON_DIR-$1=build/$2/Python-$(PYTHON_VERSION)-$1
+pyconfig.h-$1=pyconfig-$$(ARCH-$1).h
 
 # Unpack OpenSSL
 $$(OPENSSL_DIR-$1)/Makefile: downloads/openssl-$(OPENSSL_VERSION).tgz
@@ -254,6 +254,8 @@ $$(PYTHON_DIR-$1)/Makefile: downloads/Python-$(PYTHON_VERSION).tgz $(PYTHON_HOST
 	# Apply target Python patches
 	cd $$(PYTHON_DIR-$1) && patch -p1 <$(PROJECT_DIR)/patch/Python/Python.patch
 	cp -f $(PROJECT_DIR)/patch/Python/Setup.embedded $$(PYTHON_DIR-$1)/Modules/Setup.embedded
+	# Copy in the host _freeze_importlib
+	cp $(PYTHON_DIR-host)/Programs/_freeze_importlib $$(PYTHON_DIR-$1)/iOS/_freeze_importlib
 	# Configure target Python
 	cd $$(PYTHON_DIR-$1) && PATH=$(PROJECT_DIR)/$(PYTHON_DIR-host)/dist/bin:$(PATH) ./configure \
 		CC="$$(CC-$1)" LD="$$(CC-$1)" \
@@ -295,11 +297,11 @@ endef
 define build
 $$(foreach target,$$(TARGETS-$1),$$(eval $$(call build-target,$$(target),$1)))
 
-OPENSSL_FRAMEWORK-$1=   build/$1/OpenSSL.framework
-BZIP2_LIB-$1=		   build/$1/bzip2/lib/libbz2.a
-XZ_LIB-$1=			  build/$1/xz/lib/liblzma.a
-PYTHON_FRAMEWORK-$1=	build/$1/Python.framework
-PYTHON_RESOURCES-$1=	$$(PYTHON_FRAMEWORK-$1)/Versions/$(PYTHON_VER)/Resources
+OPENSSL_FRAMEWORK-$1=build/$1/OpenSSL.framework
+BZIP2_LIB-$1=build/$1/bzip2/lib/libbz2.a
+XZ_LIB-$1=build/$1/xz/lib/liblzma.a
+PYTHON_FRAMEWORK-$1=build/$1/Python.framework
+PYTHON_RESOURCES-$1=$$(PYTHON_FRAMEWORK-$1)/Versions/$(PYTHON_VER)/Resources
 
 $1: dist/Python-$(PYTHON_VERSION)-$1-support.b$(BUILD_NUMBER).tar.gz
 

README.rst

@@ -28,7 +28,6 @@ This should enable the code to run on:
     - iPad Air
     - iPad Air 2
     - iPad retina
-    - iPad Pro
 * iPad Mini
     - iPad Mini (1st gen)
     - iPad Mini 2
@@ -42,7 +41,7 @@ This should enable the code to run on:
     - 4th gen
 * Apple Watch
 
-This repository branch builds a packaged version of **Python 3.4.2**.
+This repository branch builds a packaged version of **Python 3.5.1**.
 Other Python versions are available by cloning other branches of the main
 repository.