windows build fixes

.travis.yml

@@ -65,12 +65,9 @@ install:
     
       pip install pyinstaller
     elif [ "$BUILD" = "windows" ]; then
-      set -x
-
-      # Need inkscape >=0.92 for inkex.py and friends
-      sudo add-apt-repository --yes ppa:inkscape.dev/stable
-      sudo apt-get update
-      sudo apt-get install inkscape
+      # Need this for inkex.py and friends
+      wget -q https://inkscape.org/en/gallery/item/11254/inkscape-0.92.2.tar.bz2
+      tar jxf inkscape-0.92.2.tar.bz2
 
       sudo add-apt-repository ppa:ubuntu-wine/ppa -y
       sudo apt-get update -qq
@@ -81,21 +78,17 @@ install:
 
       export WINEDEBUG=-all
 
+      wget https://github.com/lexelby/inkstitch-build-objects/releases/download/v1.0.0/windows-libembroidery.tar.gz
+      wget https://github.com/lexelby/inkstitch-build-objects/releases/download/v1.0.0/Shapely-1.6.3-cp27-cp27m-win32.whl
       wget https://www.python.org/ftp/python/2.7.14/python-2.7.14.msi --output-document=python.msi
       wget http://download.microsoft.com/download/1/1/1/1116b75a-9ec3-481a-a3c8-1777b5381140/vcredist_x86.exe
-      #wget http://ftp.gnome.org/pub/GNOME/binaries/win32/pygtk/2.24/pygtk-all-in-one-2.24.2.win32-py2.7.msi --output-document=pygtk.msi
-      wget https://ayera.dl.sourceforge.net/project/pygobjectwin32/pygi-aio-3.24.1_rev1-setup_049a323fe25432b10f7e9f543b74598d4be74a39.exe --output-document=pygi.exe
       wine vcredist_x86.exe /q
       wine msiexec /i python.msi /qn TARGETDIR=C:\\Python
-      #wine msiexec /i pygtk.msi /qn TARGETDIR=C:\\Python
-      #wine pygi.exe /qn
       wine c:\\Python\\python.exe c:\\Python\\scripts\\pip.exe install pyinstaller --upgrade
       wine c:\\Python\\python.exe c:\\Python\\scripts\\pip.exe install setuptools --upgrade
-      wine c:\\Python\\python.exe c:\\Python\\scripts\\pip.exe install python-wheels/Shapely-1.6.3-cp27-cp27m-win32.whl
+      wine c:\\Python\\python.exe c:\\Python\\scripts\\pip.exe install Shapely-1.6.3-cp27-cp27m-win32.whl
       wine c:\\Python\\python.exe c:\\Python\\scripts\\pip.exe install -r requirements.txt
 
-      #find $(winepath c:\\) -ls
-
       set +x
     elif [ -n "$LINT" ]; then
       pip install flake8

bin/build-dist

@@ -2,9 +2,11 @@
 
 site_packages="$(python -c "import os; print(os.path.dirname(os.__file__) + '/site-packages')")"
 
-# 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:. "
+if [ "$TRAVIS_OS_NAME" = "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:. "
+fi
 
 # This one's tricky.  ink/stitch doesn't actually _use_ gi.repository.Gtk,
 # but it does use GTK (through wxPython).  pyinstaller has some special
@@ -15,11 +17,17 @@ pyinstaller_args+="--add-binary  /usr/lib/x86_64-linux-gnu/libproxy.so.1:. "
 # above!
 pyinstaller_args+="--hidden-import gi.repository.Gtk "
 
-# This lets pyinstaller see inkex.py, etc.
-pyinstaller_args+="-p /usr/share/inkscape/extensions "
+# mac and windows build seem to miss wx and libembroidery import
+pyinstaller_args+="--hidden-import wx --hidden-import libembroidery "
 
-# for libembroidery
-pyinstaller_args+="-p embroidermodder/experimental/python/binding "
+if [ -d windows-libembroidery ]; then
+    pyinstaller_args+="-p windows-libembroidery "
+else
+    pyinstaller_args+="-p embroidermodder/experimental/python/binding "
+fi
+
+# This lets pyinstaller see inkex.py, etc.
+pyinstaller_args+="-p inkscape-0.92.2/share/extensions "
 
 mkdir -p dist/inkstitch/bin
 for extension in "$@"; do