From 7232a149261b05b33af0758b9c695680396cb8bd Mon Sep 17 00:00:00 2001
From: pokamest <pokamest@gmail.com>
Date: Wed, 2 Jun 2021 17:56:01 +0300
Subject: [PATCH] Travis fix

---
 .gitattributes                  |  4 ++++
 .travis.yml                     | 22 ++++------------------
 deploy/build_macos.sh           |  3 ---
 deploy/build_macos_notarized.sh |  3 ---
 deploy/build_windows.sh         | 13 +++++++++++++
 5 files changed, 21 insertions(+), 24 deletions(-)
 create mode 100644 .gitattributes
 create mode 100644 deploy/build_windows.sh

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..6ce43742
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,4 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+*.cmd text
+*.bat text
+* text eol=lf
diff --git a/.travis.yml b/.travis.yml
index ec38a95d..1389ed5f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,6 +14,8 @@ jobs:
       
       env:
         - QT_VERSION=5.15.2
+        - QT_BIN_DIR=$HOME/Qt/$QT_VERSION/clang_64/bin
+        - QIF_BIN_DIR=$QT_BIN_DIR/../../../Tools/QtInstallerFramework/4.0/bin
          
       script:
         - |
@@ -55,15 +57,7 @@ jobs:
           python -m aqt install --outputdir /C/Qt $QT_VERSION windows desktop win32_msvc2017_64 -m qtbase && \
           python -m aqt tool --outputdir /C/Qt windows tools_ifw 4.1 qt.tools.ifw.41; \
           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="c:\\Qt\\$QT_VERSION\\msvc2017_64\\bin"\n' >> winbuild.bat
-        - echo -e 'set QIF_BIN_DIR="c:\\Qt\\Tools\\QtInstallerFramework\\4.1\\bin"\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
+        - bash deploy/build_windows.sh
         
       deploy:
         provider: releases
@@ -95,15 +89,7 @@ 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 4.1 qt.tools.ifw.41; \
           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="32"\n' >> winbuild.bat
-        - echo -e 'set QT_BIN_DIR="c:\\Qt\\$QT_VERSION\\msvc2017\\bin"\n' >> winbuild.bat
-        - echo -e 'set QIF_BIN_DIR="c:\\Qt\\Tools\\QtInstallerFramework\\4.1\\bin"\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
+          - bash deploy/build_windows.sh
 
       deploy:
         provider: releases
diff --git a/deploy/build_macos.sh b/deploy/build_macos.sh
index 5fd9b3d8..2f36ae4e 100755
--- a/deploy/build_macos.sh
+++ b/deploy/build_macos.sh
@@ -30,9 +30,6 @@ DMG_FILENAME=$PROJECT_DIR/${APP_NAME}_unsigned.dmg
 # Seacrh Qt
 if [ -z "${QT_VERSION+x}" ]; then export QT_VERSION=5.15.2; fi
 
-QT_BIN_DIR=$HOME/Qt/$QT_VERSION/clang_64/bin
-QIF_BIN_DIR=$QT_BIN_DIR/../../../Tools/QtInstallerFramework/4.0/bin
-
 echo "Using Qt in $QT_BIN_DIR"
 echo "Using QIF in $QIF_BIN_DIR"
 
diff --git a/deploy/build_macos_notarized.sh b/deploy/build_macos_notarized.sh
index 18357651..bffc2674 100755
--- a/deploy/build_macos_notarized.sh
+++ b/deploy/build_macos_notarized.sh
@@ -32,9 +32,6 @@ DMG_FILENAME=$PROJECT_DIR/${APP_NAME}_unsigned.dmg
 # Seacrh Qt
 if [ -z "${QT_VERSION+x}" ]; then export QT_VERSION=5.15.2; fi
 
-QT_BIN_DIR=$HOME/Qt/$QT_VERSION/clang_64/bin
-QIF_BIN_DIR=$QT_BIN_DIR/../../../Tools/QtInstallerFramework/4.1/bin
-
 echo "Using Qt in $QT_BIN_DIR"
 echo "Using QIF in $QIF_BIN_DIR"
 
diff --git a/deploy/build_windows.sh b/deploy/build_windows.sh
new file mode 100644
index 00000000..4c2dc2fe
--- /dev/null
+++ b/deploy/build_windows.sh
@@ -0,0 +1,13 @@
+#!/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="c:\\Qt\\$QT_VERSION\\msvc2017_64\\bin"\n' >> winbuild.bat
+echo -e 'set QIF_BIN_DIR="c:\\Qt\\Tools\\QtInstallerFramework\\4.1\\bin"\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