Bug 1757063 - Include beta version in Info.plist. r=darktrojan

Use display version when building Info.plist. This will only affect beta
builds, where MOZ_APP_VERSION does not include the beta number;
MOZ_VERSION_DISPLAY does. (Release and daily builds the two values are the
same.)
Additionally, use MAC_BUNDLE_VERSION for CFBundleVersion as is done for
Firefox. MAC_BUNDLE_VERSION is the major version number and the build date
(eg. 9922.3.3).

Differential Revision: https://phabricator.services.mozilla.com/D140205

--HG--
extra : amend_source : 601157133e2262e7b089a371b8223ebd88434449

mail/app/Makefile.in

@@ -103,7 +103,7 @@ tools repackage:: $(DIST)/bin/$(MOZ_APP_NAME) $(objdir)/macbuild/Contents/MacOS-
 	$(MKDIR) -p '$(dist_dest)/$(LPROJ)'
 	rsync -a --exclude '*.in' $(srcdir)/macbuild/Contents '$(dist_dest)' --exclude English.lproj
 	rsync -a --exclude '*.in' $(srcdir)/macbuild/Contents/Resources/English.lproj/ '$(dist_dest)/$(LPROJ)'
-	$(call py_action,preprocessor,-Fsubstitution -DAPP_VERSION='$(MOZ_APP_VERSION)' -DMOZ_APP_NAME='$(MOZ_APP_NAME)' -DMAC_APP_NAME='$(MAC_APP_NAME)' -DMOZ_MACBUNDLE_ID='$(MOZ_MACBUNDLE_ID)' -DMAC_BUNDLE_VERSION='$(MAC_BUNDLE_VERSION)' -DMOZ_DEVELOPER_REPO_PATH='$(topsrcdir)' -DMOZ_DEVELOPER_OBJ_PATH='$(topobjdir)' $(srcdir)/macbuild/Contents/Info.plist.in -o '$(dist_dest)/Contents/Info.plist')
+	$(call py_action,preprocessor,-Fsubstitution -DAPP_VERSION='$(MOZ_APP_VERSION)' -DAPP_VERSION_DISPLAY='$(MOZ_APP_VERSION_DISPLAY)' -DMOZ_APP_NAME='$(MOZ_APP_NAME)' -DMAC_APP_NAME='$(MAC_APP_NAME)' -DMOZ_MACBUNDLE_ID='$(MOZ_MACBUNDLE_ID)' -DMAC_BUNDLE_VERSION='$(MAC_BUNDLE_VERSION)' -DMOZ_DEVELOPER_REPO_PATH='$(topsrcdir)' -DMOZ_DEVELOPER_OBJ_PATH='$(topobjdir)' $(srcdir)/macbuild/Contents/Info.plist.in -o '$(dist_dest)/Contents/Info.plist')
 	$(call py_action,preprocessor,-Fsubstitution --output-encoding utf-16 -DMAC_APP_NAME='$(MAC_APP_NAME)' $(srcdir)/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in -o '$(dist_dest)/$(LPROJ)/InfoPlist.strings')
 	rsync -a --exclude-from='$(objdir)/macbuild/Contents/MacOS-files.txt' $(DIST)/bin/ '$(dist_dest)/Contents/Resources'
 	rsync -a --include-from='$(objdir)/macbuild/Contents/MacOS-files.txt' --exclude '*' $(DIST)/bin/ '$(dist_dest)/Contents/MacOS'

mail/app/macbuild/Contents/Info.plist.in

@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>@MOZ_APP_NAME@</string>
 	<key>CFBundleGetInfoString</key>
-	<string>@MAC_APP_NAME@ @APP_VERSION@</string>
+	<string>@MAC_APP_NAME@ @APP_VERSION_DISPLAY@</string>
 	<key>CFBundleIconFile</key>
 	<string>thunderbird.icns</string>
 	<key>CFBundleIdentifier</key>
@@ -23,7 +23,7 @@
 	<key>CFBundleSignature</key>
 	<string>MOZM</string>
 	<key>CFBundleVersion</key>
-	<string>@APP_VERSION@</string>
+	<string>@MAC_BUNDLE_VERSION@</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>