From 9abb2f9799e9f4c075ac9686f2bfe5f5d567c681 Mon Sep 17 00:00:00 2001 From: Lex Neva Date: Mon, 20 Aug 2018 21:59:49 -0400 Subject: [PATCH] fix windows and mac --- .travis.yml | 4 ++-- Makefile | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index abe144986..ccacede36 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,9 +44,9 @@ 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 - mkdir inkscape - (cd inkscape; tar --strip-components=1 -jxf ../inkscape-0.92.3.tar.bz2) + tar -jxf inkscape-0.92.3.tar.bz2 rm inkscape-0.92.3.tar.bz2 + mv inkscape-0.92.3 inkscape fi if [ "$BUILD" = "linux" ]; then # For some bizarre reason, this build has been failing due to the diff --git a/Makefile b/Makefile index 94194bf52..030ddd670 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,11 @@ distclean: .PHONY: inx inx: locales mkdir -p inx - bin/generate-inx-files + if [ "$$BUILD" = "windows" ]; then \ + wine c:\\Python\\python.exe bin/generate-inx-files; \ + else \ + bin/generate-inx-files; \ + fi .PHONY: messages.po messages.po: