From b171d25859f9f8c67275d1aad9a4ef90735b9490 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=A4rkl?= Date: Sat, 14 Apr 2018 11:39:44 +0200 Subject: [PATCH] Move Code from .travis.yml to scripts/ --- .travis.yml | 92 +++++++++----------------- scripts/appbundle_embed_python.sh | 24 +++++++ scripts/appbundle_patch_qtwebengine.sh | 33 +++++++++ scripts/prepare_python_linux.sh | 21 ++++++ scripts/prepare_python_macos.sh | 19 ++++++ 5 files changed, 129 insertions(+), 60 deletions(-) create mode 100755 scripts/appbundle_embed_python.sh create mode 100755 scripts/appbundle_patch_qtwebengine.sh create mode 100755 scripts/prepare_python_linux.sh create mode 100755 scripts/prepare_python_macos.sh diff --git a/.travis.yml b/.travis.yml index f577d00e..e176fb12 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,69 +29,14 @@ before_install: ; fi install: - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then - brew install p7zip ccache qt5 openssl xz && - export PATH="/usr/local/opt/qt/bin:$PATH" && - mkdir python && cd python && wget "https://www.python.org/ftp/python/3.6.4/Python-3.6.4.tar.xz" && tar -xf Python-3.6.4.tar.xz && - export PYTHON_FRAMEWORK_DIR="`pwd`/framework" && cd Python-3.6.4 && - CPPFLAGS="-I$(brew --prefix openssl)/include" LDFLAGS="-L$(brew --prefix openssl)/lib" ./configure --enable-framework=$PYTHON_FRAMEWORK_DIR && - make -j4 && make frameworkinstallframework > /dev/null && - PYTHONHOME=$PYTHON_FRAMEWORK_DIR/Python.framework/Versions/Current $PYTHON_FRAMEWORK_DIR/Python.framework/Versions/Current/bin/pip3 install jupyter && - cd ../.. - ; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install p7zip ccache qt5 openssl xz ; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export PATH="/usr/local/opt/qt/bin:$PATH" ; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then source scripts/prepare_python_macos.sh ; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get -y install qt59base qt59svg qt59webengine --allow-unauthenticated && - source /opt/qt5*/bin/qt5*-env.sh && - mkdir python && cd python && wget "https://www.python.org/ftp/python/3.6.4/Python-3.6.4.tar.xz" && tar -xf Python-3.6.4.tar.xz && - export CUSTOM_PYTHON_PREFIX="`pwd`/prefix" && cd Python-3.6.4 && - echo "Building Python to install to prefix $CUSTOM_PYTHON_PREFIX" && - ./configure --enable-shared --prefix=$CUSTOM_PYTHON_PREFIX && make -j4 && make install > /dev/null && - PYTHONHOME=$CUSTOM_PYTHON_PREFIX LD_LIBRARY_PATH=$CUSTOM_PYTHON_PREFIX/lib "$CUSTOM_PYTHON_PREFIX/bin/pip3" install jupyter && - cd ../.. - ; fi - -after_success: - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then - macdeployqt Cutter.app && - - install_name_tool `otool -L Cutter.app/Contents/Frameworks/QtWebEngineCore.framework/Helpers/QtWebEngineProcess.app/Contents/MacOS/QtWebEngineProcess | sed -n "s/^[[:blank:]]*\(\/usr\/local\/Cellar[^[:blank:]]*\(Qt[A-Za-z]*\.framework[^[:blank:]]*\)\) (.*$/-change \1 @executable_path\/..\/..\/..\/..\/..\/..\/..\/\2/p"` Cutter.app/Contents/Frameworks/QtWebEngineCore.framework/Helpers/QtWebEngineProcess.app/Contents/MacOS/QtWebEngineProcess && - mkdir -p Cutter.app/Contents/Frameworks/QtWebEngineCore.framework/Helpers/QtWebEngineProcess.app/Contents/Frameworks && - ln -s ../../../../../../../QtCore.framework Cutter.app/Contents/Frameworks/QtWebEngineCore.framework/Helpers/QtWebEngineProcess.app/Contents/Frameworks/ && - ln -s ../../../../../../../QtQuick.framework Cutter.app/Contents/Frameworks/QtWebEngineCore.framework/Helpers/QtWebEngineProcess.app/Contents/Frameworks/ && - ln -s ../../../../../../../QtGui.framework Cutter.app/Contents/Frameworks/QtWebEngineCore.framework/Helpers/QtWebEngineProcess.app/Contents/Frameworks/ && - ln -s ../../../../../../../QtQml.framework Cutter.app/Contents/Frameworks/QtWebEngineCore.framework/Helpers/QtWebEngineProcess.app/Contents/Frameworks/ && - ln -s ../../../../../../../QtNetwork.framework Cutter.app/Contents/Frameworks/QtWebEngineCore.framework/Helpers/QtWebEngineProcess.app/Contents/Frameworks/ && - ln -s ../../../../../../../QtWebChannel.framework Cutter.app/Contents/Frameworks/QtWebEngineCore.framework/Helpers/QtWebEngineProcess.app/Contents/Frameworks/ && - ln -s ../../../../../../../QtPositioning.framework Cutter.app/Contents/Frameworks/QtWebEngineCore.framework/Helpers/QtWebEngineProcess.app/Contents/Frameworks/ && - - mkdir -p Cutter.app/Contents/Frameworks && - cp -a "$PYTHON_FRAMEWORK_DIR/Python.framework" Cutter.app/Contents/Frameworks/ && - install_name_tool -change `otool -L Cutter.app/Contents/MacOS/Cutter | sed -n "s/^[[:blank:]]*\([^[:blank:]]*Python\) (.*$/\1/p"` @executable_path/../Frameworks/Python.framework/Versions/Current/Python Cutter.app/Contents/MacOS/Cutter && - cd Cutter.app/Contents/Frameworks/Python.framework && - find . | grep -E "(__pycache__|\.pyc|\.pyo$)" | xargs rm -rf && - rm -r Versions/Current/Resources/* Versions/Current/lib/python3.6/test Versions/Current/lib/python3.6/idlelib Versions/Current/lib/python3.6/curses Versions/Current/lib/python3.6/lib2to3 && - cd ../../../.. && - mkdir image && cp -a Cutter.app image/ && - hdiutil create -srcfolder image -volname Cutter -fs HFS+ Cutter.dmg && - export FILE_TO_UPLOAD="Cutter.dmg" - ; fi - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then - sudo make INSTALL_ROOT=appdir install && - sudo chown -R $USER appdir && - cp -r /usr/share/radare2 appdir/usr/share/ && - cp -RT "$CUSTOM_PYTHON_PREFIX" appdir/usr/ && - cd appdir/usr/ && - find . | grep -E "(__pycache__|\.pyc|\.pyo$)" | xargs rm -rf && - rm -r lib/python3.6/test lib/python3.6/idlelib lib/python3.6/curses lib/python3.6/lib2to3 && - cd ../.. && - wget -c "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" && - chmod a+x linuxdeployqt*.AppImage && - unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH && - LD_LIBRARY_PATH=$CUSTOM_PYTHON_PREFIX/lib ./linuxdeployqt*.AppImage ./appdir/usr/share/applications/*.desktop -bundle-non-qt-libs -no-strip -verbose=2 && - LD_LIBRARY_PATH=$CUSTOM_PYTHON_PREFIX/lib ./linuxdeployqt*.AppImage ./appdir/usr/share/applications/*.desktop -appimage -no-strip -verbose=2 && - find ./appdir -executable -type f -exec ldd {} \; | grep " => /usr" | cut -d " " -f 2-3 | sort | uniq && - export FILE_TO_UPLOAD="Cutter-x86_64.AppImage" + source /opt/qt5*/bin/qt5*-env.sh ; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then source scripts/prepare_python_linux.sh ; fi before_script: - git submodule init ; git submodule update @@ -126,6 +71,33 @@ script: fi fi +after_success: + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then + macdeployqt Cutter.app && + "$TRAVIS_BUILD_DIR/scripts/appbundle_patch_qtwebengine.sh" Cutter.app && + "$TRAVIS_BUILD_DIR/scripts/appbundle_embed_python.sh" "$PYTHON_FRAMEWORK_DIR/Python.framework" Cutter.app Cutter.app/Contents/MacOS/Cutter && + mkdir image && cp -a Cutter.app image/ && + hdiutil create -srcfolder image -volname Cutter -fs HFS+ Cutter.dmg && + export FILE_TO_UPLOAD="Cutter.dmg" + ; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then + sudo make INSTALL_ROOT=appdir install && + sudo chown -R $USER appdir && + cp -r /usr/share/radare2 appdir/usr/share/ && + cp -RT "$CUSTOM_PYTHON_PREFIX" appdir/usr/ && + cd appdir/usr/ && + find . | grep -E "(__pycache__|\.pyc|\.pyo$)" | xargs rm -rf && + rm -r lib/python3.6/test lib/python3.6/idlelib lib/python3.6/curses lib/python3.6/lib2to3 && + cd ../.. && + wget -c "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" && + chmod a+x linuxdeployqt*.AppImage && + unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH && + LD_LIBRARY_PATH=$CUSTOM_PYTHON_PREFIX/lib ./linuxdeployqt*.AppImage ./appdir/usr/share/applications/*.desktop -bundle-non-qt-libs -no-strip -verbose=2 && + LD_LIBRARY_PATH=$CUSTOM_PYTHON_PREFIX/lib ./linuxdeployqt*.AppImage ./appdir/usr/share/applications/*.desktop -appimage -no-strip -verbose=2 && + find ./appdir -executable -type f -exec ldd {} \; | grep " => /usr" | cut -d " " -f 2-3 | sort | uniq && + export FILE_TO_UPLOAD="Cutter-x86_64.AppImage" + ; fi + deploy: skip_cleanup: true provider: releases diff --git a/scripts/appbundle_embed_python.sh b/scripts/appbundle_embed_python.sh new file mode 100755 index 00000000..6d7b4b23 --- /dev/null +++ b/scripts/appbundle_embed_python.sh @@ -0,0 +1,24 @@ +#!/bin/bash + +if ! [[ $# -eq 3 ]]; then + echo "Usage: $0 [Python.framework] [AppBundle.app] [AppBundle.app/Contents/MacOS/Executable]" + exit 1 +fi + +py_framework=$1 +appbundle=$2 +executable=$3 + +echo "Embedding $py_framework into $appbundle" + +mkdir -p "$appbundle/Contents/Frameworks" || exit 1 +cp -a "$py_framework" "$appbundle/Contents/Frameworks/" || exit 1 + +echo "Making executable $executable point to embedded Framework" +install_name_tool -change `otool -L "$executable" | sed -n "s/^[[:blank:]]*\([^[:blank:]]*Python\) (.*$/\1/p"` @executable_path/../Frameworks/Python.framework/Versions/Current/Python "$executable" + +echo "Cleaning up embedded Python Framework" +cd "$appbundle/Contents/Frameworks/Python.framework" || exit 1 +find . | grep -E "(__pycache__|\.pyc|\.pyo$)" | xargs rm -rf || exit 1 +rm -r Versions/Current/Resources/* Versions/Current/lib/python3.6/test Versions/Current/lib/python3.6/idlelib Versions/Current/lib/python3.6/curses Versions/Current/lib/python3.6/lib2to3 || exit 1 + diff --git a/scripts/appbundle_patch_qtwebengine.sh b/scripts/appbundle_patch_qtwebengine.sh new file mode 100755 index 00000000..3e1fad9b --- /dev/null +++ b/scripts/appbundle_patch_qtwebengine.sh @@ -0,0 +1,33 @@ +#!/bin/bash + +if ! [[ $# -eq 1 ]]; then + echo "Usage: $0 [AppBundle.app]" + exit 1 +fi + +appbundle=$1 +qtwebegineprocess="$1/Contents/Frameworks/QtWebEngineCore.framework/Helpers/QtWebEngineProcess.app/Contents/MacOS/QtWebEngineProcess" + +echo "Patching $appbundle to fix QtWebEngine" + +if ! [[ -f "$qtwebegineprocess" ]]; then + echo "$qtwebegineprocess does not exist. Did you forget to run macdeployqt?" + exit 1 +fi + +install_name_tool `otool -L "$qtwebegineprocess" | sed -n "s/^[[:blank:]]*\(\/usr\/local\/Cellar[^[:blank:]]*\(Qt[A-Za-z]*\.framework[^[:blank:]]*\)\) (.*$/-change \1 @executable_path\/..\/..\/..\/..\/..\/..\/..\/\2/p"` \ + $1/Contents/Frameworks/QtWebEngineCore.framework/Helpers/QtWebEngineProcess.app/Contents/MacOS/QtWebEngineProcess \ + || exit 1 + +mkdir -p $1/Contents/Frameworks/QtWebEngineCore.framework/Helpers/QtWebEngineProcess.app/Contents/Frameworks +ln -s ../../../../../../../QtCore.framework $1/Contents/Frameworks/QtWebEngineCore.framework/Helpers/QtWebEngineProcess.app/Contents/Frameworks/ +ln -s ../../../../../../../QtQuick.framework $1/Contents/Frameworks/QtWebEngineCore.framework/Helpers/QtWebEngineProcess.app/Contents/Frameworks/ +ln -s ../../../../../../../QtGui.framework $1/Contents/Frameworks/QtWebEngineCore.framework/Helpers/QtWebEngineProcess.app/Contents/Frameworks/ +ln -s ../../../../../../../QtQml.framework $1/Contents/Frameworks/QtWebEngineCore.framework/Helpers/QtWebEngineProcess.app/Contents/Frameworks/ +ln -s ../../../../../../../QtNetwork.framework $1/Contents/Frameworks/QtWebEngineCore.framework/Helpers/QtWebEngineProcess.app/Contents/Frameworks/ +ln -s ../../../../../../../QtWebChannel.framework $1/Contents/Frameworks/QtWebEngineCore.framework/Helpers/QtWebEngineProcess.app/Contents/Frameworks/ +ln -s ../../../../../../../QtPositioning.framework $1/Contents/Frameworks/QtWebEngineCore.framework/Helpers/QtWebEngineProcess.app/Contents/Frameworks/ + + + + diff --git a/scripts/prepare_python_linux.sh b/scripts/prepare_python_linux.sh new file mode 100755 index 00000000..1b7271f3 --- /dev/null +++ b/scripts/prepare_python_linux.sh @@ -0,0 +1,21 @@ +#!/bin/bash + +mkdir python && cd python + +wget "https://www.python.org/ftp/python/3.6.4/Python-3.6.4.tar.xz" || exit 1 +tar -xf Python-3.6.4.tar.xz || exit 1 + +export CUSTOM_PYTHON_PREFIX="`pwd`/prefix" + +cd Python-3.6.4 || exit 1 +echo "Building Python to install to prefix $CUSTOM_PYTHON_PREFIX" + +./configure --enable-shared --prefix=$CUSTOM_PYTHON_PREFIX || exit 1 +make -j4 || exit 1 +make install > /dev/null || exit 1 + +PYTHONHOME=$CUSTOM_PYTHON_PREFIX \ + LD_LIBRARY_PATH=$CUSTOM_PYTHON_PREFIX/lib \ + "$CUSTOM_PYTHON_PREFIX/bin/pip3" install jupyter || exit 1 + +cd ../.. diff --git a/scripts/prepare_python_macos.sh b/scripts/prepare_python_macos.sh new file mode 100755 index 00000000..bac0018f --- /dev/null +++ b/scripts/prepare_python_macos.sh @@ -0,0 +1,19 @@ +#!/bin/bash + +mkdir python && cd python + +wget "https://www.python.org/ftp/python/3.6.4/Python-3.6.4.tar.xz" || exit 1 +tar -xf Python-3.6.4.tar.xz || exit 1 + +export PYTHON_FRAMEWORK_DIR="`pwd`/framework" + +cd Python-3.6.4 || exit 1 + +CPPFLAGS="-I$(brew --prefix openssl)/include" LDFLAGS="-L$(brew --prefix openssl)/lib" ./configure --enable-framework=$PYTHON_FRAMEWORK_DIR || exit 1 +make -j4 || exit 1 +make frameworkinstallframework > /dev/null || exit 1 + +PYTHONHOME=$PYTHON_FRAMEWORK_DIR/Python.framework/Versions/Current \ + $PYTHON_FRAMEWORK_DIR/Python.framework/Versions/Current/bin/pip3 install jupyter || exit 1 + +cd ../..