AVS

standard version info

git-svn-id: http://svn.miranda-ng.org/main/trunk@1880 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

3 files changed, 40 insertions, 85 deletions

diff --git a/plugins/AVS/res/version.rc b/plugins/AVS/res/version.rc
index e1275b667c..d741488c4f 100644
--- a/plugins/AVS/res/version.rc
+++ b/plugins/AVS/res/version.rc
@@ -4,101 +4,39 @@
 #error this file is not editable by Microsoft Visual C++

 #endif //APSTUDIO_INVOKED

 

-#include "..\src\resource.h"

+#include "afxres.h"

 #include "..\src\version.h"

-#include "winres.h"

 

-#define APSTUDIO_READONLY_SYMBOLS

-/////////////////////////////////////////////////////////////////////////////

-//

-// Generated from the TEXTINCLUDE 2 resource.

-//

-

-

-/////////////////////////////////////////////////////////////////////////////

-#undef APSTUDIO_READONLY_SYMBOLS

-

-/////////////////////////////////////////////////////////////////////////////

-// English (U.S.) resources

-

-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)

 #ifdef _WIN32

-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

-#pragma code_page( 1252)

+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

 #endif //_WIN32

 

-#ifdef APSTUDIO_INVOKED

-/////////////////////////////////////////////////////////////////////////////

-//

-// TEXTINCLUDE

-//

-

-1 TEXTINCLUDE 

-BEGIN

-    "..\\src\\resource.h\0"

-END

-

-2 TEXTINCLUDE 

-BEGIN

-    "\r\n"

-END

-

-3 TEXTINCLUDE 

-BEGIN

-    "\r\n"

-END

-

-#endif    // APSTUDIO_INVOKED

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// Version

-//

-

 VS_VERSION_INFO VERSIONINFO

  FILEVERSION __FILEVERSION_STRING

  PRODUCTVERSION __FILEVERSION_STRING

- FILEFLAGSMASK 0x3fL

+ FILEFLAGSMASK 0x17L

 #ifdef _DEBUG

  FILEFLAGS 0x1L

 #else

  FILEFLAGS 0x0L

 #endif

- FILEOS 0x40004L

- FILETYPE 0x2L

+ FILEOS 0x4L

+ FILETYPE 0x0L

  FILESUBTYPE 0x0L

 BEGIN

     BLOCK "StringFileInfo"

     BEGIN

-        BLOCK "040904b0"

+        BLOCK "000004b0"

         BEGIN

-			VALUE "Comments", "Service plugin to load and update avatars for Miranda NG"

-            VALUE "CompanyName", "Written by Nightwish and Pescuma for Miranda NG project"

-            VALUE "FileDescription", "Service plugin to load and update avatars for Miranda NG"

-            VALUE "FileVersion", __FILEVERSION_STRING

-            VALUE "InternalName", "avs"

-            VALUE "LegalCopyright", "Copyright (C) 2010, Nightwish, Pescuma"

-            VALUE "LegalTrademarks", "Licensed under the Gnu General Public License V2 or any later version"

-            VALUE "OriginalFilename", "avs.dll"

-            VALUE "ProductName", "Miranda NG Avatar Service"

-            VALUE "ProductVersion", __FILEVERSION_STRING

-		END

+            VALUE "FileDescription", __DESCRIPTION

+            VALUE "InternalName", __PLUGIN_NAME

+            VALUE "LegalCopyright", __COPYRIGHT

+            VALUE "OriginalFilename", __FILENAME

+            VALUE "ProductName", __PLUGIN_NAME

+        END

     END

     BLOCK "VarFileInfo"

     BEGIN

-        VALUE "Translation", 0x409, 1200

+        VALUE "Translation", 0x0, 1200

     END

 END

-

-

-#ifndef APSTUDIO_INVOKED

-/////////////////////////////////////////////////////////////////////////////

-//

-// Generated from the TEXTINCLUDE 3 resource.

-//

-

-

-/////////////////////////////////////////////////////////////////////////////

-#endif    // not APSTUDIO_INVOKED

-

-#endif    // AFX_RESOURCE_DLL

diff --git a/plugins/AVS/src/main.cpp b/plugins/AVS/src/main.cpp
index 6e6555a117..0965be9877 100644
--- a/plugins/AVS/src/main.cpp
+++ b/plugins/AVS/src/main.cpp
@@ -96,13 +96,13 @@ FI_INTERFACE *fei = 0;
 

 PLUGININFOEX pluginInfoEx = {

 	sizeof(PLUGININFOEX),

-	"Avatar service",

-	__VERSION_DWORD,

-	"Load and manage contact pictures for other plugins.",

-	"Nightwish, Pescuma",

-	"",

-	"Copyright 2000-2012 Miranda-IM project",

-	"http://miranda-ng.org/",

+	__PLUGIN_NAME,

+	PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),

+	__DESCRIPTION,

+	__AUTHOR,

+	__AUTHOREMAIL,

+	__COPYRIGHT,

+	__AUTHORWEB,

 	UNICODE_AWARE,

 // {E00F1643-263C-4599-B84B-053E5C511D29}

 	{ 0xe00f1643, 0x263c, 0x4599, { 0xb8, 0x4b, 0x5, 0x3e, 0x5c, 0x51, 0x1d, 0x29 } }

diff --git a/plugins/AVS/src/version.h b/plugins/AVS/src/version.h
index 0231d7a7ea..11956d9f75 100644
--- a/plugins/AVS/src/version.h
+++ b/plugins/AVS/src/version.h
@@ -1,3 +1,20 @@
-#define __FILEVERSION_STRING        0,11,0,1

-#define __VERSION_STRING            "0.11.0.1"

-#define __VERSION_DWORD             PLUGIN_MAKE_VERSION(0, 11, 0, 1)

+#define __MAJOR_VERSION				0

+#define __MINOR_VERSION				11

+#define __RELEASE_NUM				0

+#define __BUILD_NUM					1

+

+#define __FILEVERSION_STRING		__MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM

+#define __FILEVERSION_DOTS			__MAJOR_VERSION.__MINOR_VERSION.__RELEASE_NUM.__BUILD_NUM

+

+#define __STRINGIFY_IMPL(x)			#x

+#define __STRINGIFY(x)				__STRINGIFY_IMPL(x)

+#define __VERSION_STRING			__STRINGIFY(__FILEVERSION_DOTS)

+

+#define __PLUGIN_NAME				"Avatar service"

+#define __INTERNAL_NAME				"AVS"

+#define __FILENAME					"AVS.dll"

+#define __DESCRIPTION 				"Load and manage contact pictures for other plugins."

+#define __AUTHOR					"Nightwish, Pescuma"

+#define __AUTHOREMAIL				"http://miranda-ng.org/"

+#define __AUTHORWEB					"http://miranda-ng.org/"

+#define __COPYRIGHT					"© 2000-2012 Miranda-IM project, 2012 Miranda NG team"