bug 316387 - make version_win.pl able to use the app version from configure vars, comm-central/SeaMonkey part, r=Standard8
authorRobert Kaiser <kairo@kairo.at>
Tue, 19 May 2009 20:35:12 +0200
changeset 2663 b3207365e720e1e09f3bdd736af13abfac6fd592
parent 2662 9bb50e823e67a158be6a8ff2a802d57de35cc2ac
child 2664 1cdf3c60c94c9cdee2efb9fcc537d820aa86c9f3
push idunknown
push userunknown
push dateunknown
reviewersStandard8
bugs316387
bug 316387 - make version_win.pl able to use the app version from configure vars, comm-central/SeaMonkey part, r=Standard8
config/version.mk
suite/app/module.ver
--- a/config/version.mk
+++ b/config/version.mk
@@ -41,17 +41,17 @@ INCLUDED_VERSION_MK=1
 # TODO:
 # PBI      : Private build info.  Not used currently.
 #            Guessing the best way would be to set an env var.
 # BINARY   : Binary name.  Not used currently.
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
 ifndef RESFILE
 RCFILE=./module.rc
 RESFILE=./module.res
-_RC_STRING = -QUIET 1 -DEPTH $(MOZDEPTH) -TOPSRCDIR $(MOZILLA_SRCDIR) -BITS $(MOZ_BITS) -OBJDIR . -SRCDIR $(srcdir) -DISPNAME $(MOZ_APP_DISPLAYNAME)
+_RC_STRING = -QUIET 1 -DEPTH $(MOZDEPTH) -TOPSRCDIR $(MOZILLA_SRCDIR) -BITS $(MOZ_BITS) -OBJDIR . -SRCDIR $(srcdir) -DISPNAME $(MOZ_APP_DISPLAYNAME) -APPVERSION $(MOZ_APP_VERSION)
 ifneq ($(BUILD_OFFICIAL)_$(MOZILLA_OFFICIAL),_)
 _RC_STRING += -OFFICIAL 1
 endif
 ifdef MOZ_DEBUG
 _RC_STRING += -DEBUG 1
 endif
 ifdef MODULE
 _RC_STRING += -MODNAME $(MODULE)
--- a/suite/app/module.ver
+++ b/suite/app/module.ver
@@ -1,8 +1,8 @@
 WIN32_MODULE_COMPANYNAME=mozilla.org
 WIN32_MODULE_COPYRIGHT=İMozilla Developers, according to the MPL 1.1/GPL 2.0/LGPL 2.1 licenses, as applicable.
-WIN32_MODULE_PRODUCTVERSION=2,0,0,0
-WIN32_MODULE_PRODUCTVERSION_STRING=2.0b1pre
+WIN32_MODULE_PRODUCTVERSION=@MOZ_APP_WINVERSION@
+WIN32_MODULE_PRODUCTVERSION_STRING=@MOZ_APP_VERSION@
 WIN32_MODULE_TRADEMARKS=SeaMonkey and Mozilla are trademarks of The Mozilla Foundation.
 WIN32_MODULE_DESCRIPTION=@MOZ_APP_DISPLAYNAME@
 WIN32_MODULE_PRODUCTNAME=@MOZ_APP_DISPLAYNAME@
 WIN32_MODULE_NAME=@MOZ_APP_DISPLAYNAME@