diff --git a/src/travis/osx-x86_64-before-install.sh b/src/travis/osx-x86_64-before-install.sh index fb412d11..f330a0fa 100755 --- a/src/travis/osx-x86_64-before-install.sh +++ b/src/travis/osx-x86_64-before-install.sh @@ -1,6 +1,43 @@ -brew update -brew upgrade openssl@1.1 -brew upgrade python3 +whereibelong=$(pwd) +brew install xz + +# Compile latest OpenSSL +OPENSSL_VER=1.1.1b +wget https://www.openssl.org/source/openssl-$OPENSSL_VER.tar.gz +echo "Extracting OpenSSL..." +tar xf openssl-$OPENSSL_VER.tar.gz +cd openssl-$OPENSSL_VER +echo "Compiling OpenSSL $OPENSSL_VER..." +./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 ~ + +# Compile latest Python +PYTHON_VER=3.7.3 +wget https://www.python.org/ftp/python/$PYTHON_VER/Python-$PYTHON_VER.tar.xz +echo "Extracting Python..." +tar xf Python-$PYTHON_VER.tar.xz +cd Python-$PYTHON_VER +echo "Compiling Python $PYTHON_VER..." +./configure --with-openssl=$mypath/ssl --enable-shared \ + --prefix=$mypath/python --with-ensurepip=upgrade > /dev/null +make -j$cpucount -s +echo "Installing Python..." +make install > /dev/null +cd ~ + +export LD_LIBRARY_PATH=~/ssl/lib:~/python/lib +python=~/python/bin/python3 +pip=~/python/bin/pip3 + +$python -V + +cd $whereibelong + export PATH=/usr/local/opt/python/libexec/bin:$PATH pip install --upgrade pip pip freeze > upgrades.txt diff --git a/src/travis/windows-x86-before-install.sh b/src/travis/windows-x86-before-install.sh index 059b1b1b..49d8b5c4 100755 --- a/src/travis/windows-x86-before-install.sh +++ b/src/travis/windows-x86-before-install.sh @@ -1,7 +1,6 @@ powershell Install-WindowsFeature Net-Framework-Core cinst -y --forcex86 python3 cinst -y --forcex86 openssl.light -/c/Program\ Files/OpenSSL/openssl version cp -v /c/Program\ Files/OpenSSL/*.dll /c/Python37/DLLs export PATH=$PATH:/c/Python37/scripts cinst -y wixtoolset diff --git a/src/travis/windows-x86_64-before-install.sh b/src/travis/windows-x86_64-before-install.sh index 9e4ff54d..74fa8824 100755 --- a/src/travis/windows-x86_64-before-install.sh +++ b/src/travis/windows-x86_64-before-install.sh @@ -1,7 +1,6 @@ powershell Install-WindowsFeature Net-Framework-Core cinst -y python3 cinst -y openssl.light -/c/Program\ Files/OpenSSL/openssl version cp -v /c/Program\ Files/OpenSSL/bin/*.dll /c/Python37/DLLs export PATH=$PATH:/c/Python37/scripts cinst -y wixtoolset