From 906391f78609940d0b57d5a68585697c763ad304 Mon Sep 17 00:00:00 2001
From: pokamest <pokamest@gmail.com>
Date: Wed, 2 Jun 2021 19:24:50 +0300
Subject: [PATCH] Travis fix

---
 .travis.yml             | 38 +++++++++++++++++++-------------------
 deploy/build_windows.sh | 13 -------------
 2 files changed, 19 insertions(+), 32 deletions(-)
 delete mode 100644 deploy/build_windows.sh

diff --git a/.travis.yml b/.travis.yml
index e7efeb36..13343381 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -47,8 +47,8 @@ jobs:
         - PATH=/c/Python39:/c/Python39/Scripts:$PATH
         - QT_VERSION=5.14.2
         - QIF_VERSION=4.1
-        - QT_BIN_DIR="c:\\Qt\\$QT_VERSION\\msvc2017_64\\bin"
-        - QIF_BIN_DIR="c:\\Qt\\Tools\\QtInstallerFramework\\$QIF_VERSION\\bin"
+        - QT_BIN_DIR="c:\\Qt\\${QT_VERSION}\\msvc2017_64\\bin"
+        - QIF_BIN_DIR="c:\\Qt\\Tools\\QtInstallerFramework\\${QIF_VERSION}\\bin"
         - BUILD_ARCH=64
         
       before_install:
@@ -65,15 +65,15 @@ jobs:
           python -m aqt install --outputdir /C/Qt $QT_VERSION windows desktop win64_msvc2017_64 -m qtbase && \
           python -m aqt tool --outputdir /C/Qt windows tools_ifw $QIF_VERSION qt.tools.ifw.${QIF_VERSION/./}; \
           fi
-        - echo -e 'call "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\BuildTools\\Common7\\Tools\\VsDevCmd.bat"\n' > winbuild.bat
-        - echo -e 'set BUILD_ARCH="64"\n' >> winbuild.bat
-        - echo -e 'set QT_BIN_DIR="$QT_BIN_DIR"\n' >> winbuild.bat
-        - echo -e 'set QIF_BIN_DIR="$QIF_BIN_DIR"\n' >> winbuild.bat
-        - echo -e 'call "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\VC\\Auxiliary\\Build\\vcvars%BUILD_ARCH:"=%.bat"\n' >> winbuild.bat
+        - echo -e call "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\BuildTools\\Common7\\Tools\\VsDevCmd.bat" > winbuild.bat
+        - echo -e set BUILD_ARCH=$BUILD_ARCH >> winbuild.bat
+        - echo -e set QT_BIN_DIR="$QT_BIN_DIR" >> winbuild.bat
+        - echo -e set QIF_BIN_DIR="$QIF_BIN_DIR" >> winbuild.bat
+        - echo -e call "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\VC\\Auxiliary\\Build\\vcvars%BUILD_ARCH:"=%.bat" >> winbuild.bat
         - cat winbuild.bat
-        - echo -e 'set WIN_CERT_PW=$WIN_CERT_PW\n' >> winbuild.bat
-        - echo -e 'echo Starting build with build_windows.bat\n' >> winbuild.bat
-        - echo -e 'call deploy\\build_windows.bat' >> winbuild.bat
+        - echo -e set WIN_CERT_PW=$WIN_CERT_PW >> winbuild.bat
+        - echo -e echo Starting build with build_windows.bat >> winbuild.bat
+        - echo -e call deploy\\build_windows.bat >> winbuild.bat
         - cmd //c winbuild.bat
 
         
@@ -94,8 +94,8 @@ jobs:
         - PATH=/c/Python39:/c/Python39/Scripts:$PATH
         - QT_VERSION=5.14.2
         - QIF_VERSION=4.1
-        - QT_BIN_DIR="c:\\Qt\\$QT_VERSION\\msvc2017\\bin"
-        - QIF_BIN_DIR="c:\\Qt\\Tools\\QtInstallerFramework\\$QIF_VERSION\\bin"
+        - QT_BIN_DIR="c:\\Qt\\${QT_VERSION}\\msvc2017\\bin"
+        - QIF_BIN_DIR="c:\\Qt\\Tools\\QtInstallerFramework\\${QIF_VERSION}\\bin"
         - BUILD_ARCH=32
 
       before_install:
@@ -112,14 +112,14 @@ jobs:
           python -m aqt install --outputdir /C/Qt $QT_VERSION windows desktop win32_msvc2017 -m qtbase && \
           python -m aqt tool --outputdir /C/Qt windows tools_ifw $QIF_VERSION qt.tools.ifw.${QIF_VERSION/./}; \
           fi
-        - echo -e 'call "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\BuildTools\\Common7\\Tools\\VsDevCmd.bat"\n' > winbuild.bat
-        - echo -e 'set BUILD_ARCH="64"\n' >> winbuild.bat
-        - echo -e 'set QT_BIN_DIR="$QT_BIN_DIR"\n' >> winbuild.bat
-        - echo -e 'set QIF_BIN_DIR="$QIF_BIN_DIR"\n' >> winbuild.bat
-        - echo -e 'call "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\VC\\Auxiliary\\Build\\vcvars%BUILD_ARCH:"=%.bat"\n' >> winbuild.bat
+        - echo -e call "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\BuildTools\\Common7\\Tools\\VsDevCmd.bat" > winbuild.bat
+        - echo -e set BUILD_ARCH=$BUILD_ARCH >> winbuild.bat
+        - echo -e set QT_BIN_DIR="$QT_BIN_DIR" >> winbuild.bat
+        - echo -e set QIF_BIN_DIR="$QIF_BIN_DIR" >> winbuild.bat
+        - echo -e call "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\VC\\Auxiliary\\Build\\vcvars%BUILD_ARCH:"=%.bat" >> winbuild.bat
         - cat winbuild.bat
-        - echo -e 'set WIN_CERT_PW=$WIN_CERT_PW\n' >> winbuild.bat
-        - echo -e 'call deploy\\build_windows.bat' >> winbuild.bat
+        - echo -e set WIN_CERT_PW=$WIN_CERT_PW >> winbuild.bat
+        - echo -e call deploy\\build_windows.bat >> winbuild.bat
         - cmd //c winbuild.bat
 
       deploy:
diff --git a/deploy/build_windows.sh b/deploy/build_windows.sh
deleted file mode 100644
index 8c717f09..00000000
--- a/deploy/build_windows.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-# Build using build_windows.bat
-echo "Build script started ..."
-
-echo -e 'call "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\BuildTools\\Common7\\Tools\\VsDevCmd.bat"\n' > winbuild.bat
-echo -e 'set BUILD_ARCH="64"\n' >> winbuild.bat
-echo -e 'set QT_BIN_DIR="$QT_BIN_DIR"\n' >> winbuild.bat
-echo -e 'set QIF_BIN_DIR="$QIF_BIN_DIR"\n' >> winbuild.bat
-echo -e 'call "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\VC\\Auxiliary\\Build\\vcvars%BUILD_ARCH:"=%.bat"\n' >> winbuild.bat
-cat winbuild.bat
-echo -e 'set WIN_CERT_PW=$WIN_CERT_PW\n' >> winbuild.bat
-echo -e 'call deploy\\\build_windows.bat' >> winbuild.bat
-cmd //c winbuild.bat