AutoShutdown

standard version file

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

5 files changed, 43 insertions, 33 deletions

diff --git a/plugins/AutoShutdown/res/resource.rc b/plugins/AutoShutdown/res/resource.rc
index a3955797ec..7cc2deca6f 100644
--- a/plugins/AutoShutdown/res/resource.rc
+++ b/plugins/AutoShutdown/res/resource.rc
@@ -40,7 +40,7 @@ END
 

 3 TEXTINCLUDE MOVEABLE PURE 

 BEGIN

-    "#include ""version.rc""\r\n"

+    "\r\n"

     "\0"

 END

 

@@ -231,9 +231,9 @@ END
 

 // Icon with lowest ID value placed first to ensure application icon

 // remains consistent on all systems.

-IDI_ACTIVE              ICON    DISCARDABLE     "active.ico"

-IDI_HEADER              ICON    DISCARDABLE     "header.ico"

-IDI_INACTIVE            ICON    DISCARDABLE     "inactive.ico"

+IDI_ACTIVE              ICON         "active.ico"

+IDI_HEADER              ICON         "header.ico"

+IDI_INACTIVE            ICON         "inactive.ico"

 #endif    // Englisch (GB) resources

 /////////////////////////////////////////////////////////////////////////////

 

@@ -244,7 +244,6 @@ IDI_INACTIVE            ICON    DISCARDABLE     "inactive.ico"
 //

 // Generated from the TEXTINCLUDE 3 resource.

 //

-#include "version.rc"

 

 /////////////////////////////////////////////////////////////////////////////

 #endif    // not APSTUDIO_INVOKED

diff --git a/plugins/AutoShutdown/res/version.rc b/plugins/AutoShutdown/res/version.rc
index 5ea96be0f0..a141cc3aa7 100644
--- a/plugins/AutoShutdown/res/version.rc
+++ b/plugins/AutoShutdown/res/version.rc
@@ -2,6 +2,7 @@
 #error this file is not editable by Microsoft Visual C++

 #endif //APSTUDIO_INVOKED

 

+#include "afxres.h"

 #include "..\src\version.h"

 

 ///////////////////////////////////////////////////////////////////////////// 

@@ -10,30 +11,27 @@
 //                                                                            

                                                                               

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION FILE_VERSION

- PRODUCTVERSION FILE_VERSION

- FILEFLAGSMASK 0x0L

+ FILEVERSION __FILEVERSION_STRING

+ PRODUCTVERSION __FILEVERSION_STRING

+ 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 "000004b0"

         BEGIN

-            VALUE "Comments", "Licensed under the terms of the GNU General Public License"

-            VALUE "FileDescription", "AutoShutdown Plugin for Miranda NG"

-            VALUE "FileVersion", FILE_VERSION_STR

-            VALUE "InternalName", "AutoShutdown"

-            VALUE "LegalCopyright", "Copyright © 2004-2007 H. Herkenrath"

-            VALUE "OriginalFilename", "shutdown.dll"

-            VALUE "ProductName", "Automatic Shutdown"

-            VALUE "ProductVersion", FILE_VERSION_STR

+            VALUE "FileDescription", __DESCRIPTION

+            VALUE "InternalName", __PLUGIN_NAME

+            VALUE "LegalCopyright", __COPYRIGHT

+            VALUE "OriginalFilename", __FILENAME

+            VALUE "ProductName", __PLUGIN_NAME

         END

     END

     BLOCK "VarFileInfo"

@@ -41,7 +39,3 @@ BEGIN
         VALUE "Translation", 0x0, 1200

     END

 END

-                                   

-                                                                        

-                               

-                                                                              

diff --git a/plugins/AutoShutdown/src/common.h b/plugins/AutoShutdown/src/common.h
index 2c79be9fb5..a11b612b94 100644
--- a/plugins/AutoShutdown/src/common.h
+++ b/plugins/AutoShutdown/src/common.h
@@ -82,3 +82,4 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "utils.h"

 #include "watcher.h"

 #include "resource.h"

+#include "version.h"

diff --git a/plugins/AutoShutdown/src/main.cpp b/plugins/AutoShutdown/src/main.cpp
index 46e228d809..c5829eee42 100644
--- a/plugins/AutoShutdown/src/main.cpp
+++ b/plugins/AutoShutdown/src/main.cpp
@@ -19,7 +19,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */

 

 #include "common.h"

-#include "version.h"

 

 HINSTANCE hInst;

 static HANDLE hHookModulesLoaded;

@@ -28,13 +27,13 @@ int hLangpack;
 

 PLUGININFOEX pluginInfo={

 	sizeof(PLUGININFOEX),

-	"AutoShutdown",

-	PLUGIN_VERSION,

-	"Adds the possibility to shutdown the computer when a specified event occurs.", /* autotranslated */

-	"H. Herkenrath",

-	"hrathh@users.sourceforge.net",  /* @ will be set later */

-	"© 2004-2007 H. Herkenrath",

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

+	__PLUGIN_NAME,

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

+	__DESCRIPTION,

+	__AUTHOR,

+	__AUTHOREMAIL,

+	__COPYRIGHT,

+	__AUTHORWEB,

 	UNICODE_AWARE,

 	// {9DE24579-5C5C-49aa-80E8-4D38E4344E63}

 	{0x9de24579,0x5c5c,0x49aa,{0x80,0xe8,0x4d,0x38,0xe4,0x34,0x4e,0x63}},

diff --git a/plugins/AutoShutdown/src/version.h b/plugins/AutoShutdown/src/version.h
index 70dd82fe01..05cc6a39bb 100644
--- a/plugins/AutoShutdown/src/version.h
+++ b/plugins/AutoShutdown/src/version.h
@@ -19,6 +19,23 @@ along with this program (Shutdown-License.txt); if not, write to the Free Softwa
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 

-#define PLUGIN_VERSION              PLUGIN_MAKE_VERSION(1,4,0,2)

-#define FILE_VERSION                1,4,0,2

-#define FILE_VERSION_STR           "1.4.0.2"

+#define __MAJOR_VERSION				1

+#define __MINOR_VERSION				4

+#define __RELEASE_NUM				0

+#define __BUILD_NUM					2

+

+#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				"AutoShutdown"

+#define __INTERNAL_NAME				"AutoShutdown"

+#define __FILENAME					"AutoShutdown.dll"

+#define __DESCRIPTION 				"Adds the possibility to shutdown the computer when a specified event occurs."

+#define __AUTHOR					"H. Herkenrath"

+#define __AUTHOREMAIL				"hrathh@users.sourceforge.net"

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

+#define __COPYRIGHT					"© 2004-2007 H. Herkenrath"