ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix versioning for master branch (#3738)

Browse Source
This commit is contained in:
QwertyChouskie 2019-02-03 03:02:55 -08:00 committed by Alayan-stk-2
parent 7b186c2b04
commit 538911b25f
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8.4)
# root CMakeLists for the SuperTuxKart project
project(SuperTuxKart)
set(PROJECT_VERSION "0.10-beta1")
set(PROJECT_VERSION "git")
add_definitions( -DSUPERTUXKART_VERSION="${PROJECT_VERSION}" )
if(NOT (CMAKE_MAJOR_VERSION VERSION_LESS 3))

4
data/SuperTuxKart-Info.plist
View File

@ -17,11 +17,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.10-beta1</string>
<string>git</string>
<key>CFBundleSignature</key>
<string>SPTK</string>
<key>CFBundleVersion</key>
<string>0.10-beta1</string>
<string>git</string>
<key>CSResourcesFileMapped</key>
<true/>
<key>LSMinimumSystemVersion</key>

0
data/supertuxkart.0.10-beta1 → data/supertuxkart.git
View File

2
src/io/file_manager.cpp
View File

@ -931,7 +931,7 @@ void FileManager::checkAndCreateConfigDir()
if(m_user_config_dir.size()>0 && *m_user_config_dir.rbegin()!='/')
m_user_config_dir += "/";
m_user_config_dir +="0.10-beta/";
m_user_config_dir +="0.10-git/";
if(!checkAndCreateDirectoryP(m_user_config_dir))
{
Log::warn("FileManager", "Can not create config dir '%s', "

2
tools/windows_installer/supertuxkart-64bit.nsi
View File

@ -35,7 +35,7 @@
!define VERSION_MINOR 10
!define VERSION_REVISION 0
; Empty means stable, could be -git, -rc1
!define VERSION_BUILD "-beta1"
!define VERSION_BUILD "-git"
;Name and file
!define APPNAME "SuperTuxKart"

2
tools/windows_installer/supertuxkart.nsi
View File

@ -35,7 +35,7 @@
!define VERSION_MINOR 10
!define VERSION_REVISION 0
; Empty means stable, could be -git, -rc1
!define VERSION_BUILD "-beta1"
!define VERSION_BUILD "-git"
;Name and file
!define APPNAME "SuperTuxKart"