From 13fe706716a383e12b47c0458324580b6b12b84c Mon Sep 17 00:00:00 2001 From: Lex Neva Date: Fri, 15 Nov 2019 13:09:53 -0500 Subject: windows build github action --- bin/build-python | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bin/build-python') diff --git a/bin/build-python b/bin/build-python index c740c782..7326e371 100755 --- a/bin/build-python +++ b/bin/build-python @@ -35,7 +35,7 @@ pyinstaller_args+="-p inkscape/share/extensions " pyinstaller_args+="--log-level DEBUG " if [ "$BUILD" = "windows" ]; then - wine c:\\Python\\scripts\\pyinstaller.exe $pyinstaller_args inkstitch.py + pyinstaller $pyinstaller_args inkstitch.py else # without the LD_LIBRARY_PATH, it seems that pyinstaller can't find all of # wxpython's shared libraries -- cgit v1.2.3 From 8614760b743b4bde1e2e148c66c424214c5d1809 Mon Sep 17 00:00:00 2001 From: Lex Neva Date: Mon, 27 Jan 2020 15:39:45 -0500 Subject: use python -m for pyinstaller --- bin/build-python | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bin/build-python') diff --git a/bin/build-python b/bin/build-python index 7326e371..bbd2af87 100755 --- a/bin/build-python +++ b/bin/build-python @@ -35,11 +35,11 @@ pyinstaller_args+="-p inkscape/share/extensions " pyinstaller_args+="--log-level DEBUG " if [ "$BUILD" = "windows" ]; then - pyinstaller $pyinstaller_args inkstitch.py + python -m PyInstaller $pyinstaller_args inkstitch.py else # without the LD_LIBRARY_PATH, it seems that pyinstaller can't find all of # wxpython's shared libraries - LD_LIBRARY_PATH="${site_packages}/wx" pyinstaller $pyinstaller_args --strip inkstitch.py; + LD_LIBRARY_PATH="${site_packages}/wx" python -m PyInstaller $pyinstaller_args --strip inkstitch.py; fi # pyinstaller put a whole mess of libraries under dist/inkstitch. We'd like -- cgit v1.2.3 From 6573b167958ff1de882466acc455d2dfed767fe1 Mon Sep 17 00:00:00 2001 From: Lex Neva Date: Mon, 27 Jan 2020 22:22:22 -0500 Subject: remove obselete TRAVIS_ references --- bin/build-python | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'bin/build-python') diff --git a/bin/build-python b/bin/build-python index bbd2af87..69058593 100755 --- a/bin/build-python +++ b/bin/build-python @@ -4,7 +4,7 @@ set -e site_packages="$(python -c "import os; print(os.path.dirname(os.__file__) + '/site-packages')")" -if [ "$TRAVIS_OS_NAME" = "linux" -a "$BUILD" != "windows" ]; then +if [ "$BUILD" = "linux" ]; then # pyinstaller misses these two 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:. " @@ -24,7 +24,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 [ "$TRAVIS_OS_NAME" = "osx" ]; then +if [ "$BUILD" = "osx" ]; then pyinstaller_args+="--windowed " fi @@ -52,7 +52,7 @@ mv dist/inkstitch/* dist/bin mv dist/bin dist/inkstitch # on Mac, pyinstaller creates a .app version as well, but we don't need that -if [ "$TRAVIS_OS_NAME" = "osx" ]; then +if [ "$BUILD" = "osx" ]; then rm -rf dist/inkstitch.app/ fi -- cgit v1.2.3