version info standartization

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

6 files changed, 122 insertions, 18 deletions

diff --git a/plugins/BuddyExpectator/BuddyExpectator10.vcxproj b/plugins/BuddyExpectator/BuddyExpectator10.vcxproj
index 73002d213a..db3470a040 100644
--- a/plugins/BuddyExpectator/BuddyExpectator10.vcxproj
+++ b/plugins/BuddyExpectator/BuddyExpectator10.vcxproj
@@ -170,11 +170,13 @@
   </ItemGroup>

   <ItemGroup>

     <ResourceCompile Include="res\BuddyExpectator.rc" />

+    <ResourceCompile Include="res\Version.rc" />

   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="src\common.h" />

     <ClInclude Include="src\options.h" />

     <ClInclude Include="src\resource.h" />

+    <ClInclude Include="src\Version.h" />

   </ItemGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

   <ImportGroup Label="ExtensionTargets">

diff --git a/plugins/BuddyExpectator/BuddyExpectator10.vcxproj.filters b/plugins/BuddyExpectator/BuddyExpectator10.vcxproj.filters
new file mode 100644
index 0000000000..88b095e588
--- /dev/null
+++ b/plugins/BuddyExpectator/BuddyExpectator10.vcxproj.filters
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup>

+    <ClCompile Include="src\BuddyExpectator.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\options.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="src\common.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\options.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\resource.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\Version.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+  </ItemGroup>

+  <ItemGroup>

+    <Filter Include="Header Files">

+      <UniqueIdentifier>{4780d9ea-3d35-4adb-892d-fb3e363c7b37}</UniqueIdentifier>

+    </Filter>

+    <Filter Include="Source Files">

+      <UniqueIdentifier>{c4fb9db2-6262-4d25-af05-94642f354567}</UniqueIdentifier>

+    </Filter>

+    <Filter Include="Resource Files">

+      <UniqueIdentifier>{dd3a63a1-7707-4ca8-983c-8e5f6ce56f17}</UniqueIdentifier>

+    </Filter>

+  </ItemGroup>

+  <ItemGroup>

+    <ResourceCompile Include="res\BuddyExpectator.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+    <ResourceCompile Include="res\Version.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+  </ItemGroup>

+</Project>
\ No newline at end of file
diff --git a/plugins/BuddyExpectator/res/Version.rc b/plugins/BuddyExpectator/res/Version.rc
new file mode 100644
index 0000000000..5bfbab4754
--- /dev/null
+++ b/plugins/BuddyExpectator/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/plugins/BuddyExpectator/src/BuddyExpectator.cpp b/plugins/BuddyExpectator/src/BuddyExpectator.cpp
index 8a5093564f..1c0646c628 100644
--- a/plugins/BuddyExpectator/src/BuddyExpectator.cpp
+++ b/plugins/BuddyExpectator/src/BuddyExpectator.cpp
@@ -25,7 +25,6 @@
 */

 

 #include "common.h"

-#include "options.h"

 

 HINSTANCE hInst;

 int hLangpack;

@@ -62,23 +61,19 @@ extern int UserinfoInit(WPARAM wparam, LPARAM lparam);
 

 PLUGININFOEX pluginInfo = {

 	sizeof(PLUGININFOEX),

-	"Buddy Expectator+",

-	PLUGIN_MAKE_VERSION(0,1,2,3),

-	"Reacts to the return of contacts, or the the extended absence of contacts, with notifications and other actions",

-	"Anar Ibragimoff, sje, Thief",

-	"thief@miranda.im",

-	"© 2005 Anar Ibragimoff, © 2006 Scott Ellis, © 2007-2009 Alexander Turyak",

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

+	__PLUGIN_NAME,

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

+	__DESCRIPTION,

+	__AUTHOR,

+	__AUTHOREMAIL,

+	__COPYRIGHT,

+	__AUTHORWEB,

 	UNICODE_AWARE,

-	{0xddf8aec9, 0x7d37, 0x49af, {0x9d, 0x22, 0xbb, 0xbc, 0x92, 0x0e, 0x6f, 0x05}} //{DDF8AEC9-7D37-49AF-9D22-BBBC920E6F05}

+	//{DDF8AEC9-7D37-49AF-9D22-BBBC920E6F05}

+	{0xddf8aec9, 0x7d37, 0x49af, {0x9d, 0x22, 0xbb, 0xbc, 0x92, 0x0e, 0x6f, 0x05}}

 };

 

-/* 2D84F403-91F3-4E60-BF02-16C2F1716D86 */

-#define MIID_BUDDYEXPECTATOR {0x2d84f403, 0x91f3, 0x4e60, {0xbf, 0x02, 0x16, 0xc2, 0xf1, 0x71, 0x6d, 0x86}}

-

-extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = {MIID_BUDDYEXPECTATOR, MIID_LAST};

-

-extern "C" BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved)

+BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)

 {

 	hInst = hinstDLL;

 	return TRUE;

diff --git a/plugins/BuddyExpectator/src/Version.h b/plugins/BuddyExpectator/src/Version.h
new file mode 100644
index 0000000000..4737d5a014
--- /dev/null
+++ b/plugins/BuddyExpectator/src/Version.h
@@ -0,0 +1,20 @@
+#define __MAJOR_VERSION				0

+#define __MINOR_VERSION				1

+#define __RELEASE_NUM				2

+#define __BUILD_NUM					3

+

+#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				"Buddy Expectator+"

+#define __INTERNAL_NAME				"Buddy Expectator+"

+#define __FILENAME					"BuddyExpectator.dll"

+#define __DESCRIPTION 				"Reacts to the return of contacts, or the the extended absence of contacts, with notifications and other actions."

+#define __AUTHOR					"Anar Ibragimoff, sje, Thief"

+#define __AUTHOREMAIL				"thief@miranda.im"

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

+#define __COPYRIGHT					"© 2005 Anar Ibragimoff, 2006 Scott Ellis, 2007-2009 Alexander Turyak"

diff --git a/plugins/BuddyExpectator/src/common.h b/plugins/BuddyExpectator/src/common.h
index 18d33040eb..c2d4d80303 100644
--- a/plugins/BuddyExpectator/src/common.h
+++ b/plugins/BuddyExpectator/src/common.h
@@ -35,7 +35,7 @@
 #include <time.h>

 #include <stdio.h>

 #include <locale.h>

-#include "resource.h"

+

 #include <newpluginapi.h>

 #include <m_skin.h>

 #include <m_clist.h>

@@ -50,9 +50,14 @@
 #include <m_message.h>

 #include <m_userinfo.h>

 #include <m_icolib.h>

-#include "m_popup.h"

+#include <m_popup.h>

+#include <m_cluiframes.h>

+

 #include "m_popup2.h"

-#include "m_cluiframes.h"

+

+#include "resource.h"

+#include "options.h"

+#include "version.h"

 

 #define MODULE_NAME     "BuddyExpectator"