summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml3
-rwxr-xr-xbin/build-dist2
-rwxr-xr-xbin/generate-inx-files9
3 files changed, 11 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index a3f6360b..d999f238 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,7 +38,8 @@ install:
if [ -n "$BUILD" ]; then
# Need this for inkex.py and friends
wget -q https://inkscape.org/en/gallery/item/12187/inkscape-0.92.3.tar.bz2
- tar jxf inkscape-0.92.3.tar.bz2
+ mkdir inkscape
+ (cd inkscape; tar jxf --strip-components=1 inkscape-0.92.3.tar.bz2)
rm inkscape-0.92.3.tar.bz2
fi
if [ "$BUILD" = "linux" ]; then
diff --git a/bin/build-dist b/bin/build-dist
index a96b7506..c740c782 100755
--- a/bin/build-dist
+++ b/bin/build-dist
@@ -29,7 +29,7 @@ if [ "$TRAVIS_OS_NAME" = "osx" ]; then
fi
# This lets pyinstaller see inkex.py, etc.
-pyinstaller_args+="-p inkscape-0.92.3/share/extensions "
+pyinstaller_args+="-p inkscape/share/extensions "
# output useful debugging info that helps us trace library dependency issues
pyinstaller_args+="--log-level DEBUG "
diff --git a/bin/generate-inx-files b/bin/generate-inx-files
index f7b7a801..a16fb32e 100755
--- a/bin/generate-inx-files
+++ b/bin/generate-inx-files
@@ -4,7 +4,14 @@ import sys
import os
from os.path import dirname
-sys.path.append(os.path.join(dirname(dirname(__file__))))
+# add inkstitch libs to python path
+parent_dir = os.path.join(dirname(dirname(__file__)))
+sys.path.append(parent_dir)
+
+# try find add inkex.py et al. as well
+sys.path.append(os.path.join(parent_dir, "inkscape", "share", "extensions"))
+sys.path.append(os.path.join("/usr/share/inkscape/extensions"))
+
from lib.inx import generate_inx_files
generate_inx_files()