From a25fa3693ae90d95b784b0797bf9f8060c2f4e30 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Sun, 10 Feb 2013 18:26:45 +0000 Subject: fixed version info git-svn-id: http://svn.miranda-ng.org/main/trunk@3534 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/CmdLine/CmdLine_11.vcxproj | 8 ++-- plugins/CmdLine/MimCmd/res/version.rc | 85 +++++------------------------------ plugins/CmdLine/MimCmd/src/MimCmd.cpp | 4 +- plugins/CmdLine/MimCmd/src/common.h | 4 +- plugins/CmdLine/res/version.rc | 85 +++++------------------------------ plugins/CmdLine/src/CmdLine.cpp | 8 ++-- plugins/CmdLine/src/commonheaders.h | 9 ---- plugins/CmdLine/src/version.h | 63 ++++++-------------------- 8 files changed, 45 insertions(+), 221 deletions(-) (limited to 'plugins/CmdLine') diff --git a/plugins/CmdLine/CmdLine_11.vcxproj b/plugins/CmdLine/CmdLine_11.vcxproj index c02cedc80e..ec10a012fa 100644 --- a/plugins/CmdLine/CmdLine_11.vcxproj +++ b/plugins/CmdLine/CmdLine_11.vcxproj @@ -77,7 +77,7 @@ Disabled ..\..\include;..\ExternalAPI%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;CMDLINE_EXPORTS;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -104,7 +104,7 @@ Disabled ..\..\include;..\ExternalAPI%(AdditionalIncludeDirectories) - WIN64;_DEBUG;_WINDOWS;_USRDLL;CMDLINE_EXPORTS;%(PreprocessorDefinitions) + WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -129,7 +129,7 @@ ..\..\include;..\ExternalAPI%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;CMDLINE_EXPORTS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) Use Level3 commonheaders.h @@ -156,7 +156,7 @@ ..\..\include;..\ExternalAPI%(AdditionalIncludeDirectories) - WIN64;NDEBUG;_WINDOWS;_USRDLL;CMDLINE_EXPORTS;%(PreprocessorDefinitions) + WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) Use Level3 commonheaders.h diff --git a/plugins/CmdLine/MimCmd/res/version.rc b/plugins/CmdLine/MimCmd/res/version.rc index a76ba93541..5bfbab4754 100644 --- a/plugins/CmdLine/MimCmd/res/version.rc +++ b/plugins/CmdLine/MimCmd/res/version.rc @@ -4,61 +4,12 @@ #error this file is not editable by Microsoft Visual C++ #endif //APSTUDIO_INVOKED -#include "..\..\src\version.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// #include "afxres.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 - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE -BEGIN - "..\\src\\resource.h\0" -END - -2 TEXTINCLUDE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Version -// +#include "..\src\version.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION __PLUGINVERSION_STRING - PRODUCTVERSION __PLUGINVERSION_STRING + FILEVERSION __FILEVERSION_STRING + PRODUCTVERSION __FILEVERSION_STRING FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -66,38 +17,22 @@ VS_VERSION_INFO VERSIONINFO FILEFLAGS 0x0L #endif FILEOS 0x4L - FILETYPE 0x2L + FILETYPE 0x0L FILESUBTYPE 0x0L BEGIN BLOCK "StringFileInfo" BEGIN - BLOCK "040904b0" + BLOCK "000004b0" BEGIN - VALUE "Author", __AUTHOR - VALUE "FileDescription", __DESC - VALUE "FileVersion", __VERSION_STRING - VALUE "InternalName", __PLUGIN_DISPLAY_NAME + 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 // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - diff --git a/plugins/CmdLine/MimCmd/src/MimCmd.cpp b/plugins/CmdLine/MimCmd/src/MimCmd.cpp index 07daf85a0c..94f614a20c 100644 --- a/plugins/CmdLine/MimCmd/src/MimCmd.cpp +++ b/plugins/CmdLine/MimCmd/src/MimCmd.cpp @@ -19,8 +19,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "common.h" -#include "..\..\src\utils.h" -#include "..\..\src\version.h" int hLangpack = 0; @@ -71,7 +69,7 @@ void ShowVersion() char name[128]; char message[1024]; GetProgramName(name, sizeof(name)); - mir_snprintf(message, sizeof(message), Translate("%s version %s"), name, __VERSION_STRING); + mir_snprintf(message, sizeof(message), Translate("%s version %s"), name, __FILEVERSION_STRING); lpprintf("%s\n", message); } diff --git a/plugins/CmdLine/MimCmd/src/common.h b/plugins/CmdLine/MimCmd/src/common.h index 0086237671..4fb16a914d 100644 --- a/plugins/CmdLine/MimCmd/src/common.h +++ b/plugins/CmdLine/MimCmd/src/common.h @@ -22,15 +22,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include -#include #define NO_MIMCMD_COMMANDS -#include #include #include #include "..\..\src\mimcmd_ipc.h" +#include "..\..\src\version.h" +#include "..\..\src\utils.h" #include "commands.h" int lpprintf(const char *format, ...); diff --git a/plugins/CmdLine/res/version.rc b/plugins/CmdLine/res/version.rc index c951874242..5bfbab4754 100644 --- a/plugins/CmdLine/res/version.rc +++ b/plugins/CmdLine/res/version.rc @@ -4,61 +4,12 @@ #error this file is not editable by Microsoft Visual C++ #endif //APSTUDIO_INVOKED -#include "..\src\version.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// #include "afxres.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 - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE -BEGIN - "..\\src\\resource.h\0" -END - -2 TEXTINCLUDE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Version -// +#include "..\src\version.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION __PLUGINVERSION_STRING - PRODUCTVERSION __PLUGINVERSION_STRING + FILEVERSION __FILEVERSION_STRING + PRODUCTVERSION __FILEVERSION_STRING FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -66,38 +17,22 @@ VS_VERSION_INFO VERSIONINFO FILEFLAGS 0x0L #endif FILEOS 0x4L - FILETYPE 0x2L + FILETYPE 0x0L FILESUBTYPE 0x0L BEGIN BLOCK "StringFileInfo" BEGIN - BLOCK "040904b0" + BLOCK "000004b0" BEGIN - VALUE "Author", __AUTHOR - VALUE "FileDescription", __DESC - VALUE "FileVersion", __VERSION_STRING - VALUE "InternalName", __PLUGIN_DISPLAY_NAME + 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 // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - diff --git a/plugins/CmdLine/src/CmdLine.cpp b/plugins/CmdLine/src/CmdLine.cpp index 58e672274e..933b8f7b3d 100644 --- a/plugins/CmdLine/src/CmdLine.cpp +++ b/plugins/CmdLine/src/CmdLine.cpp @@ -26,15 +26,15 @@ int hLangpack; PLUGININFOEX pluginInfo = { sizeof(PLUGININFOEX), - __PLUGIN_DISPLAY_NAME, - VERSION, - __DESC, + __PLUGIN_NAME, + PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM), + __DESCRIPTION, __AUTHOR, __AUTHOREMAIL, __COPYRIGHT, __AUTHORWEB, UNICODE_AWARE, - // {2f1a117c-3c1b-4c01-89ea-6d8fd85a9b4c} + // {2F1A117C-3C1B-4C01-89EA-6D8FD85A9B4C} {0x2f1a117c, 0x3c1b, 0x4c01, {0x89, 0xea, 0x6d, 0x8f, 0xd8, 0x5a, 0x9b, 0x4c}} }; diff --git a/plugins/CmdLine/src/commonheaders.h b/plugins/CmdLine/src/commonheaders.h index 0359097b5c..9cd110bc24 100644 --- a/plugins/CmdLine/src/commonheaders.h +++ b/plugins/CmdLine/src/commonheaders.h @@ -23,24 +23,17 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define _CRT_SECURE_NO_WARNINGS -#include -#include -#include #include #include #include "newpluginapi.h" #include "m_database.h" -#include "m_system.h" #include "m_clist.h" #include "m_clui.h" #include "m_contacts.h" #include "m_langpack.h" -#include "m_options.h" #include "m_protosvc.h" -#include "m_protocols.h" #include "m_popup.h" -#include "m_utils.h" #include "m_message.h" #include "m_ignore.h" @@ -60,8 +53,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. extern char ModuleName[]; extern HINSTANCE hInstance; -//extern PLUGINLINK *pluginLink; - extern int bUseANSIStrings; extern int bWaitForUnload; diff --git a/plugins/CmdLine/src/version.h b/plugins/CmdLine/src/version.h index 61927e994d..60c98a6dd5 100644 --- a/plugins/CmdLine/src/version.h +++ b/plugins/CmdLine/src/version.h @@ -1,49 +1,14 @@ -/* -CmdLine plugin for Miranda IM - -Copyright © 2007-2010 Cristian Libotean - -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. -*/ - -#ifndef M_CMDLINE_VERSION_H -#define M_CMDLINE_VERSION_H - -#define __MAJOR_VERSION 0 -#define __MINOR_VERSION 0 -#define __RELEASE_NUM 4 -#define __BUILD_NUM 1 - -#define VERSION PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM) - -#define __PLUGINVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM -#define __PLUGINVERSION_STRING_DOTS __MAJOR_VERSION.__MINOR_VERSION.__RELEASE_NUM.__BUILD_NUM -#define __STRINGIFY_(x) #x -#define __STRINGIFY(x) __STRINGIFY_(x) -#define __VERSION_STRING __STRINGIFY(__PLUGINVERSION_STRING_DOTS) - -#define __DESC "This plugin lets you control Miranda from the command line." -#define __AUTHOR "Cristian Libotean" -#define __AUTHOREMAIL "eblis102@yahoo.com" -#define __COPYRIGHT "© 2007-2011 Cristian Libotean" -#define __AUTHORWEB "http://miranda-ng.org/" - -#if defined(WIN64) || defined(_WIN64) -#define __PLUGIN_DISPLAY_NAME "Command Line (x64)" -#else -#define __PLUGIN_DISPLAY_NAME "Command Line" -#endif - -#endif //M_CMDLINE_VERSION_H +#define __MAJOR_VERSION 0 +#define __MINOR_VERSION 0 +#define __RELEASE_NUM 4 +#define __BUILD_NUM 1 + +#define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM + +#define __PLUGIN_NAME "Command line" +#define __FILENAME "CmdLine.dll" +#define __DESCRIPTION "This plugin lets you control Miranda from the command line." +#define __AUTHOR "Cristian Libotean" +#define __AUTHOREMAIL "eblis102@yahoo.com" +#define __AUTHORWEB "http://miranda-ng.org/" +#define __COPYRIGHT "© 2007-2011 Cristian Libotean" -- cgit v1.2.3