mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-21 05:53:02 +01:00
Code Issues Releases Wiki Activity

Remove version build from msbuild & NSIS (#5143)

Browse Source 
This also passes the version to NSIS removing another file containing the current version.
This commit is contained in:
Ted John
2017-02-02 10:53:56 +00:00
committed by Michael Steenbeek
parent ae2e0faad0
commit 5d20803fb2
2 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
distribution/windows/install.nsi
View File

@@ -1,31 +1,24 @@
# Version numbers to update
!define /ifndef APPV_MAJOR 0
!define /ifndef APPV_MINOR 0
!define /ifndef APPV_MAINT 7
!define /ifndef APPV_BUILD 0
!define APPNAME "OpenRCT2"
!define APPVERSION "${APPV_MAJOR}.${APPV_MINOR}.${APPV_MAINT}${APPV_EXTRA}"
!define APPVERSIONINTERNAL "${APPV_MAJOR}.${APPV_MINOR}.${APPV_MAINT}.${APPV_BUILD}"
!define /ifndef APPURLLINK "https://github.com/OpenRCT2/OpenRCT2"
!define APPNAMEANDVERSION "${APPNAME} ${APPVERSION}"
!define APPVERSION "${APPV_MAIN}${APPV_EXTRA}"
!define APPVERSIONINTERNAL "${APPV_MAIN}.0"
!define APPNAMEANDVERSION "${APPNAME} ${APPVERSION}"
!define APPURLLINK "https://github.com/OpenRCT2/OpenRCT2"
!if "${PLATFORM}" == "Win32"
!define OPENRCT2_EXE "openrct2.exe"
!define APPBITS 32
!define APPARCH "win32"
!define OPENRCT2_EXE "openrct2.exe"
!define APPBITS 32
!define APPARCH "win32"
InstallDir "$PROGRAMFILES32\OpenRCT2\"
!else
!define OPENRCT2_EXE "openrct2.exe"
!define APPBITS 64
!define APPARCH "win64"
!define OPENRCT2_EXE "openrct2.exe"
!define APPBITS 64
!define APPARCH "win64"
InstallDir "$PROGRAMFILES64\OpenRCT2\"
!endif
!define SUPPORTED_OS "Windows Vista, 7, 8.1 and 10"
!define SUPPORTED_OS "Windows Vista, 7, 8.1 and 10"
; Define root variable relative to installer
!define PATH_ROOT "..\..\"

3
openrct2.proj
View File

@@ -19,7 +19,7 @@
<TestConfig Condition="'$(Configuration)'=='DebugTests' OR '$(Configuration)'=='ReleaseTests'">true</TestConfig>
<GIT_COMMIT_SHA1_SHORT Condition="'$(GIT_COMMIT_SHA1)'!=''">$(GIT_COMMIT_SHA1.Substring(0, 7))</GIT_COMMIT_SHA1_SHORT>
<Version>0.0.7.0</Version>
<Version>0.0.7</Version>
<VersionExtra Condition="'$(GIT_BRANCH)'!=''">-$(GIT_BRANCH)-$(GIT_COMMIT_SHA1_SHORT)</VersionExtra>
<VersionExtra Condition="'$(GIT_TAG)'!=''"></VersionExtra>
<TargetLibsVersion>11</TargetLibsVersion>
@@ -264,6 +264,7 @@
<!-- Create the installer -->
<Message Text="Building Windows Installer (NSIS script)" Importance="high" />
<Exec Command="makensis /DOUTFILE=$(PublishInstallerExe) ^
/DAPPV_MAIN=$(Version) ^
/DAPPV_EXTRA=$(VersionExtra) ^
/DPLATFORM=$(Platform) ^
$(NsisScript)"