From a6a2a922a50722d0715dcabed9527b1026684723 Mon Sep 17 00:00:00 2001
From: Conrad <grosserconrad@gmail.com>
Date: Thu, 16 Jan 2020 12:17:31 +0100
Subject: [PATCH 1/4] Automated Release Preparation

---
 prep.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/prep.sh b/prep.sh
index e496517..2106377 100755
--- a/prep.sh
+++ b/prep.sh
@@ -72,6 +72,6 @@ while true; do
     case $yn in
         [Mm]* ) prepareMerge;;
         [Rr]* ) prepareRelease;;
-        * ) echo "Please answer (m)erge or (r)elease.";;
+        * ) printLine "Please answer (m)erge or (r)elease.";;
     esac
 done

From 855dd23b395e903a71294fa5fc4395c2c6cd3272 Mon Sep 17 00:00:00 2001
From: Conrad <grosserconrad@gmail.com>
Date: Thu, 16 Jan 2020 12:24:21 +0100
Subject: [PATCH 2/4] Added Unit Tests to prep script

---
 prep.sh | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/prep.sh b/prep.sh
index 2106377..4b9e307 100755
--- a/prep.sh
+++ b/prep.sh
@@ -37,6 +37,16 @@ runDoxygen(){
   printLine "Doxygen finished." "\033[0;32m"
 }
 
+runUnitTests(){
+  printLine "Running Unit Tests..."
+  qmake src/IntelliUnitTest.pro || { printLine "ERROR: qmake not found!" "\033[0;33m"; return; }
+  cd src
+  make || { printLine "ERROR: make not found!" "\033[0;33m"; return; }
+  ./IntelliUnitTest
+  cd ..
+  printLine "Doxygen finished." "\033[0;32m"
+}
+
 gitCommit(){
   printLine "Committing Changes to Git..."
   git add '*' || { printLine "ERROR: git not found!" "\033[0;33m"; return; }

From f2e64e375b548dd0cdcfa6d71237471a53b94680 Mon Sep 17 00:00:00 2001
From: Conrad <grosserconrad@gmail.com>
Date: Thu, 16 Jan 2020 12:39:59 +0100
Subject: [PATCH 3/4] Added Unit Tests to prep script 2

---
 prep.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/prep.sh b/prep.sh
index 4b9e307..8d3ab76 100755
--- a/prep.sh
+++ b/prep.sh
@@ -1,3 +1,5 @@
+QMAKE_PATH = "/Users/$USER/Qt5.14.0/5.14.0/clang_64/bin/qmake"
+
 printLine(){
   echo "$2$1 \033[0m"
 }
@@ -39,7 +41,7 @@ runDoxygen(){
 
 runUnitTests(){
   printLine "Running Unit Tests..."
-  qmake src/IntelliUnitTest.pro || { printLine "ERROR: qmake not found!" "\033[0;33m"; return; }
+  $QMAKE_PATH src/IntelliUnitTest.pro || { printLine "ERROR: qmake not found!" "\033[0;33m"; return; }
   cd src
   make || { printLine "ERROR: make not found!" "\033[0;33m"; return; }
   ./IntelliUnitTest
@@ -58,6 +60,7 @@ prepareMerge(){
   printLine "Merge Preparation started..."
   runUncrustify
   runCPPCheck
+  runUnitTests
   runDoxygen
   gitCommit
   printLine "Finished." "\033[0;32m"
@@ -70,6 +73,7 @@ prepareRelease(){
   cleanDir
   runUncrustify
   runCPPCheck
+  runUnitTests
   runDoxygen
   gitCommit
   printLine "Finished." "\033[0;32m"

From 25deefdcb9b689f5535e296875ade62dbb6ed511 Mon Sep 17 00:00:00 2001
From: Conrad <grosserconrad@gmail.com>
Date: Thu, 16 Jan 2020 12:45:55 +0100
Subject: [PATCH 4/4] Stopped Unit Test Automation as it doesn't work yet

---
 prep.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/prep.sh b/prep.sh
index 8d3ab76..cb2a7e4 100755
--- a/prep.sh
+++ b/prep.sh
@@ -60,7 +60,7 @@ prepareMerge(){
   printLine "Merge Preparation started..."
   runUncrustify
   runCPPCheck
-  runUnitTests
+  #runUnitTests
   runDoxygen
   gitCommit
   printLine "Finished." "\033[0;32m"
@@ -73,7 +73,7 @@ prepareRelease(){
   cleanDir
   runUncrustify
   runCPPCheck
-  runUnitTests
+  #runUnitTests
   runDoxygen
   gitCommit
   printLine "Finished." "\033[0;32m"