Bug 493827 Make version_win.pl able to use the app version from configure vars. r=philringnalda
authorMark Banner <bugzilla@standard8.plus.com>
Mon, 25 May 2009 09:56:48 +0100
changeset 2700 7292f7f0192621472bd3f166ade1c01954bf0778
parent 2699 8b99f4a8d6c6a57e2408d243e32e7495d329fdb8
child 2701 1155c1c0ed0de1431eb214b08d4978d203a8705d
push idunknown
push userunknown
push dateunknown
reviewersphilringnalda
bugs493827
Bug 493827 Make version_win.pl able to use the app version from configure vars. r=philringnalda
mail/app/module.ver
mail/app/splash.rc
--- a/mail/app/module.ver
+++ b/mail/app/module.ver
@@ -1,9 +1,9 @@
-WIN32_MODULE_DESCRIPTION=Mozilla Thunderbird
-WIN32_MODULE_PRODUCTNAME=Thunderbird
-WIN32_MODULE_NAME=Thunderbird
-WIN32_MODULE_PRODUCTVERSION=3,0,0,0
-WIN32_MODULE_PRODUCTVERSION_STRING=3.0b3pre
+WIN32_MODULE_DESCRIPTION=@MOZ_APP_DISPLAYNAME@
+WIN32_MODULE_PRODUCTNAME=@MOZ_APP_DISPLAYNAME@
+WIN32_MODULE_NAME=@MOZ_APP_DISPLAYNAME@
+WIN32_MODULE_PRODUCTVERSION=@MOZ_APP_WINVERSION@
+WIN32_MODULE_PRODUCTVERSION_STRING=@MOZ_APP_VERSION@
 WIN32_MODULE_COPYRIGHT=ŠThunderbird and Mozilla Developers, according to the MPL 1.1/GPL 2.0/LGPL 2.1 licenses, as applicable.
 WIN32_MODULE_COMPANYNAME=Mozilla Messaging
-WIN32_MODULE_TRADEMARKS=Mozilla
+WIN32_MODULE_TRADEMARKS=Thunderbird is a Trademark of The Mozilla Foundation.
 WIN32_MODULE_COMMENT=Mozilla Thunderbird Mail and News Client
--- a/mail/app/splash.rc
+++ b/mail/app/splash.rc
@@ -41,19 +41,19 @@
 1 24 "thunderbird.exe.manifest" 
 
 // Program icon.
 IDI_APPLICATION ICON THUNDERBIRD_ICO
 
 STRINGTABLE DISCARDABLE
 BEGIN
 #ifdef DEBUG
-    IDS_STARTMENU_APPNAME,              "Thunderbird Debug"
+    IDS_STARTMENU_APPNAME,              "@MOZ_APP_DISPLAYNAME@ Debug"
 #else
-    IDS_STARTMENU_APPNAME,              "Thunderbird"
+    IDS_STARTMENU_APPNAME,              "@MOZ_APP_DISPLAYNAME@"
 #endif
 END
 
 #ifdef MOZ_STATIC_BUILD
 
 // XXX This code is copied from resource.h and widget.rc.  It's a work-around
 // for the limitation that only one resource file can be used in an .exe.  We
 // should develop a method, for static builds only, to combine multiple .rc