Renamed flag VER_SVN to VER_DEV and related changes.

bochs/build/win32/nsis/bochs.nsi.in

@@ -36,7 +36,7 @@
 !define VER_MAJOR @VER_MAJOR@
 !define VER_MINOR @VER_MINOR@
 !define VER_REVISION @VER_REVISION@
-!define VER_SVN   @VER_SVN@
+!define VER_DEV   @VER_DEV@
 !define NAME "Bochs ${VERSION}"
 
 ;---------------------
@@ -81,7 +81,7 @@ Var IndependentSectionState
 ;--------------------------------
 ;Version information
 
-VIProductVersion ${VER_MAJOR}.${VER_MINOR}.${VER_REVISION}.${VER_SVN}
+VIProductVersion ${VER_MAJOR}.${VER_MINOR}.${VER_REVISION}.${VER_DEV}
 VIAddVersionKey "FileVersion" "${VERSION}"
 VIAddVersionKey "FileDescription" "Bochs Setup"
 VIAddVersionKey "LegalCopyright" "Copyright 2001-2019 The Bochs Project"
@@ -96,7 +96,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_REVISION & VER_SVN
+!ifdef VER_MAJOR & VER_MINOR & VER_REVISION & VER_DEV
   Page custom PageReinstall PageLeaveReinstall
 !endif
   !insertmacro MULTIUSER_PAGE_INSTALLMODE
@@ -273,7 +273,7 @@ Section -post
   WriteRegDword HKLM "Software\Bochs" "VersionMajor" "${VER_MAJOR}"
   WriteRegDword HKLM "Software\Bochs" "VersionMinor" "${VER_MINOR}"
   WriteRegDword HKLM "Software\Bochs" "VersionRevision" "${VER_REVISION}"
-  WriteRegDword HKLM "Software\Bochs" "VersionSVN" "${VER_SVN}"
+  WriteRegDword HKLM "Software\Bochs" "VersionDev" "${VER_DEV}"
   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"
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bochs" "DisplayVersion" "${VERSION}"
@@ -425,7 +425,7 @@ Pop $R1
 Pop $R0
 FunctionEnd
 
-!ifdef VER_MAJOR & VER_MINOR & VER_REVISION & VER_SVN
+!ifdef VER_MAJOR & VER_MINOR & VER_REVISION & VER_DEV
 
 Var ReinstallPageCheck
 Var OldInstDir
@@ -448,13 +448,13 @@ Function PageReinstall
     ReadRegDWORD $R0 HKLM "Software\Bochs" "VersionMajor"
     ReadRegDWORD $R1 HKLM "Software\Bochs" "VersionMinor"
     ReadRegDWORD $R2 HKLM "Software\Bochs" "VersionRevision"
-    ReadRegDWORD $R3 HKLM "Software\Bochs" "VersionSVN"
+    ReadRegDWORD $R3 HKLM "Software\Bochs" "VersionDev"
   ${Else}
     Abort
   ${Endif}
 
   StrCpy $R0 $R0.$R1.$R2.$R3
-  ${VersionCompare} ${VER_MAJOR}.${VER_MINOR}.${VER_REVISION}.${VER_SVN} $R0 $R0
+  ${VersionCompare} ${VER_MAJOR}.${VER_MINOR}.${VER_REVISION}.${VER_DEV} $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"
@@ -566,6 +566,6 @@ Function PageLeaveReinstall
 
 FunctionEnd
 
-!endif # VER_MAJOR & VER_MINOR & VER_REVISION & VER_SVN
+!endif # VER_MAJOR & VER_MINOR & VER_REVISION & VER_DEV
 
 ;eof

bochs/bxversion.h.in

@@ -4,6 +4,6 @@
 /////////////////////////////////////////////////////////////////////////
 
 #define VERSION       "@VERSION@"
-#define VER_SVNFLAG   @VER_SVN@
+#define VER_DEVFLAG   @VER_DEV@
 #define REL_STRING    "@REL_STRING@"
 #define REL_TIMESTAMP "@REL_TIMESTAMP@"

bochs/bxversion.rc.in

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

bochs/configure

@@ -825,7 +825,7 @@ GUI_NON_PLUGIN_OBJS
 EXTRA_LINK_OPTS
 REL_TIMESTAMP
 REL_STRING
-VER_SVN
+VER_DEV
 VER_REVISION
 VER_MINOR
 VER_MAJOR
@@ -3802,12 +3802,12 @@ ac_config_headers="$ac_config_headers config.h"
 ac_config_headers="$ac_config_headers ltdlconf.h"
 
 
-VERSION="2.7.svn"
+VERSION="2.7.devel"
 VER_MAJOR=2
 VER_MINOR=7
 VER_REVISION=0
-VER_SVN=1
+VER_DEV=1
-REL_STRING="Built from SVN snapshot after release 2.7"
+REL_STRING="Built from GitHub snapshot after release 2.7"
 REL_TIMESTAMP=`grep "Updated:" $srcdir/README | sed 's/Updated: //'`
 
 

bochs/configure.ac

@@ -9,14 +9,14 @@ AC_CONFIG_HEADERS([ltdlconf.h])
 
 dnl // Put Bochs version information right here so that it gets substituted
 dnl // into all the right places.
-VERSION="2.7.svn"
+VERSION="2.7.devel"
 VER_MAJOR=2
 VER_MINOR=7
 dnl // this should be > 90 for pre-release of next version otherwise revision level
 VER_REVISION=0
-dnl // this should be 0 for release and 1 for svn version
+dnl // this should be 0 for release and 1 for development version
-VER_SVN=1
+VER_DEV=1
-REL_STRING="Built from SVN snapshot after release 2.7"
+REL_STRING="Built from GitHub snapshot after release 2.7"
 REL_TIMESTAMP=`grep "Updated:" $srcdir/README | sed 's/Updated: //'`
 
 changequote(<<, >>)
@@ -3319,7 +3319,7 @@ AC_SUBST(VERSION)
 AC_SUBST(VER_MAJOR)
 AC_SUBST(VER_MINOR)
 AC_SUBST(VER_REVISION)
-AC_SUBST(VER_SVN)
+AC_SUBST(VER_DEV)
 AC_SUBST(REL_STRING)
 AC_SUBST(REL_TIMESTAMP)
 AC_SUBST(EXTRA_LINK_OPTS)

bochs/main.cc

@@ -105,7 +105,7 @@ char *bochsrc_filename = NULL;
 
 size_t bx_get_timestamp(char *buffer)
 {
-#if VER_SVNFLAG == 1
+#if VER_DEVFLAG == 1
 #ifdef __DATE__
 #ifdef __TIME__
   sprintf(buffer, "Compiled on %s at %s", __DATE__, __TIME__);