From 5fcc473648036d8643e806c62aa707fa5c64df78 Mon Sep 17 00:00:00 2001 From: Colby Klein Date: Thu, 24 Nov 2016 19:06:41 -0800 Subject: [PATCH] update version info. why are there so many of these --- .appveyor.yml | 2 +- Build/INSTALL.md | 2 +- CMake/SMDefs.cmake | 4 ++-- src/CMakeLists.txt | 2 +- src/ProductInfo.h | 4 ++-- src/ProductInfo.inc | 8 ++++---- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index d5ccdae675..b906954cae 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -22,7 +22,7 @@ init: set SM_COMMIT_SHORT=%APPVEYOR_REPO_COMMIT:~0,7% - set SM_SETUP_EXE_NAME=StepMania-5.0-git-%SM_COMMIT_SHORT%-win32.exe + set SM_SETUP_EXE_NAME=StepMania-5.1-git-%SM_COMMIT_SHORT%-win32.exe curl -u wolfman2000:%access_token% -H "User-Agent: Appveyor-wolfman2000-stepmania-app" -H "Accept: application/vnd.github.v3+json" -H "Content-Type: application/json" -X POST -d %GITHUB_API_PENDING% %GITHUB_API_URL% diff --git a/Build/INSTALL.md b/Build/INSTALL.md index 83f75dff12..9b051cecd8 100644 --- a/Build/INSTALL.md +++ b/Build/INSTALL.md @@ -37,5 +37,5 @@ The `StepMania.app` package can be copied to `/Applications` and it will work as Linux === After installing, run `sudo make install`. The files will be placed in the location specified: -by default, that is now `/usr/local/stepmania-5.0`. +by default, that is now `/usr/local/stepmania-5.1`. diff --git a/CMake/SMDefs.cmake b/CMake/SMDefs.cmake index 8cd0f77299..43bf45907c 100644 --- a/CMake/SMDefs.cmake +++ b/CMake/SMDefs.cmake @@ -1,7 +1,7 @@ # Set up version numbers according to the new scheme. set(SM_VERSION_MAJOR 5) -set(SM_VERSION_MINOR 0) -set(SM_VERSION_PATCH 12) +set(SM_VERSION_MINOR 1) +set(SM_VERSION_PATCH 0) set(SM_VERSION_TRADITIONAL "${SM_VERSION_MAJOR}.${SM_VERSION_MINOR}.${SM_VERSION_PATCH}") execute_process(COMMAND git rev-parse --short HEAD diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index feea706abd..3c0cf81b4b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -603,7 +603,7 @@ target_include_directories("${SM_EXE_NAME}" PUBLIC ${SM_INCLUDE_DIRS}) if(WIN32) set(SM_INSTALL_DESTINATION ".") else() - set(SM_INSTALL_DESTINATION "stepmania-5.0") + set(SM_INSTALL_DESTINATION "stepmania-5.1") endif() if(NOT APPLE) diff --git a/src/ProductInfo.h b/src/ProductInfo.h index 4512ee66da..75002f97d4 100644 --- a/src/ProductInfo.h +++ b/src/ProductInfo.h @@ -16,7 +16,7 @@ * As an example, use "StepMania4" here, not "StepMania". * It would cause a conflict with older versions such as StepMania 3.X. */ -#define PRODUCT_ID_BARE StepMania 5 +#define PRODUCT_ID_BARE StepMania 5.1 // These cannot be #undef'd so make them unlikely to conflict with anything #define PRODUCT_STRINGIFY(x) #x @@ -28,7 +28,7 @@ #define VIDEO_TROUBLESHOOTING_URL "http://old.stepmania.com/stepmaniawiki.php?title=Video_Driver_Troubleshooting" /** @brief The URL to report bugs on the program. */ #define REPORT_BUG_URL "https://github.com/stepmania/stepmania/issues" -#define SM_DOWNLOAD_URL "http://www.stepmania.com/download/" +#define SM_DOWNLOAD_URL "https://www.stepmania.com/download/" #define CAN_INSTALL_PACKAGES true diff --git a/src/ProductInfo.inc b/src/ProductInfo.inc index eb9079f405..96518b6ab6 100644 --- a/src/ProductInfo.inc +++ b/src/ProductInfo.inc @@ -6,14 +6,14 @@ ; PRODUCT_ID must NOT be "StepMania" unless you want people to uninstall 3.9 ; when they install StepMania 5. (not recommended) -!define PRODUCT_ID "StepMania 5.0" +!define PRODUCT_ID "StepMania 5.1" ; TODO: This needs to be updated with the git rev hash -!define PRODUCT_VER "5.0-UNKNOWN" +!define PRODUCT_VER "5.1-UNKNOWN" !define PRODUCT_DISPLAY "${PRODUCT_FAMILY} ${PRODUCT_VER}" !define PRODUCT_BITMAP "sm5" -!define PRODUCT_URL "http://www.stepmania.com/" -!define UPDATES_URL "http://www.stepmania.com/download/" +!define PRODUCT_URL "https://www.stepmania.com/" +!define UPDATES_URL "https://www.stepmania.com/download/" ;!define INSTALL_EXTERNAL_PCKS ;!define INSTALL_INTERNAL_PCKS