Bug 496283 - Use the app version from configure vars. r=NPOTB DONTBUILD
authorEdmund Wong <ewong@pw-wspx.org>
Tue, 06 Mar 2012 09:23:15 +0800
changeset 11012 b06db4c82d6135314f44c63d9b79008f14338b2a
parent 11011 86ad735b5ddfa1e555a6cd402215d1d125a2a1c9
child 11013 a5bedd2e41b1f56bf87221fa75d52451a3b663ce
push id463
push userbugzilla@standard8.plus.com
push dateTue, 24 Apr 2012 17:34:51 +0000
treeherdercomm-beta@e53588e8f7b0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersNPOTB
bugs496283
Bug 496283 - Use the app version from configure vars. r=NPOTB DONTBUILD
calendar/sunbird/app/module.ver
calendar/sunbird/app/splash.rc
--- a/calendar/sunbird/app/module.ver
+++ b/calendar/sunbird/app/module.ver
@@ -1,8 +1,8 @@
 WIN32_MODULE_COMPANYNAME=Mozilla
 WIN32_MODULE_COPYRIGHT=ŠSunbird and Mozilla Developers, according to the MPL 1.1/GPL 2.0/LGPL 2.1 licenses, as applicable.
-WIN32_MODULE_PRODUCTVERSION=1,0,9,0
-WIN32_MODULE_PRODUCTVERSION_STRING=1.1a1pre
+WIN32_MODULE_PRODUCTVERSION=@MOZ_APP_WINVERSION@
+WIN32_MODULE_PRODUCTVERSION_STRING=@MOZ_APP_VERSION@
 WIN32_MODULE_TRADEMARKS=Sunbird is a trademark of the Mozilla Foundation.
-WIN32_MODULE_DESCRIPTION=Sunbird
-WIN32_MODULE_PRODUCTNAME=Sunbird
-WIN32_MODULE_NAME=Sunbird
+WIN32_MODULE_DESCRIPTION=@MOZ_APP_DISPLAYNAME@
+WIN32_MODULE_PRODUCTNAME=@MOZ_APP_DISPLAYNAME@
+WIN32_MODULE_NAME=@MOZ_APP_DISPLAYNAME@
--- a/calendar/sunbird/app/splash.rc
+++ b/calendar/sunbird/app/splash.rc
@@ -43,19 +43,19 @@ 1 24 "sunbird.exe.manifest"
 
 /* SUNBIRD_ICO is defined in ./Makefile for generic vs. official branding */
 IDI_APPICON ICON SUNBIRD_ICO
 IDI_APPLICATION ICON SUNBIRD_ICO
 
 STRINGTABLE DISCARDABLE
 BEGIN
 #ifdef DEBUG
-    IDS_STARTMENU_APPNAME,              "Sunbird Debug"
+    IDS_STARTMENU_APPNAME,              "@MOZ_APP_DISPLAYNAME@ Debug"
 #else
-    IDS_STARTMENU_APPNAME,              "Sunbird"
+    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