From 32dec87575732a0df1479874242e67ac1d68631f Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Mon, 11 Feb 2019 01:09:02 -0800
Subject: [PATCH] updated version name

---
 .travis.yml               |  2 ++
 .travis/after_success.sh  | 25 ++++++++++++++++++-------
 .travis/before_install.sh | 12 ++++++++++--
 .travis/install.sh        |  5 +++++
 .travis/script.sh         |  7 +++++++
 main.cpp                  |  2 +-
 6 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bbd600671..4f8fe8933 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,6 +13,8 @@ matrix:
     sudo: require
     dist: trusty
   - os: osx
+  - os: windows
+    env: ARCH=x86_64
 
 before_install:
   - source ./.travis/before_install.sh
diff --git a/.travis/after_success.sh b/.travis/after_success.sh
index 2251a7ed4..cd6abd13f 100644
--- a/.travis/after_success.sh
+++ b/.travis/after_success.sh
@@ -1,18 +1,29 @@
 #!/bin/bash
 
-if [[ "$TRAVIS_OS_NAME" == "osx" ]]
-then
-	wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh
+# retrieve upload tool
+wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh
+
+if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
+
+	# upload final package
 	bash upload.sh Olive*.zip
-elif [[ "$TRAVIS_OS_NAME" == "linux" ]]
-then
+
+elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
+
 	find appdir -executable -type f -exec ldd {} \; | grep " => /usr" | cut -d " " -f 2-3 | sort | uniq
-	# curl --upload-file Olive*.AppImage https://transfer.sh/Olive-git.$(git rev-parse --short HEAD)-$ARCH.AppImage
-	wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh
+
 	# only create release for master
 	if [ "$TRAVIS_BRANCH" != "master" ]
 	then
 		export TRAVIS_EVENT_TYPE=pull_request
 	fi
+
+	# upload final package
 	bash upload.sh Olive*.AppImage*
+
+elif [[ "$TRAVIS_OS_NAME" == "windows" ]]; then
+	
+	# upload final package
+	bash upload.sh Olive*.zip
+	
 fi
\ No newline at end of file
diff --git a/.travis/before_install.sh b/.travis/before_install.sh
index e817cf6c7..9ea7b6d48 100644
--- a/.travis/before_install.sh
+++ b/.travis/before_install.sh
@@ -4,9 +4,17 @@
 #then
 	# do nothing
 #elif [[ "$TRAVIS_OS_NAME" == "linux" ]]
-if [[ "$TRAVIS_OS_NAME" == "linux" ]]
-then
+if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
+
+	# install apt repos necessary for Olive
 	sudo add-apt-repository ppa:beineri/opt-qt593-trusty -y
 	sudo add-apt-repository ppa:jonathonf/ffmpeg-3 -y
 	sudo apt-get update -qq
+
+elif [[ "$TRAVIS_OS_NAME" == "windows" ]]; then
+
+	# install msys2 for mingw package installation
+	# (chocolatey is seemingly missing a recent version of Qt)
+	choco install msys2
+
 fi
\ No newline at end of file
diff --git a/.travis/install.sh b/.travis/install.sh
index d4c733ebd..3983d60dd 100644
--- a/.travis/install.sh
+++ b/.travis/install.sh
@@ -7,5 +7,10 @@ elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
 	if [ "$ARCH" == "x86_64" ]; then sudo apt-get -y install qt59base qt59multimedia libavformat-dev libavcodec-dev libavfilter-dev libavutil-dev libswscale-dev libswresample-dev frei0r-plugins-dev frei0r-plugins fuse; fi
 	if [ "$ARCH" == "i386" ]; then sudo apt-get -y install gcc-multilib g++-multilib qt59base:i386 qt59multimedia:i386 libavformat-dev:i386 libavcodec-dev:i386 libavfilter-dev:i386 libavutil-dev:i386 libswscale-dev:i386 libswresample-dev:i386 frei0r-plugins-dev:i386 frei0r-plugins:i386 pkg-config:i386 libgl1-mesa-dev:i386 fuse:i386; fi
 	source /opt/qt*/bin/qt*-env.sh
+elif [[ "$TRAVIS_OS_NAME" == "windows" ]]; then
+	#/c/msys64/usr/bin/bash -l -c "pacman -Syu --noconfirm"
+
+	# install build tools
+	/c/msys64/usr/bin/bash -l -c "pacman -S --noconfirm mingw-w64-x86_64-toolchain mingw-w64-x86_64-ffmpeg mingw-w64-x86_64-qt5"
 fi
 
diff --git a/.travis/script.sh b/.travis/script.sh
index 6ca216706..46ae8084e 100644
--- a/.travis/script.sh
+++ b/.travis/script.sh
@@ -65,4 +65,11 @@ elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
 		chmod a+x appimagetool-i686.AppImage
 		./appimagetool-i686.AppImage "appdir" -n -g
 	fi
+elif [[ "$TRAVIS_OS_NAME" == "windows" ]]; then
+	/c/msys64/mingw64/bin/qmake CONFIG+=release
+	/c/msys64/mingw64/bin/mingw32-make -f Makefile.Debug
+	mkdir olive-editor
+	mv olive-editor.exe olive-editor/
+	/c/msys64/mingw64/bin/windeployqt olive-editor/olive-editor.exe
+	7z a Olive-$(git rev-parse --short HEAD)-w64p.zip olive-editor
 fi
diff --git a/main.cpp b/main.cpp
index 03f1ba1fd..fcacb54ac 100644
--- a/main.cpp
+++ b/main.cpp
@@ -11,7 +11,7 @@ extern "C" {
 }
 
 int main(int argc, char *argv[]) {
-	QString appName = "Olive (January 2019 | Alpha";
+    QString appName = "Olive (February 2019 | Alpha";
 #ifdef GITHASH
 	appName += " | ";
 	appName += GITHASH;