mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed the name of the 3rd part of the Bochs version number from "patch" to "revision".

Browse Source
This commit is contained in:
Volker Ruppert 2019-11-30 12:20:00 +00:00
parent 5fac7314af
commit 16d9d04ee7
7 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bochs/CHANGES
View File

@ -2,6 +2,7 @@ Changes in 2.6.10 (not yet released):
- General
- Disabled legacy "load32bitOShack" feature.
- Improved NSIS win32 installer script.
- CPU / CPUDB
- Significant speedup to simulation of milti-threaded guest (patch by Luigu.B)

16
bochs/build/win32/nsis/bochs.nsi.in
View File

@ -28,7 +28,7 @@
!define VERSION @VERSION@
!define VER_MAJOR @VER_MAJOR@
!define VER_MINOR @VER_MINOR@
!define VER_PATCH @VER_PATCH@
!define VER_REVISION @VER_REVISION@
!define VER_SVN @VER_SVN@
!define NAME "Bochs ${VERSION}"
@ -74,7 +74,7 @@ Var IndependentSectionState
;--------------------------------
;Version information
VIProductVersion ${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}.${VER_SVN}
VIProductVersion ${VER_MAJOR}.${VER_MINOR}.${VER_REVISION}.${VER_SVN}
VIAddVersionKey "FileVersion" "${VERSION}"
VIAddVersionKey "FileDescription" "Bochs Setup"
VIAddVersionKey "LegalCopyright" "Copyright 2001-2019 The Bochs Project"
@ -89,7 +89,7 @@ VIAddVersionKey "LegalCopyright" "Copyright 2001-2019 The Bochs Project"
!insertmacro MUI_PAGE_WELCOME
!insertmacro MUI_PAGE_LICENSE ${SRCDIR}\COPYING.txt
!ifdef VER_MAJOR & VER_MINOR & VER_PATCH & VER_SVN
!ifdef VER_MAJOR & VER_MINOR & VER_REVISION & VER_SVN
Page custom PageReinstall PageLeaveReinstall
!endif
!insertmacro MULTIUSER_PAGE_INSTALLMODE
@ -261,7 +261,7 @@ Section -post
WriteRegStr HKLM "Sostware\Bochs" "" $INSTDIR
WriteRegDword HKLM "Software\Bochs" "VersionMajor" "${VER_MAJOR}"
WriteRegDword HKLM "Software\Bochs" "VersionMinor" "${VER_MINOR}"
WriteRegDword HKLM "Software\Bochs" "VersionPatch" "${VER_PATCH}"
WriteRegDword HKLM "Software\Bochs" "VersionRevision" "${VER_REVISION}"
WriteRegDword HKLM "Software\Bochs" "VersionSVN" "${VER_SVN}"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bochs" "DisplayName" "${NAME} (remove only)"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bochs" "DisplayIcon" "$INSTDIR\bochs.ico,0"
@ -402,7 +402,7 @@ Pop $R1
Pop $R0
FunctionEnd
!ifdef VER_MAJOR & VER_MINOR & VER_PATCH & VER_SVN
!ifdef VER_MAJOR & VER_MINOR & VER_REVISION & VER_SVN
Var ReinstallPageCheck
Var OldInstDir
@ -423,14 +423,14 @@ Function PageReinstall
${ElseIf} "$R2$R3" != ""
ReadRegDWORD $R0 HKLM "Software\Bochs" "VersionMajor"
ReadRegDWORD $R1 HKLM "Software\Bochs" "VersionMinor"
ReadRegDWORD $R2 HKLM "Software\Bochs" "VersionPatch"
ReadRegDWORD $R2 HKLM "Software\Bochs" "VersionRevision"
ReadRegDWORD $R3 HKLM "Software\Bochs" "VersionSVN"
${Else}
Abort
${Endif}
StrCpy $R0 $R0.$R1.$R2.$R3
${VersionCompare} ${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}.${VER_SVN} $R0 $R0
${VersionCompare} ${VER_MAJOR}.${VER_MINOR}.${VER_REVISION}.${VER_SVN} $R0 $R0
${If} $R0 == 0
StrCpy $R1 "Bochs ${VERSION} is already installed. Select the operation you want to perform and click Next to continue."
StrCpy $R2 "Add/Reinstall components"
@ -541,6 +541,6 @@ Function PageLeaveReinstall
FunctionEnd
!endif # VER_MAJOR & VER_MINOR & VER_PATCH & VER_SVN
!endif # VER_MAJOR & VER_MINOR & VER_REVISION & VER_SVN
;eof

2
bochs/bxversion.h.in
View File

@ -6,6 +6,6 @@
#define VERSION "@VERSION@"
#define VER_MAJOR "@VER_MAJOR@"
#define VER_MINOR "@VER_MINOR@"
#define VER_PATCH "@VER_PATCH@"
#define VER_REVISION "@VER_REVISION@"
#define VER_SVN "@VER_SVN@"
#define REL_STRING "@REL_STRING@"

2
bochs/bxversion.rc.in
View File

@ -1,5 +1,5 @@
1 VERSIONINFO
FILEVERSION @VER_MAJOR@, @VER_MINOR@, @VER_PATCH@, @VER_SVN@
FILEVERSION @VER_MAJOR@, @VER_MINOR@, @VER_REVISION@, @VER_SVN@
{
BLOCK "StringFileInfo"
{

6
bochs/configure vendored
View File

@ -1,5 +1,5 @@
#! /bin/sh
# From configure.in Id: configure.in 13596 2019-11-11 22:36:40Z vruppert .
# From configure.in Id: configure.in 13606 2019-11-14 10:34:39Z vruppert .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69.
#
@ -796,7 +796,7 @@ GUI_NON_PLUGIN_OBJS
EXTRA_LINK_OPTS
REL_STRING
VER_SVN
VER_PATCH
VER_REVISION
VER_MINOR
VER_MAJOR
VERSION
@ -3184,7 +3184,7 @@ ac_config_headers="$ac_config_headers ltdlconf.h"
VERSION="2.6.9.svn"
VER_MAJOR=2
VER_MINOR=6
VER_PATCH=9
VER_REVISION=9
VER_SVN=1
REL_STRING="Built from SVN snapshot after release 2.6.9"

6
bochs/configure.in
View File

@ -11,8 +11,8 @@ dnl // into all the right places.
VERSION="2.6.9.svn"
VER_MAJOR=2
VER_MINOR=6
dnl // this should be > 90 for pre-release of next version otherwise patch level
VER_PATCH=9
dnl // this should be > 90 for pre-release of next version otherwise revision level
VER_REVISION=9
dnl // this should be 0 for release and 1 for svn version
VER_SVN=1
REL_STRING="Built from SVN snapshot after release 2.6.9"
@ -3249,7 +3249,7 @@ AC_SUBST(CD_UP_THREE)
AC_SUBST(VERSION)
AC_SUBST(VER_MAJOR)
AC_SUBST(VER_MINOR)
AC_SUBST(VER_PATCH)
AC_SUBST(VER_REVISION)
AC_SUBST(VER_SVN)
AC_SUBST(REL_STRING)
AC_SUBST(EXTRA_LINK_OPTS)

2
bochs/doc/docbook/development/development.dbk
View File

@ -3018,7 +3018,7 @@ Update version number and strings in configure.in.
VERSION="2.6.9"
VER_MAJOR=2
VER_MINOR=6
VER_PATCH=9
VER_REVISION=9
VER_SVN=0
REL_STRING="Build from SVN snapshot on April 9, 2017"
</screen>