diff options
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/build-distribution-archives | 2 | ||||
| -rwxr-xr-x | bin/build-python | 10 |
2 files changed, 5 insertions, 7 deletions
diff --git a/bin/build-distribution-archives b/bin/build-distribution-archives index 825db510..ff2f3e79 100755 --- a/bin/build-distribution-archives +++ b/bin/build-distribution-archives @@ -1,6 +1,6 @@ #!/bin/bash -VERSION="$(echo ${GITHUB_REF} | tr / -)" +VERSION="$(echo ${GITHUB_REF#refs/heads/} | tr / -)" OS="${BUILD:-$(uname)}" ARCH="$(uname -m)" diff --git a/bin/build-python b/bin/build-python index 69058593..0dd3e0a0 100755 --- a/bin/build-python +++ b/bin/build-python @@ -5,9 +5,11 @@ set -e site_packages="$(python -c "import os; print(os.path.dirname(os.__file__) + '/site-packages')")" if [ "$BUILD" = "linux" ]; then - # pyinstaller misses these two + # pyinstaller misses these pyinstaller_args+="--add-binary /usr/lib/x86_64-linux-gnu/gio/modules/libgiolibproxy.so:. " pyinstaller_args+="--add-binary /usr/lib/x86_64-linux-gnu/libproxy.so.1:. " + pyinstaller_args+="--add-binary /lib/x86_64-linux-gnu/libnsl.so.1:. " + pyinstaller_args+="--add-binary /usr/lib/x86_64-linux-gnu/libxcb.so.1:. " fi # This one's tricky. ink/stitch doesn't actually _use_ gi.repository.Gtk, @@ -24,7 +26,7 @@ pyinstaller_args+="--hidden-import wx " # We need to use the precompiled bootloader linked with graphical Mac OS X # libraries if we develop a GUI application for Mac: -if [ "$BUILD" = "osx" ]; then +if [ "$BUILD" = "osx" -o "$BUILD" = "windows" ]; then pyinstaller_args+="--windowed " fi @@ -55,7 +57,3 @@ mv dist/bin dist/inkstitch if [ "$BUILD" = "osx" ]; then rm -rf dist/inkstitch.app/ fi - -# Inkscape doesn't let us run native binaries as extensions(?!). Instead we -# add this stub script which executes the binary that pyinstaller creates. -cp stub.py dist/inkstitch.py |