added version info

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

7 files changed, 60 insertions, 50 deletions

diff --git a/plugins/Db3x/db3x_10.vcxproj b/plugins/Db3x/db3x_10.vcxproj
index 5f618258d8..ad6fc07210 100644
--- a/plugins/Db3x/db3x_10.vcxproj
+++ b/plugins/Db3x/db3x_10.vcxproj
@@ -73,7 +73,7 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;DB3X;DB3X_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>false</StringPooling>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

@@ -102,7 +102,7 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;DB3X;DB3X_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>false</StringPooling>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

@@ -132,7 +132,7 @@
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;DB3X;DB3X_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <BufferSecurityCheck>false</BufferSecurityCheck>

       <FunctionLevelLinking>true</FunctionLevelLinking>

@@ -164,7 +164,7 @@
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;DB3X;DB3X_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <ExceptionHandling>false</ExceptionHandling>

       <BufferSecurityCheck>false</BufferSecurityCheck>

@@ -236,6 +236,8 @@
     <ClInclude Include="..\Db3x_mmap\src\dbintf.h" />

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

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

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

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

   </ItemGroup>

   <ItemGroup>

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

diff --git a/plugins/Db3x/db3x_10.vcxproj.filters b/plugins/Db3x/db3x_10.vcxproj.filters
index 928ca8ebc6..16623c0627 100644
--- a/plugins/Db3x/db3x_10.vcxproj.filters
+++ b/plugins/Db3x/db3x_10.vcxproj.filters
@@ -92,6 +92,12 @@
     <ClInclude Include="..\Db3x_mmap\src\dbintf.h">

       <Filter>Mmap</Filter>

     </ClInclude>

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

+      <Filter>Header Files</Filter>

+    </ClInclude>

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

+      <Filter>Header Files</Filter>

+    </ClInclude>

   </ItemGroup>

   <ItemGroup>

     <ResourceCompile Include="res\resource.rc">

diff --git a/plugins/Db3x/db3x_11.vcxproj b/plugins/Db3x/db3x_11.vcxproj
index 9b83e1c457..02e061f8c2 100644
--- a/plugins/Db3x/db3x_11.vcxproj
+++ b/plugins/Db3x/db3x_11.vcxproj
@@ -77,7 +77,7 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;DB3X;DB3X_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>false</StringPooling>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

@@ -106,7 +106,7 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;DB3X;DB3X_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>false</StringPooling>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

@@ -136,7 +136,7 @@
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;DB3X;DB3X_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <BufferSecurityCheck>false</BufferSecurityCheck>

       <FunctionLevelLinking>true</FunctionLevelLinking>

@@ -168,7 +168,7 @@
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;DB3X;DB3X_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <ExceptionHandling>false</ExceptionHandling>

       <BufferSecurityCheck>false</BufferSecurityCheck>

@@ -240,6 +240,8 @@
     <ClInclude Include="..\Db3x_mmap\src\dbintf.h" />

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

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

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

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

   </ItemGroup>

   <ItemGroup>

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

diff --git a/plugins/Db3x/db3x_11.vcxproj.filters b/plugins/Db3x/db3x_11.vcxproj.filters
index 928ca8ebc6..16623c0627 100644
--- a/plugins/Db3x/db3x_11.vcxproj.filters
+++ b/plugins/Db3x/db3x_11.vcxproj.filters
@@ -92,6 +92,12 @@
     <ClInclude Include="..\Db3x_mmap\src\dbintf.h">

       <Filter>Mmap</Filter>

     </ClInclude>

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

+      <Filter>Header Files</Filter>

+    </ClInclude>

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

+      <Filter>Header Files</Filter>

+    </ClInclude>

   </ItemGroup>

   <ItemGroup>

     <ResourceCompile Include="res\resource.rc">

diff --git a/plugins/Db3x/res/version.rc b/plugins/Db3x/res/version.rc
index 080efcd27f..5bfbab4754 100644
--- a/plugins/Db3x/res/version.rc
+++ b/plugins/Db3x/res/version.rc
@@ -1,56 +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"

-#include "winres.h"

-

-#ifdef _WIN32

-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

-#pragma code_page( 1252)

-#endif //_WIN32

-

-#ifndef _MAC

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

-//

-// 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", "\0"

-            VALUE "CompanyName", "Miranda\0"

-            VALUE "FileDescription", "Miranda database plugin\0"

-            VALUE "FileVersion", __VERSION_STRING "\0"

-            VALUE "InternalName", "db3x\0"

-            VALUE "LegalCopyright", "Copyright (c) 2002-12 Miranda team\0"

-            VALUE "LegalTrademarks", "\0"

-            VALUE "OriginalFilename", "db3x.dll\0"

-            VALUE "PrivateBuild", "\0"

-            VALUE "ProductName", "Database plugin\0"

-            VALUE "ProductVersion", __VERSION_STRING "\0"

-            VALUE "SpecialBuild", "\0"

+            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

-

-#endif    // !_MAC

diff --git a/plugins/Db3x/src/init.cpp b/plugins/Db3x/src/init.cpp
index cb0ebf2fd3..96f3da5799 100644
--- a/plugins/Db3x/src/init.cpp
+++ b/plugins/Db3x/src/init.cpp
@@ -28,15 +28,16 @@ int hLangpack;
 static PLUGININFOEX pluginInfo =

 {

 	sizeof(PLUGININFOEX),

-	"Miranda NG database driver",

-	__VERSION_DWORD,

-	"Provides Miranda database support: global settings, contacts, history, settings per contact.",

-	"Miranda NG project",

-	"ghazan@miranda.im",

-	"Copyright 2012 Miranda NG project",

-	"",

+	__PLUGIN_NAME,

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

+	__DESCRIPTION,

+	__AUTHOR,

+	__AUTHOREMAIL,

+	__COPYRIGHT,

+	__AUTHORWEB,

 	UNICODE_AWARE | STATIC_PLUGIN,

-    {0x1394a3ab, 0x2585, 0x4196, { 0x8f, 0x72, 0xe, 0xae, 0xc2, 0x45, 0xe, 0x11 }} //{1394A3AB-2585-4196-8F72-0EAEC2450E11}

+	//{1394A3AB-2585-4196-8F72-0EAEC2450E11}

+    {0x1394a3ab, 0x2585, 0x4196, {0x8f, 0x72, 0xe, 0xae, 0xc2, 0x45, 0xe, 0x11}}

 };

 

 HINSTANCE g_hInst = NULL;

diff --git a/plugins/Db3x/src/version.h b/plugins/Db3x/src/version.h
index 0231d7a7ea..22971a8041 100644
--- a/plugins/Db3x/src/version.h
+++ b/plugins/Db3x/src/version.h
@@ -1,3 +1,14 @@
-#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 __PLUGIN_NAME				"Miranda NG database driver"

+#define __FILENAME					"Dbx_3x.dll"

+#define __DESCRIPTION 				"Provides Miranda database support: global settings, contacts, history, settings per contact."

+#define __AUTHOR					"Miranda NG project"

+#define __AUTHOREMAIL				"ghazan@miranda.im"

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

+#define __COPYRIGHT					"© 2012-13 Miranda NG project"