Skip to content

Commit 680908e

Browse files
committed
version 1.0.1
1 parent fb19ec4 commit 680908e

File tree

4 files changed

+17
-4
lines changed

4 files changed

+17
-4
lines changed

CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,10 @@ project(${ProjectName})
2222

2323
set(MV_MAJOR_VERSION 1)
2424
set(MV_MINOR_VERSION 0)
25+
set(MV_PATCH_VERSION 1)
2526
set(MV_EXT_VERSION "")
26-
set(MV_ECMP_VERSION 6) # increasing number to detect new version without parsing stuff like 1.0b1
27-
set(MV_VERSION "${MV_MAJOR_VERSION}.${MV_MINOR_VERSION}${MV_EXT_VERSION}")
27+
set(MV_ECMP_VERSION 7) # increasing number to detect new version without parsing stuff like 1.0b1
28+
set(MV_VERSION "${MV_MAJOR_VERSION}.${MV_MINOR_VERSION}.${MV_PATCH_VERSION}${MV_EXT_VERSION}")
2829

2930
# Languages
3031
if(WIN32)

changelog.txt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,16 @@ JK2MV changelog
33
Website: http://jk2mv.org
44
--------------------------------------------------
55

6+
-----------------------------------
7+
1.0.1
8+
-----------------------------------
9+
- fixed auto-referencing pk3s from fs_game directories
10+
- yet another bug concerning gamma correction on linux fixed
11+
- internal http server returns correct error code on failure
12+
- fixed command autocompletion on pressing enter
13+
- fixed alignment of info message in connecting screen
14+
- single threaded http downloads
15+
616
-----------------------------------
717
1.0
818
-----------------------------------

res/NSIS.definitions.nsh.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
!define VERSIONMAJOR @MV_MAJOR_VERSION@
22
!define VERSIONMINOR @MV_MINOR_VERSION@
3+
!define VERSIONPATCH @MV_PATCH_VERSION@
34
!define VERSION_EXT "@MV_EXT_VERSION@"
45
!define VERSION_EASY_COMPARE @MV_ECMP_VERSION@
56

res/NSIS.template.in

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ patched:
6565
StrCpy $1 $INSTDIR
6666
ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "QuietUninstallString"
6767
ReadRegStr $R0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayVersion"
68-
MessageBox MB_ICONINFORMATION "${APPNAME} $R0 has been found. The installer will upgrade ${APPNAME} to ${VERSIONMAJOR}.${VERSIONMINOR}${VERSION_EXT}."
68+
MessageBox MB_ICONINFORMATION "${APPNAME} $R0 has been found. The installer will upgrade ${APPNAME} to ${VERSIONMAJOR}.${VERSIONMINOR}.${VERSIONPATCH}${VERSION_EXT}."
6969
${EndIf}
7070
${EndIf}
7171
functionEnd
@@ -107,9 +107,10 @@ section "install"
107107
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayIcon" "$\"$INSTDIR\mv.ico$\""
108108
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "Publisher" "${APPNAME}"
109109
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "HelpLink" "${ABOUTURL}"
110-
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayVersion" "${VERSIONMAJOR}.${VERSIONMINOR}${VERSION_EXT}"
110+
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayVersion" "${VERSIONMAJOR}.${VERSIONMINOR}.${VERSIONPATCH}${VERSION_EXT}"
111111
WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "VersionMajor" ${VERSIONMAJOR}
112112
WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "VersionMinor" ${VERSIONMINOR}
113+
WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "VersionPatch" ${VERSIONPATCH}
113114
WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "EasyCompare" ${VERSION_EASY_COMPARE}
114115
WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "NoModify" 1
115116
WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "NoRepair" 1

0 commit comments

Comments
 (0)