From b7800ab808533bc8ff28125f5e40e87b3a044001 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Wed, 27 Feb 2013 13:58:08 +0000 Subject: added version info removed not used headers git-svn-id: http://svn.miranda-ng.org/main/trunk@3796 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Import/import_10.vcxproj | 8 +--- plugins/Import/import_10.vcxproj.filters | 23 +++------- plugins/Import/import_11.vcxproj | 8 +--- plugins/Import/import_11.vcxproj.filters | 23 +++------- plugins/Import/res/Version.rc | 38 +++++++++++++++++ plugins/Import/res/resource.rc | 72 ++++---------------------------- plugins/Import/src/import.cpp | 1 - plugins/Import/src/import.h | 20 +++------ plugins/Import/src/main.cpp | 20 ++++----- plugins/Import/src/miranda.cpp | 1 - plugins/Import/src/progress.cpp | 5 --- plugins/Import/src/utils.cpp | 2 - plugins/Import/src/version.h | 17 ++++++-- plugins/Import/src/wizard.cpp | 1 - 14 files changed, 91 insertions(+), 148 deletions(-) create mode 100644 plugins/Import/res/Version.rc (limited to 'plugins/Import') diff --git a/plugins/Import/import_10.vcxproj b/plugins/Import/import_10.vcxproj index 5744191ceb..6858ceae0d 100644 --- a/plugins/Import/import_10.vcxproj +++ b/plugins/Import/import_10.vcxproj @@ -209,15 +209,11 @@ - - - - - - + + diff --git a/plugins/Import/import_10.vcxproj.filters b/plugins/Import/import_10.vcxproj.filters index 7ec3d151a6..bb697a541b 100644 --- a/plugins/Import/import_10.vcxproj.filters +++ b/plugins/Import/import_10.vcxproj.filters @@ -13,9 +13,6 @@ {e10cb216-83c1-4eb2-95ec-09f1e42a2c96} ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe - - {8ad8cb39-e207-46f6-8fbf-1f5871148568} - @@ -47,24 +44,16 @@ Header Files - - - - Documentation - - - Documentation - - - Documentation - - - Documentation - + + Header Files + Resource Files + + Resource Files + \ No newline at end of file diff --git a/plugins/Import/import_11.vcxproj b/plugins/Import/import_11.vcxproj index ffa1f96aa5..1e68c1ba90 100644 --- a/plugins/Import/import_11.vcxproj +++ b/plugins/Import/import_11.vcxproj @@ -213,15 +213,11 @@ - - - - - - + + diff --git a/plugins/Import/import_11.vcxproj.filters b/plugins/Import/import_11.vcxproj.filters index 7ec3d151a6..bb697a541b 100644 --- a/plugins/Import/import_11.vcxproj.filters +++ b/plugins/Import/import_11.vcxproj.filters @@ -13,9 +13,6 @@ {e10cb216-83c1-4eb2-95ec-09f1e42a2c96} ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe - - {8ad8cb39-e207-46f6-8fbf-1f5871148568} - @@ -47,24 +44,16 @@ Header Files - - - - Documentation - - - Documentation - - - Documentation - - - Documentation - + + Header Files + Resource Files + + Resource Files + \ No newline at end of file diff --git a/plugins/Import/res/Version.rc b/plugins/Import/res/Version.rc new file mode 100644 index 0000000000..5bfbab4754 --- /dev/null +++ b/plugins/Import/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/Import/res/resource.rc b/plugins/Import/res/resource.rc index a77446551d..bc89df7fa1 100644 --- a/plugins/Import/res/resource.rc +++ b/plugins/Import/res/resource.rc @@ -1,7 +1,6 @@ // Microsoft Visual C++ generated resource script. // #include "..\src\resource.h" -#include "..\src\version.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// @@ -48,6 +47,15 @@ END #endif // APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_IMPORT ICON "import.ico" + ///////////////////////////////////////////////////////////////////////////// // // Dialog @@ -270,68 +278,6 @@ END ///////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////// -// English (Australia) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENA) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_AUS -#pragma code_page(1252) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_IMPORT ICON "import.ico" - -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION __FILEVERSION_STRING - PRODUCTVERSION __FILEVERSION_STRING - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x40004L - FILETYPE 0x1L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "000004b0" - BEGIN - VALUE "Comments", "Licensed under the terms of the GNU General Public License" - VALUE "CompanyName", " " - VALUE "FileDescription", "Miranda NG Import Plugin" - VALUE "FileVersion", __FILEVERSION_STRING - VALUE "InternalName", "import" - VALUE "LegalCopyright", "Copyright © 2000-2009, Martin Öberg, Richard Hughes, Dmitry Kuzkin, George Hazan" - VALUE "OriginalFilename", "import.dll" - VALUE "ProductName", "Miranda NG" - VALUE "ProductVersion", __FILEVERSION_STRING - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x0, 1200 - END -END - -#endif // English (Australia) resources -///////////////////////////////////////////////////////////////////////////// - - - #ifndef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// // diff --git a/plugins/Import/src/import.cpp b/plugins/Import/src/import.cpp index c0de7cc8e3..e77334dde8 100644 --- a/plugins/Import/src/import.cpp +++ b/plugins/Import/src/import.cpp @@ -21,7 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "import.h" -#include time_t dwSinceDate = 0; diff --git a/plugins/Import/src/import.h b/plugins/Import/src/import.h index 5dbfd82cc7..f3fd07bd2f 100644 --- a/plugins/Import/src/import.h +++ b/plugins/Import/src/import.h @@ -20,40 +20,30 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - -//#define _LOGGING 1 - #define _CRT_SECURE_NO_WARNINGS #define _CRT_NONSTDC_NO_DEPRECATE -#define MIRANDA_VER 0x0A00 - #define WINVER 0x0501 #define _WIN32_WINNT 0x0501 #define _WIN32_IE 0x0501 -#include - #include #include // datetimepicker - -#include #include -#include +#include #include #include #include -#include #include #include -#include -#include #include #include -#include -#include #include +#include + +#include "version.h" +#include "resource.h" // ** Global constants diff --git a/plugins/Import/src/main.cpp b/plugins/Import/src/main.cpp index 627c81a424..e4ac431248 100644 --- a/plugins/Import/src/main.cpp +++ b/plugins/Import/src/main.cpp @@ -21,8 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "import.h" -#include "version.h" -#include "resource.h" int nImportOption; int nCustomOptions; @@ -39,19 +37,19 @@ int hLangpack; PLUGININFOEX pluginInfo = { sizeof(PLUGININFOEX), - "Import contacts and messages", - __VERSION_DWORD, - "Imports contacts and messages from another Miranda profile or from an external program.", - "Miranda team", - "info@miranda-im.org", - "© 2000-2010 Martin Öberg, Richard Hughes, Dmitry Kuzkin, George Hazan", - "http://miranda-ng.org/", + __PLUGIN_NAME, + PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM), + __DESCRIPTION, + __AUTHOR, + __AUTHOREMAIL, + __COPYRIGHT, + __AUTHORWEB, UNICODE_AWARE, //{2D77A746-00A6-4343-BFC5-F808CDD772EA} - {0x2d77a746, 0xa6, 0x4343, { 0xbf, 0xc5, 0xf8, 0x8, 0xcd, 0xd7, 0x72, 0xea }} + {0x2d77a746, 0xa6, 0x4343, {0xbf, 0xc5, 0xf8, 0x8, 0xcd, 0xd7, 0x72, 0xea}} }; -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/Import/src/miranda.cpp b/plugins/Import/src/miranda.cpp index 33bd6964c1..71e149c0f4 100644 --- a/plugins/Import/src/miranda.cpp +++ b/plugins/Import/src/miranda.cpp @@ -21,7 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "import.h" -#include "resource.h" void MirandaImport(HWND hdlgProgress); diff --git a/plugins/Import/src/progress.cpp b/plugins/Import/src/progress.cpp index 8856fa837e..8769ba9bd2 100644 --- a/plugins/Import/src/progress.cpp +++ b/plugins/Import/src/progress.cpp @@ -20,12 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include -#include -#include - #include "import.h" -#include "resource.h" #define PROGM_START (WM_USER+100) diff --git a/plugins/Import/src/utils.cpp b/plugins/Import/src/utils.cpp index b06cf06881..1795b3b2c8 100644 --- a/plugins/Import/src/utils.cpp +++ b/plugins/Import/src/utils.cpp @@ -21,8 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "import.h" -#include "version.h" -#include "resource.h" ///////////////////////////////////////////////////////////////////////////////////////// diff --git a/plugins/Import/src/version.h b/plugins/Import/src/version.h index 0231d7a7ea..e10aab61b8 100644 --- a/plugins/Import/src/version.h +++ b/plugins/Import/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 "Import contacts and messages" +#define __FILENAME "Import.dll" +#define __DESCRIPTION "Imports contacts and messages from another Miranda profile or from an external program." +#define __AUTHOR "Miranda team" +#define __AUTHOREMAIL "info@miranda-im.org" +#define __AUTHORWEB "http://miranda-ng.org/" +#define __COPYRIGHT "© 2000-2010 Martin \xd6" "berg, Richard Hughes, Dmitry Kuzkin, George Hazan" diff --git a/plugins/Import/src/wizard.cpp b/plugins/Import/src/wizard.cpp index 92e411a145..8a4b71faf3 100644 --- a/plugins/Import/src/wizard.cpp +++ b/plugins/Import/src/wizard.cpp @@ -21,7 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "import.h" -#include "resource.h" INT_PTR CALLBACK WizardIntroPageProc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam) { -- cgit v1.2.3