From c7ab7ad31fd3b26000e24d63101137115155d7a9 Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Tue, 23 Oct 2012 21:01:59 +0000 Subject: FacebookRM: version info standartization git-svn-id: http://svn.miranda-ng.org/main/trunk@2064 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/FacebookRM/facebook_10.vcxproj | 2 ++ protocols/FacebookRM/facebook_10.vcxproj.filters | 6 ++++ protocols/FacebookRM/res/facebook.rc | 37 ----------------------- protocols/FacebookRM/res/version.rc | 38 ++++++++++++++++++++++++ protocols/FacebookRM/src/main.cpp | 15 +++++----- protocols/FacebookRM/src/version.h | 20 +++++++++++++ 6 files changed, 74 insertions(+), 44 deletions(-) create mode 100644 protocols/FacebookRM/res/version.rc create mode 100644 protocols/FacebookRM/src/version.h diff --git a/protocols/FacebookRM/facebook_10.vcxproj b/protocols/FacebookRM/facebook_10.vcxproj index cee488a485..58ea477168 100644 --- a/protocols/FacebookRM/facebook_10.vcxproj +++ b/protocols/FacebookRM/facebook_10.vcxproj @@ -213,6 +213,7 @@ + @@ -221,6 +222,7 @@ + diff --git a/protocols/FacebookRM/facebook_10.vcxproj.filters b/protocols/FacebookRM/facebook_10.vcxproj.filters index 9804b4d105..3fe9cf5139 100644 --- a/protocols/FacebookRM/facebook_10.vcxproj.filters +++ b/protocols/FacebookRM/facebook_10.vcxproj.filters @@ -125,6 +125,9 @@ Header Files + + Header Files + @@ -141,5 +144,8 @@ Resource Files + + Resource Files + \ No newline at end of file diff --git a/protocols/FacebookRM/res/facebook.rc b/protocols/FacebookRM/res/facebook.rc index 7659ac4613..7b7325a3a8 100644 --- a/protocols/FacebookRM/res/facebook.rc +++ b/protocols/FacebookRM/res/facebook.rc @@ -250,43 +250,6 @@ END #endif // APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,0,9,0 - PRODUCTVERSION 0,0,9,0 - FILEFLAGSMASK 0x17L -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x4L - FILETYPE 0x2L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "FileDescription", "Facebook protocol plugin for Miranda NG" - VALUE "FileVersion", "0.0.9.0" - VALUE "InternalName", "Facebook RM" - VALUE "LegalCopyright", "Copyright © 2009-2011 Michal Zelinka, 2011-2012 Robert Pösel" - VALUE "OriginalFilename", "facebook.dll" - VALUE "ProductName", "Facebook Protocol RM" - VALUE "ProductVersion", "0.0.9.0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - #endif // English (United States) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/protocols/FacebookRM/res/version.rc b/protocols/FacebookRM/res/version.rc new file mode 100644 index 0000000000..5bfbab4754 --- /dev/null +++ b/protocols/FacebookRM/res/version.rc @@ -0,0 +1,38 @@ +// 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" + +VS_VERSION_INFO VERSIONINFO + FILEVERSION __FILEVERSION_STRING + PRODUCTVERSION __FILEVERSION_STRING + FILEFLAGSMASK 0x17L +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x4L + FILETYPE 0x0L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "000004b0" + BEGIN + VALUE "FileDescription", __DESCRIPTION + VALUE "InternalName", __PLUGIN_NAME + VALUE "LegalCopyright", __COPYRIGHT + VALUE "OriginalFilename", __FILENAME + VALUE "ProductName", __PLUGIN_NAME + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0, 1200 + END +END diff --git a/protocols/FacebookRM/src/main.cpp b/protocols/FacebookRM/src/main.cpp index 5928b85499..0ba94f5974 100644 --- a/protocols/FacebookRM/src/main.cpp +++ b/protocols/FacebookRM/src/main.cpp @@ -21,6 +21,7 @@ along with this program. If not, see . */ #include "common.h" +#include "version.h" // TODO: Make following as "globals" structure? @@ -33,13 +34,13 @@ DWORD g_mirandaVersion; PLUGININFOEX pluginInfo = { sizeof(PLUGININFOEX), - "Facebook Protocol RM", - __VERSION_DWORD, - "Provides basic support for Facebook Chat protocol.", - "Michal Zelinka, Robert Posel", - "robyer@seznam.cz", - "(c) 2009-11 Michal Zelinka, 2011-12 Robert Posel", - "http://miranda-ng.org/", + __PLUGIN_NAME, + PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM), + __DESCRIPTION, + __AUTHOR, + __AUTHOREMAIL, + __COPYRIGHT, + __AUTHORWEB, UNICODE_AWARE, // {8432B009-FF32-4727-AAE6-A9035038FD58} { 0x8432b009, 0xff32, 0x4727, { 0xaa, 0xe6, 0xa9, 0x3, 0x50, 0x38, 0xfd, 0x58 } } diff --git a/protocols/FacebookRM/src/version.h b/protocols/FacebookRM/src/version.h new file mode 100644 index 0000000000..e4c63007e3 --- /dev/null +++ b/protocols/FacebookRM/src/version.h @@ -0,0 +1,20 @@ +#define __MAJOR_VERSION 0 +#define __MINOR_VERSION 0 +#define __RELEASE_NUM 9 +#define __BUILD_NUM 2 + +#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 "Facebook RM" +#define __INTERNAL_NAME "Facebook RM" +#define __FILENAME "Facebook.dll" +#define __DESCRIPTION "Facebook protocol plugin for Miranda NG." +#define __AUTHOR "Michal Zelinka, Robert Posel" +#define __AUTHOREMAIL "robyer@seznam.cz" +#define __AUTHORWEB "http://miranda-ng.org/" +#define __COPYRIGHT "(c) 2009-11 Michal Zelinka, 2011-12 Robert Posel" -- cgit v1.2.3