From 75c34236664a157a45ccb64afbbed8172ddc898a Mon Sep 17 00:00:00 2001
From: "SND\\EreTIk_cp" <SND\EreTIk_cp@9b283d60-5439-405e-af05-b73fd8c4d996>
Date: Mon, 16 Jan 2012 15:19:41 +0000
Subject: [PATCH] [0.1.x] ~ version fixed

git-svn-id: https://pykd.svn.codeplex.com/svn@73231 9b283d60-5439-405e-af05-b73fd8c4d996
---
 pykd/dbgext.cpp          |  2 +-
 pykd/pykd.rc             |  8 ++++----
 pykd/pykdver.h           | 10 ++++++----
 test/scripts/pykdtest.py |  2 +-
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/pykd/dbgext.cpp b/pykd/dbgext.cpp
index 429661c..655e8b0 100644
--- a/pykd/dbgext.cpp
+++ b/pykd/dbgext.cpp
@@ -24,7 +24,7 @@ using namespace pykd;
 
 ////////////////////////////////////////////////////////////////////////////////
 
-static const std::string pykdVersion = PYKD_VERSION_BUILD;
+static const std::string pykdVersion = PYKD_VERSION_BUILD_STR;
 
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/pykd/pykd.rc b/pykd/pykd.rc
index 6fa5ca1..0366f42 100644
--- a/pykd/pykd.rc
+++ b/pykd/pykd.rc
@@ -54,8 +54,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,1,0,5
- PRODUCTVERSION 0,1,0,5
+ FILEVERSION PYKD_VERSION_BUILD
+ PRODUCTVERSION PYKD_VERSION_BUILD
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -71,11 +71,11 @@ BEGIN
         BLOCK "041904b0"
         BEGIN
             VALUE "FileDescription", "pykd - python extension for windbg"
-            VALUE "FileVersion", PYKD_VERSION_BUILD
+            VALUE "FileVersion", PYKD_VERSION_BUILD_STR
             VALUE "InternalName", "pykd"
             VALUE "OriginalFilename", "pykd.dll"
             VALUE "ProductName", "pykd  - python extension for windbg"
-            VALUE "ProductVersion", PYKD_VERSION_BUILD
+            VALUE "ProductVersion", PYKD_VERSION_BUILD_STR
         END
     END
     BLOCK "VarFileInfo"
diff --git a/pykd/pykdver.h b/pykd/pykdver.h
index c660330..7da8b65 100644
--- a/pykd/pykdver.h
+++ b/pykd/pykdver.h
@@ -2,8 +2,10 @@
 #define __VER_STR2__(x) #x
 #define __VER_STR1__(x) __VER_STR2__(x)
 
-#define PYKD_VERSION_MAJOR  1
-#define PYKD_VERSION_MINOR  5
+#define PYKD_VERSION_MAJOR      1
+#define PYKD_VERSION_MINOR      5
+
+#define PYKD_VERSION_BUILD      0,PYKD_VERSION_MAJOR,0,PYKD_VERSION_MINOR
+
+#define PYKD_VERSION_BUILD_STR  __VER_STR1__(PYKD_VERSION_BUILD)
 
-#define PYKD_VERSION_BUILD  \
-    "0." __VER_STR1__(PYKD_VERSION_MAJOR) ".0." __VER_STR1__(PYKD_VERSION_MINOR)
diff --git a/test/scripts/pykdtest.py b/test/scripts/pykdtest.py
index 621f8f5..ae731de 100644
--- a/test/scripts/pykdtest.py
+++ b/test/scripts/pykdtest.py
@@ -51,7 +51,7 @@ def getTestSuite( singleName = "" ):
 
 if __name__ == "__main__":
 
-    print "\nTesting PyKd " + pykd.version
+    print "\nTesting PyKd ver. " + pykd.version
 
     target.appPath = sys.argv[1]