From 443f4e707b2090a19c22b5f200aa975109c4b511 Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Fri, 26 Jul 2019 11:33:00 -0400
Subject: [PATCH] Use MacOS Python binary, fix Win32 Pyinstaller build

---
 src/travis/osx-x86_64-before-install.sh  | 94 +++++++++++++-----------
 src/travis/windows-x86-before-install.sh |  4 +-
 2 files changed, 53 insertions(+), 45 deletions(-)

diff --git a/src/travis/osx-x86_64-before-install.sh b/src/travis/osx-x86_64-before-install.sh
index 8b98e300..47da3d29 100755
--- a/src/travis/osx-x86_64-before-install.sh
+++ b/src/travis/osx-x86_64-before-install.sh
@@ -1,54 +1,62 @@
 mypath=$HOME
 whereibelong=$(pwd)
-echo "Brew installing xz..."
-brew install xz > /dev/null
+#echo "Brew installing xz..."
+#brew install xz > /dev/null
 
 cd ~/pybuild
-# Compile latest OpenSSL
-if [ ! -d openssl-$BUILD_OPENSSL_VERSION ]; then
-  wget --quiet https://www.openssl.org/source/openssl-$BUILD_OPENSSL_VERSION.tar.gz
-  echo "Extracting OpenSSL..."
-  tar xf openssl-$BUILD_OPENSSL_VERSION.tar.gz
+
+if [ ! -f python-$BUILD_PYTHON_VERSION-macosx10.9.pkg ]; then
+  wget --quiet https://www.python.org/ftp/python/$BUILD_PYTHON_VERSION/python-$BUILD_PYTHON_VERSION-macosx10.9.pkg
 fi
-cd openssl-$BUILD_OPENSSL_VERSION
-echo "Compiling OpenSSL $BUILD_OPENSSL_VERSION..."
-./config shared --prefix=$mypath/ssl
-echo "Running make for OpenSSL..."
-make -j$cpucount -s
-echo "Running make install for OpenSSL..."
-make install > /dev/null
-export LD_LIBRARY_PATH=~/ssl/lib
-cd ~/pybuild
+sudo installer -pkg python-$BUILD_PYTHON_VERSION-macosx10.9.pkg -target /
+export python=python3
+
+# Compile latest OpenSSL
+#if [ ! -d openssl-$BUILD_OPENSSL_VERSION ]; then
+#  wget --quiet https://www.openssl.org/source/openssl-$BUILD_OPENSSL_VERSION.tar.gz
+#  echo "Extracting OpenSSL..."
+#  tar xf openssl-$BUILD_OPENSSL_VERSION.tar.gz
+#fi
+#cd openssl-$BUILD_OPENSSL_VERSION
+#echo "Compiling OpenSSL $BUILD_OPENSSL_VERSION..."
+#./config shared --prefix=$mypath/ssl
+#echo "Running make for OpenSSL..."
+#make -j$cpucount -s
+#echo "Running make install for OpenSSL..."
+#make install > /dev/null
+#export LD_LIBRARY_PATH=~/ssl/lib
+#cd ~/pybuild
 
 # Compile latest Python
-if [ ! -d Python-$BUILD_PYTHON_VERSION ]; then
-  wget --quiet https://www.python.org/ftp/python/$BUILD_PYTHON_VERSION/Python-$BUILD_PYTHON_VERSION.tar.xz
-  echo "Extracting Python..."
-  tar xf Python-$BUILD_PYTHON_VERSION.tar.xz
-fi
-cd Python-$BUILD_PYTHON_VERSION
-echo "Compiling Python $BUILD_PYTHON_VERSION..."
-safe_flags="--with-openssl=$mypath/ssl --enable-shared --prefix=$mypath/python --with-ensurepip=upgrade"
-unsafe_flags="--enable-optimizations --with-lto"
-if [ ! -e Makefile ]; then
-  ./configure $safe_flags $unsafe_flags > /dev/null
-fi
-make -j$cpucount -s
-RESULT=$?
-echo "Make Python exited with $RESULT"
-if [ $RESULT != 0 ]; then
-  echo "Trying Python make again without unsafe flags..."
-  make clean
-  ./configure $safe_flags > /dev/null
-  make -j$cpucount -s
-fi
-echo "Installing Python..."
-make install > /dev/null
-cd ~
+#if [ ! -d Python-$BUILD_PYTHON_VERSION ]; then
+#  wget --quiet https://www.python.org/ftp/python/$BUILD_PYTHON_VERSION/Python-$BUILD_PYTHON_VERSION.tar.xz
+#  echo "Extracting Python..."
+#  tar xf Python-$BUILD_PYTHON_VERSION.tar.xz
+#fi
+#cd Python-$BUILD_PYTHON_VERSION
+#echo "Compiling Python $BUILD_PYTHON_VERSION..."
+#safe_flags="--with-openssl=$mypath/ssl --enable-shared --prefix=$mypath/python --with-ensurepip=upgrade"
+#unsafe_flags="--enable-optimizations --with-lto"
+#if [ ! -e Makefile ]; then
+#  ./configure $safe_flags $unsafe_flags > /dev/null
+#fi
+#make -j$cpucount -s
+#RESULT=$?
+#echo "Make Python exited with $RESULT"
+#if [ $RESULT != 0 ]; then
+#  echo "Trying Python make again without unsafe flags..."
+#  make clean
+#  ./configure $safe_flags > /dev/null
+#  make -j$cpucount -s
+#fi
+#echo "Installing Python..."
+#make install > /dev/null
+#cd ~
+
+#export LD_LIBRARY_PATH=~/ssl/lib:~/python/lib
+#python=~/python/bin/python3
+#pip=~/python/bin/pip3
 
-export LD_LIBRARY_PATH=~/ssl/lib:~/python/lib
-python=~/python/bin/python3
-pip=~/python/bin/pip3
 
 $python -V
 
diff --git a/src/travis/windows-x86-before-install.sh b/src/travis/windows-x86-before-install.sh
index 056333f1..6b76889c 100755
--- a/src/travis/windows-x86-before-install.sh
+++ b/src/travis/windows-x86-before-install.sh
@@ -36,8 +36,8 @@ tar xf PyInstaller-$PYINSTALLER_VERSION.tar.gz
 cd PyInstaller-$PYINSTALLER_VERSION/bootloader
 echo "bootloader before:"
 md5sum ../PyInstaller/bootloader/Windows-32bit/
-python ./waf all
+python3 ./waf all
 echo "bootloader after:"
 md5sum ../PyInstaller/bootloader/Windows-32bit/
 cd ..
-python setup.py install
+python3 setup.py install