summaryrefslogtreecommitdiff
path: root/pkg/build_bundle_with_venv.sh
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2018-02-11 22:31:54 +0100
committerKali Kaneko <kali@leap.se>2018-02-15 16:36:42 +0100
commit03e4bae0942c58344d6021fdaa08342baa7aea3c (patch)
treee9cf6154c44016bdca3c98ed2a4c174b5fb8b972 /pkg/build_bundle_with_venv.sh
parentf5839b1938ba7ab96f0d9777520a564975470f51 (diff)
[feat] implement fallback to webkit for bundles
in the end, depending on webengine didn't seem to be such a great idea: it makes bundles more complex, heavy and brittle. I tried compiling qt5 and the maintained qtwebkit fork, but that had also its own set of problems (lastly, pyinstaller didn't work properly; pyqt also adds a lot of garbage even if you disabled lots of modules you don't need). so, this is a fallback to a stretch-based build. it fixes the libGL library by adding the right version into the bundle. in this commit I also add a dockerfile for an image that can build bundles by installing pip dependencies directly in the system. this has the advantage that the build process is very fast, but the downside that a new image needs to be pushed to the registry each time that new dependencies are added; we'll also miss any bug due to introducing new dependncies (but hopefully it will be catched by other steps in the CI). The good side of it is that it reduces the need for some hacks in the build process when bundling from a virtualenv.
Diffstat (limited to 'pkg/build_bundle_with_venv.sh')
-rwxr-xr-xpkg/build_bundle_with_venv.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/build_bundle_with_venv.sh b/pkg/build_bundle_with_venv.sh
index 7e963ff6..e6f05f01 100755
--- a/pkg/build_bundle_with_venv.sh
+++ b/pkg/build_bundle_with_venv.sh
@@ -27,7 +27,7 @@ $VIRTUAL_ENV/bin/pip install appdirs packaging
# dev version
# $VIRTUAL_ENV/bin/pip install -U git+https://github.com/pyinstaller/pyinstaller.git@develop
# try bjones WIP Qt5 branch
-$VIRTUAL_ENV/bin/pip install -U git+https://github.com/bjones1/pyinstaller.git@pyqt5_testing
+$VIRTUAL_ENV/bin/pip install -U git+https://github.com/bjones1/pyinstaller.git@pyqt5_fix
# ------------------------------------------------------------------------------------------------
$VIRTUAL_ENV/bin/pip install zope.interface zope.proxy