From 2802488b5928ed1d9886e393d06938db0e825a32 Mon Sep 17 00:00:00 2001
From: Aleks Kissinger <aleks0@gmail.com>
Date: Sun, 16 Dec 2018 16:39:03 +0100
Subject: added lib

---
 .appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.appveyor.yml')

diff --git a/.appveyor.yml b/.appveyor.yml
index c8c4424..c2f27c4 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -13,7 +13,7 @@ configuration:
 
 install:
   - cmd: choco install winflexbison
-  - cmd: 'C:\Qt\5.11.1\msvc2015_64\bin\qtenv2.bat'
+  - cmd: 'C:\Qt\5.11.2\msvc2015_64\bin\qtenv2.bat'
   - cmd: call "%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64
   - cmd: cd C:\projects\tikzit
   - sh: sudo apt-get update
-- 
cgit v1.2.3


From 3a981911858553daab4af26af7e46e5b62b0034b Mon Sep 17 00:00:00 2001
From: Aleks Kissinger <aleks0@gmail.com>
Date: Thu, 20 Dec 2018 22:28:41 +0100
Subject: updated CI scripts

---
 .appveyor.yml  | 7 +++++--
 deploy-win.bat | 9 ++++-----
 tikzit.pro     | 6 ++++--
 3 files changed, 13 insertions(+), 9 deletions(-)

(limited to '.appveyor.yml')

diff --git a/.appveyor.yml b/.appveyor.yml
index c2f27c4..117c722 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -13,12 +13,15 @@ configuration:
 
 install:
   - cmd: choco install winflexbison
-  - cmd: 'C:\Qt\5.11.2\msvc2015_64\bin\qtenv2.bat'
-  - cmd: call "%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64
+  - cmd: 'C:\Qt\5.11.2\mingw53_32\bin\qtenv2.bat'
   - cmd: cd C:\projects\tikzit
   - sh: sudo apt-get update
   - sh: sudo apt-get -y install flex bison qt5-default
 
+before_build:
+  - ps: (new-object net.webclient).DownloadFile('http://tikzit.github.io/download/win32-deps.zip', 'c:\projects\tikzit\win32-deps.zip')
+  - cmd: 7z x win32-deps.zip
+
 build_script:
   - qmake -v
   - qmake
diff --git a/deploy-win.bat b/deploy-win.bat
index 1c19f40..20f85f6 100755
--- a/deploy-win.bat
+++ b/deploy-win.bat
@@ -7,12 +7,11 @@ mkdir icons
 copy ..\..\tikzfiles.reg .
 copy ..\..\release\tikzit.exe .
 copy ..\..\images\tikzdoc.ico icons\
-copy C:\Windows\System32\msvcp140.dll .
-copy C:\Windows\System32\vcruntime140.dll .
-copy C:\OpenSSL-Win64\bin\libeay32.dll .
-copy C:\OpenSSL-Win64\bin\ssleay32.dll .
+copy ..\..\win32-dist\*.dll .
+copy C:\OpenSSL-Win32\bin\libeay32.dll .
+copy C:\OpenSSL-Win32\bin\ssleay32.dll .
 
-windeployqt.exe --no-compiler-runtime --no-webkit2 --no-angle --no-opengl-sw --no-system-d3d-compiler --no-translations --no-quick-import .\tikzit.exe
+windeployqt.exe --no-webkit2 --no-angle --no-opengl-sw --no-system-d3d-compiler --no-translations --no-quick-import .\tikzit.exe
 
 cd ..
 7z a -tzip tikzit.zip tikzit
diff --git a/tikzit.pro b/tikzit.pro
index 3fa4d5a..43fd1a0 100644
--- a/tikzit.pro
+++ b/tikzit.pro
@@ -113,8 +113,10 @@ FORMS += src/gui/mainwindow.ui \
 INCLUDEPATH += src src/gui src/data
 
 # link to pre-compiled poppler libs on windows
-win32:INCLUDEPATH += win32-deps/include
-win32:LIBS += -L"$$PWD/win32-deps/bin"
+win32 {
+    INCLUDEPATH += win32-deps/include
+    LIBS += -L"$$PWD/win32-deps/bin"
+}    
 
 LIBS += -lpoppler-qt5
 
-- 
cgit v1.2.3


From 52b50ae84813951e5cbc457153bd981e5a96bc2d Mon Sep 17 00:00:00 2001
From: Aleks Kissinger <aleks0@gmail.com>
Date: Thu, 20 Dec 2018 22:36:02 +0100
Subject: ...

---
 .appveyor.yml |  2 +-
 .travis.yml   | 18 +++++-------------
 2 files changed, 6 insertions(+), 14 deletions(-)

(limited to '.appveyor.yml')

diff --git a/.appveyor.yml b/.appveyor.yml
index 117c722..8f32415 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -16,7 +16,7 @@ install:
   - cmd: 'C:\Qt\5.11.2\mingw53_32\bin\qtenv2.bat'
   - cmd: cd C:\projects\tikzit
   - sh: sudo apt-get update
-  - sh: sudo apt-get -y install flex bison qt5-default
+  - sh: sudo apt-get -y install flex bison qt5-default poppler
 
 before_build:
   - ps: (new-object net.webclient).DownloadFile('http://tikzit.github.io/download/win32-deps.zip', 'c:\projects\tikzit\win32-deps.zip')
diff --git a/.travis.yml b/.travis.yml
index 1c814d1..45b5146 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,27 +18,19 @@ matrix:
       - FILE=tikzit-osx-mountain.dmg
       - QTVER=56
       - DEPLOY_TIKZIT=1
-  # - os: linux
-  #   dist: trusty
-  #   env:
-  #     - FILE=tikzit-linux.tar.gz
-  #     - PPA=beineri/opt-qt-5.10.1-trusty
 
 before_install:
-  # - '[[ "$TRAVIS_OS_NAME" != linux || -z "$PPA" ]] || sudo add-apt-repository -y ppa:$PPA'
-  # - '[[ "$TRAVIS_OS_NAME" != linux ]] || sudo apt-get -qy update'
-  - '[[ "$TRAVIS_OS_NAME" != osx || "$QTVER" != 56 ]] || curl https://raw.githubusercontent.com/GiovanniBussi/macports-ci/master/macports-ci > macports-ci'
-  - '[[ "$TRAVIS_OS_NAME" != osx || "$QTVER" != 56 ]] || source macports-ci install'
+  # - '[[ "$TRAVIS_OS_NAME" != osx || "$QTVER" != 56 ]] || curl https://raw.githubusercontent.com/GiovanniBussi/macports-ci/master/macports-ci > macports-ci'
+  # - '[[ "$TRAVIS_OS_NAME" != osx || "$QTVER" != 56 ]] || source macports-ci install'
 
 
 
 install:
   - '[[ "$TRAVIS_OS_NAME" != osx || "$QTVER" != 511 ]] || brew install qt5'
+  - '[[ "$TRAVIS_OS_NAME" != osx || "$QTVER" != 511 ]] || brew install poppler --with-qt'
   - '[[ "$TRAVIS_OS_NAME" != osx || "$QTVER" != 511 ]] || brew link --force qt5'
-  - '[[ "$TRAVIS_OS_NAME" != osx || "$QTVER" != 56 ]] || sudo port -N -k install qt56'
-  - '[[ "$TRAVIS_OS_NAME" != osx || "$QTVER" != 56 ]] || export PATH=/opt/local/libexec/qt5/bin:$PATH'
-  # - '[[ "$TRAVIS_OS_NAME" != linux ]] || sudo apt-get -qy install qt510base qt510xmlpatterns'
-  # - '[[ "$TRAVIS_OS_NAME" != linux ]] || . /opt/qt510/bin/qt510-env.sh'
+  # - '[[ "$TRAVIS_OS_NAME" != osx || "$QTVER" != 56 ]] || sudo port -N -k install qt56'
+  # - '[[ "$TRAVIS_OS_NAME" != osx || "$QTVER" != 56 ]] || export PATH=/opt/local/libexec/qt5/bin:$PATH'
 
 script:
   - qmake -v
-- 
cgit v1.2.3