From 644c887f718ea7612a9633dbe09c392cbc547b17 Mon Sep 17 00:00:00 2001
From: Vasily <vautkin@teknik.io>
Date: Wed, 2 Jan 2019 15:50:52 +0100
Subject: [PATCH] Update version strings, update NSIS file, move around extra
 files

The additional files packaged with the installer have been moved to
their own dir to separate them from the C++ source.

All licenses are now also included in the installer, as per the terms.

The version string in overlaycontroller.h has been updated to 2.8.0.
---
 .gitignore                                   |  2 +-
 installer/installer.nsi                      | 15 ++++++++++-----
 src/overlaycontroller.h                      |  2 +-
 src/{ => package_files}/LICENSE.txt          |  0
 src/{ => package_files}/manifest.vrmanifest  |  0
 src/{ => package_files}/qt.conf              |  0
 src/{ => package_files}/restartvrserver.bat  |  0
 src/{ => package_files}/startdesktopmode.bat |  0
 8 files changed, 12 insertions(+), 7 deletions(-)
 rename src/{ => package_files}/LICENSE.txt (100%)
 rename src/{ => package_files}/manifest.vrmanifest (100%)
 rename src/{ => package_files}/qt.conf (100%)
 rename src/{ => package_files}/restartvrserver.bat (100%)
 rename src/{ => package_files}/startdesktopmode.bat (100%)

diff --git a/.gitignore b/.gitignore
index 8cf1675..fb26808 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,6 @@ Makefile*
 *.stash
 *.appxmanifest
 *.user
-installer/AdvancedSettings-Installer.exe
+installer/*.exe
 *.user*
 
diff --git a/installer/installer.nsi b/installer/installer.nsi
index 26b0bbd..9bb87f0 100644
--- a/installer/installer.nsi
+++ b/installer/installer.nsi
@@ -9,10 +9,13 @@
         !define BASEDIR "..\bin\win64\AdvancedSettings"
 		!define SRCDIR "..\src"
 		!define THIRDDIR "..\third-party"
+        !define PACKAGEDIR "..\src\package_files"
+        !define PROJECTDIR "..\"
+        !define VERSION_STRING "2-8-0"
 
 	;Name and file
 	Name "OpenVR Advanced Settings"
-        OutFile "AdvancedSettings-Installer.exe"
+        OutFile "AdvancedSettings-${VERSION_STRING}-Installer.exe"
 	
 	;Default installation folder
 	InstallDir "$PROGRAMFILES64\OpenVR-AdvancedSettings"
@@ -103,13 +106,15 @@ Section "Install" SecInstall
 	SetOutPath "$INSTDIR"
 
 	;ADD YOUR OWN FILES HERE...
-    File "${SRCDIR}\LICENSE.txt"
+    File "${BASEDIR}\LICENSE-GPL.txt"
+    File "${BASEDIR}\LICENSE-MIT.txt"
+    File "${BASEDIR}\LICENSE-VALVE.txt"
 	File "${BASEDIR}\*.exe"
 	File "${THIRDDIR}\openvr\bin\win64\*.dll"
 	File "${BASEDIR}\*.dll"
-	File "${SRCDIR}\*.bat"
-	File "${SRCDIR}\*.vrmanifest"
-	File "${SRCDIR}\*.conf"
+	File "${PACKAGEDIR}\*.bat"
+	File "${PACKAGEDIR}\*.vrmanifest"
+	File "${PACKAGEDIR}\*.conf"
 	File /r "${SRCDIR}\res"
 	File /r "${BASEDIR}\qtdata"
 
diff --git a/src/overlaycontroller.h b/src/overlaycontroller.h
index 48cc081..5b5e07d 100644
--- a/src/overlaycontroller.h
+++ b/src/overlaycontroller.h
@@ -47,7 +47,7 @@ class OverlayController : public QObject
 public:
     static constexpr const char* applicationKey = "matzman666.AdvancedSettings";
     static constexpr const char* applicationName = "Advanced Settings";
-    static constexpr const char* applicationVersionString = "v2.5";
+    static constexpr const char* applicationVersionString = "v2.8.0";
 
 private:
     vr::VROverlayHandle_t m_ulOverlayHandle = vr::k_ulOverlayHandleInvalid;
diff --git a/src/LICENSE.txt b/src/package_files/LICENSE.txt
similarity index 100%
rename from src/LICENSE.txt
rename to src/package_files/LICENSE.txt
diff --git a/src/manifest.vrmanifest b/src/package_files/manifest.vrmanifest
similarity index 100%
rename from src/manifest.vrmanifest
rename to src/package_files/manifest.vrmanifest
diff --git a/src/qt.conf b/src/package_files/qt.conf
similarity index 100%
rename from src/qt.conf
rename to src/package_files/qt.conf
diff --git a/src/restartvrserver.bat b/src/package_files/restartvrserver.bat
similarity index 100%
rename from src/restartvrserver.bat
rename to src/package_files/restartvrserver.bat
diff --git a/src/startdesktopmode.bat b/src/package_files/startdesktopmode.bat
similarity index 100%
rename from src/startdesktopmode.bat
rename to src/package_files/startdesktopmode.bat