From 474b1a7587df952653d6b8f833f31529d2b7f191 Mon Sep 17 00:00:00 2001 From: Vasily Date: Wed, 16 Jan 2019 16:27:28 +0100 Subject: [PATCH] Rename version strings to 2.8.0-dev Since version strings are displayed in logs and on the main screen, this will prevent situations where the master branch is confused with the 2.8.0-release branch. The 2-8-0-release file was a one time thing because the version numbers were already changed, it should not be created for future releases. --- 2-8-0-release | 0 build_scripts/win/common.py | 2 +- installer/installer.nsi | 2 +- src/overlaycontroller.h | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 2-8-0-release diff --git a/2-8-0-release b/2-8-0-release deleted file mode 100644 index e69de29..0000000 diff --git a/build_scripts/win/common.py b/build_scripts/win/common.py index 6a462cd..90e58b6 100644 --- a/build_scripts/win/common.py +++ b/build_scripts/win/common.py @@ -11,7 +11,7 @@ import distutils.dir_util #Const globals #Version string must be bumped every release. #TODO: See developer documentation. -VERSION_STRING = "2-8-0" +VERSION_STRING = "2-8-0-dev" EXIT_CODE_SUCCESS = 0 EXIT_CODE_FAILURE_BUILD_APP = 1 diff --git a/installer/installer.nsi b/installer/installer.nsi index 9bb87f0..f3d09b0 100644 --- a/installer/installer.nsi +++ b/installer/installer.nsi @@ -11,7 +11,7 @@ !define THIRDDIR "..\third-party" !define PACKAGEDIR "..\src\package_files" !define PROJECTDIR "..\" - !define VERSION_STRING "2-8-0" + !define VERSION_STRING "2-8-0-dev" ;Name and file Name "OpenVR Advanced Settings" diff --git a/src/overlaycontroller.h b/src/overlaycontroller.h index 4a4f031..8b22da9 100644 --- a/src/overlaycontroller.h +++ b/src/overlaycontroller.h @@ -49,7 +49,7 @@ public: static constexpr auto applicationName = "OpenVRAdvancedSettings"; static constexpr const char* applicationKey = "matzman666.AdvancedSettings"; static constexpr const char* applicationDisplayName = "Advanced Settings"; - static constexpr const char* applicationVersionString = "v2.8.0"; + static constexpr const char* applicationVersionString = "v2.8.0-dev"; private: vr::VROverlayHandle_t m_ulOverlayHandle = vr::k_ulOverlayHandleInvalid;