From 9e4d724d1df04863883b10f570cc0a458c24c997 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sat, 7 Sep 2013 12:44:53 +0000
Subject: valid version resource

git-svn-id: http://svn.miranda-ng.org/main/trunk@5996 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/MRA/res/version.rc | 44 +++++++++++++-------------------------------
 protocols/MRA/src/Mra.cpp    |  2 +-
 protocols/MRA/src/Mra.h      |  3 +++
 protocols/MRA/src/version.h  | 18 +++++++++++++-----
 4 files changed, 30 insertions(+), 37 deletions(-)

(limited to 'protocols')

diff --git a/protocols/MRA/res/version.rc b/protocols/MRA/res/version.rc
index c36de9b592..5bfbab4754 100644
--- a/protocols/MRA/res/version.rc
+++ b/protocols/MRA/res/version.rc
@@ -1,49 +1,34 @@
+// Microsoft Visual C++ generated resource script.
+//
 #ifdef APSTUDIO_INVOKED
 #error this file is not editable by Microsoft Visual C++
 #endif //APSTUDIO_INVOKED
 
+#include "afxres.h"
 #include "..\src\version.h"
-#include "winres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-// Neutral resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)
-#ifdef _WIN32
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-#pragma code_page(1251)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1, 20, 0, 1
- PRODUCTVERSION 1, 20, 0, 1
- FILEFLAGSMASK 0x3fL
+ FILEVERSION __FILEVERSION_STRING
+ PRODUCTVERSION __FILEVERSION_STRING
+ FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
 #else
  FILEFLAGS 0x0L
 #endif
- FILEOS 0x40004L
- FILETYPE 0x1L
+ FILEOS 0x4L
+ FILETYPE 0x0L
  FILESUBTYPE 0x0L
 BEGIN
     BLOCK "StringFileInfo"
     BEGIN
         BLOCK "000004b0"
         BEGIN
-            VALUE "About Miranda", "Miranda NG is a new generation IM client, extensible with numerous plugins. Get Miranda NG at http://miranda-ng.org/"
-            VALUE "Comments", "Rozhuk_I@mail.ru"
-            VALUE "FileDescription", "Miranda Mail.ru Agent protocol plugin"
-            VALUE "FileVersion", "1, 20, 0, 1"
-            VALUE "LegalCopyright", "Copyright © 2005-2009 Rozhuk Ivan"
-            VALUE "OriginalFilename", "Mra.dll"
-            VALUE "ProductName", "Plugin for Miranda NG"
-            VALUE "ProductVersion", "1, 20, 0, 1"
+            VALUE "FileDescription", __DESCRIPTION
+            VALUE "InternalName", __PLUGIN_NAME
+            VALUE "LegalCopyright", __COPYRIGHT
+            VALUE "OriginalFilename", __FILENAME
+            VALUE "ProductName", __PLUGIN_NAME
         END
     END
     BLOCK "VarFileInfo"
@@ -51,6 +36,3 @@ BEGIN
         VALUE "Translation", 0x0, 1200
     END
 END
-
-#endif    // Neutral resources
-/////////////////////////////////////////////////////////////////////////////
diff --git a/protocols/MRA/src/Mra.cpp b/protocols/MRA/src/Mra.cpp
index 961e8f1d3e..d0a32f7aa3 100644
--- a/protocols/MRA/src/Mra.cpp
+++ b/protocols/MRA/src/Mra.cpp
@@ -6,7 +6,7 @@ int hLangpack;
 PLUGININFOEX pluginInfoEx = {
 	sizeof(PLUGININFOEX),
 	PROTOCOL_DISPLAY_NAME_ORIGA,
-	__VERSION_DWORD,
+	PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
 	"Mail.ru Agent (MRA) protocol support for Miranda NG.",
 	"Rozhuk Ivan",
 	"Rozhuk_I@mail.ru",
diff --git a/protocols/MRA/src/Mra.h b/protocols/MRA/src/Mra.h
index b3d2e5f521..a6b234c6d0 100644
--- a/protocols/MRA/src/Mra.h
+++ b/protocols/MRA/src/Mra.h
@@ -73,6 +73,9 @@
 #include <m_nudge.h>
 #include <m_proto_listeningto.h>
 
+#define PROTO_VERSION_MAJOR     1
+#define PROTO_VERSION_MINOR     21
+
 #include "resource.h"
 #include "..\xstatus_MRA\src\resource.h"
 
diff --git a/protocols/MRA/src/version.h b/protocols/MRA/src/version.h
index f8c4fb2be7..85381a098d 100644
--- a/protocols/MRA/src/version.h
+++ b/protocols/MRA/src/version.h
@@ -1,6 +1,14 @@
-#define __FILEVERSION_STRING        2, 1, 0, 2
-#define __VERSION_STRING            "2.1.0.2"
-#define __VERSION_DWORD             PLUGIN_MAKE_VERSION(2, 1, 0, 2)
+#define __MAJOR_VERSION      2
+#define __MINOR_VERSION      1
+#define __RELEASE_NUM        0
+#define __BUILD_NUM          3
 
-#define PROTO_VERSION_MAJOR     1
-#define PROTO_VERSION_MINOR     21
+#define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM
+
+#define __PLUGIN_NAME        "MRA"
+#define __FILENAME           "MRA.dll"
+#define __DESCRIPTION        "Miranda Mail.ru Agent protocol plugin."
+#define __AUTHOR             "Ivan Rozhuk"
+#define __AUTHOREMAIL        "Rozhuk_I@mail.ru"
+#define __AUTHORWEB          "http://miranda-ng.org/p/MRA/"
+#define __COPYRIGHT          "© 2005-2009 Rozhuk Ivan"
-- 
cgit v1.2.3