Browse code

fix win32 res (git mode), bump ver, make configure more verbose

aCaB authored on 2011/04/07 16:39:58
Showing 4 changed files
... ...
@@ -6,7 +6,7 @@
6 6
 #define REPO_VERSION VERSION
7 7
 #endif
8 8
 
9
-#define RES_VER_Q 3,0,0,0
9
+#define RES_VER_Q 3,1,0,0
10 10
 #define RES_VER_S "ClamAV for Windows 3.0"
11 11
 #define RES_FNAME "clamav.dll"
12 12
 #define RES_NAME "interface"
... ...
@@ -6,7 +6,7 @@
6 6
 #define REPO_VERSION VERSION
7 7
 #endif
8 8
 
9
-#define RES_VER_Q 3,0,0,0
9
+#define RES_VER_Q 3,1,0,0
10 10
 #define RES_VER_S "ClamAV for Windows 3.0"
11 11
 #define RES_FNAME "freshclamwrap.exe"
12 12
 #define RES_NAME "freshclamwrap"
... ...
@@ -2,8 +2,13 @@ aaaa ICON "res/clam.ico"
2 2
 
3 3
 #include "wx/msw/wx.rc"
4 4
 #include "../../../../libclamav/version.h"
5
+#ifndef REPO_VERSION
6
+#define __PLATFORM_H
7
+#include "clamav-config.h"
8
+#define REPO_VERSION VERSION
9
+#endif
5 10
 
6
-#define RES_VER_Q 0,96,4,0
11
+#define RES_VER_Q 3,1,0,0
7 12
 
8 13
 VS_VERSION_INFO VERSIONINFO
9 14
     FILEVERSION RES_VER_Q
... ...
@@ -68,7 +68,8 @@ if(F.FileExists(file_versionsta)) {
68 68
 	of.WriteLine('/* AUTOMATICALLY GENERATED BY configure.js */');
69 69
 	if(version != '') 
70 70
 		of.WriteLine(version);
71
-
71
+	else
72
+		W.Echo('WARNING: unable to determine repository revision');
72 73
 	of.close();
73 74
 }
74 75