From 16d9d04ee719186d03b6b58d2e371f0b18bdebf6 Mon Sep 17 00:00:00 2001 From: Volker Ruppert Date: Sat, 30 Nov 2019 12:20:00 +0000 Subject: [PATCH] Changed the name of the 3rd part of the Bochs version number from "patch" to "revision". --- bochs/CHANGES | 1 + bochs/build/win32/nsis/bochs.nsi.in | 16 ++++++++-------- bochs/bxversion.h.in | 2 +- bochs/bxversion.rc.in | 2 +- bochs/configure | 6 +++--- bochs/configure.in | 6 +++--- bochs/doc/docbook/development/development.dbk | 2 +- 7 files changed, 18 insertions(+), 17 deletions(-) diff --git a/bochs/CHANGES b/bochs/CHANGES index 543ef8c86..08ac1ee3c 100644 --- a/bochs/CHANGES +++ b/bochs/CHANGES @@ -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) diff --git a/bochs/build/win32/nsis/bochs.nsi.in b/bochs/build/win32/nsis/bochs.nsi.in index 1e87c55b8..b270e1c62 100644 --- a/bochs/build/win32/nsis/bochs.nsi.in +++ b/bochs/build/win32/nsis/bochs.nsi.in @@ -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 diff --git a/bochs/bxversion.h.in b/bochs/bxversion.h.in index 0605231c4..81c5e9bf6 100644 --- a/bochs/bxversion.h.in +++ b/bochs/bxversion.h.in @@ -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@" diff --git a/bochs/bxversion.rc.in b/bochs/bxversion.rc.in index cf309e8de..ee234e381 100644 --- a/bochs/bxversion.rc.in +++ b/bochs/bxversion.rc.in @@ -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" { diff --git a/bochs/configure b/bochs/configure index 0b44a771c..3ca5123e2 100755 --- a/bochs/configure +++ b/bochs/configure @@ -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" diff --git a/bochs/configure.in b/bochs/configure.in index 744a31565..e35b82973 100644 --- a/bochs/configure.in +++ b/bochs/configure.in @@ -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) diff --git a/bochs/doc/docbook/development/development.dbk b/bochs/doc/docbook/development/development.dbk index b5c0d4245..53f91c801 100644 --- a/bochs/doc/docbook/development/development.dbk +++ b/bochs/doc/docbook/development/development.dbk @@ -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"