From 05c460ac137d831f1f264c4a70c81320b5297c0f Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Sun, 10 Feb 2013 18:41:05 +0000 Subject: fixed version info git-svn-id: http://svn.miranda-ng.org/main/trunk@3535 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Console/Console_11.vcxproj | 13 ++++--- plugins/Console/Console_11.vcxproj.filters | 3 -- plugins/Console/res/version.rc | 45 ++++++------------------- plugins/Console/src/commonheaders.cpp | 24 ------------- plugins/Console/src/commonheaders.h | 20 ++--------- plugins/Console/src/init.cpp | 14 ++++---- plugins/Console/src/version.h | 54 ++++++++---------------------- 7 files changed, 41 insertions(+), 132 deletions(-) delete mode 100644 plugins/Console/src/commonheaders.cpp diff --git a/plugins/Console/Console_11.vcxproj b/plugins/Console/Console_11.vcxproj index 6921b0fa50..f9345f2909 100644 --- a/plugins/Console/Console_11.vcxproj +++ b/plugins/Console/Console_11.vcxproj @@ -77,7 +77,7 @@ Disabled ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;Console_EXPORTS;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -96,13 +96,14 @@ $(IntDir)$(TargetName).lib Windows $(ProfileDir)..\..\bin11\lib + Comctl32.lib;%(AdditionalDependencies) Disabled ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - WIN64;_DEBUG;_WINDOWS;_USRDLL;Console_EXPORTS;%(PreprocessorDefinitions) + WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -120,6 +121,7 @@ $(IntDir)$(TargetName).lib Windows $(ProfileDir)..\..\bin11\lib + Comctl32.lib;%(AdditionalDependencies) @@ -127,7 +129,7 @@ Full AnySuitable ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;Console_EXPORTS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true true Use @@ -149,6 +151,7 @@ Windows $(ProfileDir)..\..\bin11\lib /PDBALTPATH:%_PDB% + Comctl32.lib;%(AdditionalDependencies) @@ -156,7 +159,7 @@ Full AnySuitable ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - WIN64;NDEBUG;_WINDOWS;_USRDLL;Console_EXPORTS;%(PreprocessorDefinitions) + WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true true Use @@ -178,6 +181,7 @@ Windows $(ProfileDir)..\..\bin11\lib /PDBALTPATH:%_PDB% + Comctl32.lib;%(AdditionalDependencies) @@ -186,7 +190,6 @@ - diff --git a/plugins/Console/Console_11.vcxproj.filters b/plugins/Console/Console_11.vcxproj.filters index f497b06cd9..8139c98e03 100644 --- a/plugins/Console/Console_11.vcxproj.filters +++ b/plugins/Console/Console_11.vcxproj.filters @@ -15,9 +15,6 @@ - - Source Files - Source Files diff --git a/plugins/Console/res/version.rc b/plugins/Console/res/version.rc index d095fdddac..5bfbab4754 100644 --- a/plugins/Console/res/version.rc +++ b/plugins/Console/res/version.rc @@ -4,54 +4,31 @@ #error this file is not editable by Microsoft Visual C++ #endif //APSTUDIO_INVOKED -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include -#include <..\src\version.h> -///////////////////////////////////////////////////////////////////////////// -#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) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// Version -// +#include "afxres.h" +#include "..\src\version.h" 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 0x1L + FILEOS 0x4L + FILETYPE 0x0L FILESUBTYPE 0x0L BEGIN BLOCK "StringFileInfo" BEGIN BLOCK "000004b0" BEGIN - VALUE "FileDescription", __PLUGIN_DESC - VALUE "FileVersion", __VERSION_STRING - VALUE "InternalName", __PLUGIN_SHORTNAME - VALUE "LegalCopyright", __PLUGIN_RIGHTS - VALUE "OriginalFilename", __PLUGIN_FILE - VALUE "ProductName", __PLUGIN_SHORTNAME - VALUE "ProductVersion", __VERSION_STRING + VALUE "FileDescription", __DESCRIPTION + VALUE "InternalName", __PLUGIN_NAME + VALUE "LegalCopyright", __COPYRIGHT + VALUE "OriginalFilename", __FILENAME + VALUE "ProductName", __PLUGIN_NAME END END BLOCK "VarFileInfo" @@ -59,5 +36,3 @@ BEGIN VALUE "Translation", 0x0, 1200 END END - -#endif diff --git a/plugins/Console/src/commonheaders.cpp b/plugins/Console/src/commonheaders.cpp deleted file mode 100644 index cbfb79d624..0000000000 --- a/plugins/Console/src/commonheaders.cpp +++ /dev/null @@ -1,24 +0,0 @@ -/* - -Miranda IM: the free IM client for Microsoft* Windows* - -Copyright 2000-2008 Miranda ICQ/IM project, -all portions of this codebase are copyrighted to the people -listed in contributors.txt. - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -*/ - -#include "commonheaders.h" \ No newline at end of file diff --git a/plugins/Console/src/commonheaders.h b/plugins/Console/src/commonheaders.h index 7689c7dce2..4f6f420148 100644 --- a/plugins/Console/src/commonheaders.h +++ b/plugins/Console/src/commonheaders.h @@ -24,40 +24,24 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define _CRT_SECURE_NO_WARNINGS #define _WIN32_WINNT 0x0501 -#pragma comment( lib, "comctl32.lib") - #include -#include -#include -#include -#include #include -#include #include -#include -#include -#include - -#define MIRANDA_VER 0x0A00 #include #include -#include -#include #include #include #include #include -#include #include -#include #include #include #include -#include + #include -#include "resource.h" +#include "resource.h" #include "version.h" extern HINSTANCE hInst; diff --git a/plugins/Console/src/init.cpp b/plugins/Console/src/init.cpp index 5dc110e778..4a31091bd2 100644 --- a/plugins/Console/src/init.cpp +++ b/plugins/Console/src/init.cpp @@ -30,14 +30,14 @@ HINSTANCE hInst; PLUGININFOEX pluginInfoEx={ sizeof(PLUGININFOEX), __PLUGIN_NAME, - __VERSION_DWORD, - __PLUGIN_LONGDESC, - __PLUGIN_AUTHOR, - __PLUGIN_EMAIL, - __PLUGIN_RIGHTS, - __PLUGIN_URL, + PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM), + __DESCRIPTION, + __AUTHOR, + __AUTHOREMAIL, + __COPYRIGHT, + __AUTHORWEB, UNICODE_AWARE, - // {23D4F302-D513-45b7-9027-445F29557311} + // {23D4F302-D513-45B7-9027-445F29557311} {0x23d4f302, 0xd513, 0x45b7, {0x90, 0x27, 0x44, 0x5f, 0x29, 0x55, 0x73, 0x11}} }; diff --git a/plugins/Console/src/version.h b/plugins/Console/src/version.h index 7cde649cc9..9e6cc6d752 100644 --- a/plugins/Console/src/version.h +++ b/plugins/Console/src/version.h @@ -1,40 +1,14 @@ -/* - -Miranda IM: the free IM client for Microsoft* Windows* - -Copyright 2000-2008 Miranda ICQ/IM project, -all portions of this codebase are copyrighted to the people -listed in contributors.txt. - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -*/ - - -#define __FILEVERSION_STRING 0,0,7,3 -#define __VERSION_STRING "0.0.7.3" -#define __VERSION_DWORD 0x00000703 - - -#define __PLUGIN_DESC "Console log window for Miranda." -#define __PLUGIN_LONGDESC __PLUGIN_DESC -#define __PLUGIN_AUTHOR "Bio" -#define __PLUGIN_EMAIL "bio@ktaspb.ru" -#define __PLUGIN_RIGHTS "© 2005-2012 Bio" -#define __PLUGIN_FILE "Console.dll" -#define __PLUGIN_SHORTNAME "Console" - - -#define __PLUGIN_NAME __PLUGIN_SHORTNAME -#define __PLUGIN_URL "http://miranda-ng.org/" +#define __MAJOR_VERSION 0 +#define __MINOR_VERSION 0 +#define __RELEASE_NUM 7 +#define __BUILD_NUM 3 + +#define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM + +#define __PLUGIN_NAME "Console" +#define __FILENAME "Console.dll" +#define __DESCRIPTION "Console log window for Miranda." +#define __AUTHOR "Bio" +#define __AUTHOREMAIL "bio@ktaspb.ru" +#define __AUTHORWEB "http://miranda-ng.org/" +#define __COPYRIGHT "© 2005-2012 Bio" -- cgit v1.2.3