Bug 842254 - Thunderbird/SeaMonkey comm-central builds fail with "KeyError: 'MOZ_APP_VENDOR'" - add the missing keys. r=Callek CLOSED TREE
authorMark Banner <bugzilla@standard8.plus.com>
Mon, 18 Feb 2013 12:05:28 +0000
changeset 14873 e4a72afda8abcc3d6a339d4fd78587af0a8013dc
parent 14872 c1d9ed13f285b0ca3750633bb8c118320e83736c
child 14874 b86825ef1b700bd1513301502593018fef6880c8
push id867
push userbugzilla@standard8.plus.com
push dateMon, 01 Apr 2013 20:44:27 +0000
treeherdercomm-beta@797726b8d244 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersCallek
bugs842254
Bug 842254 - Thunderbird/SeaMonkey comm-central builds fail with "KeyError: 'MOZ_APP_VENDOR'" - add the missing keys. r=Callek CLOSED TREE
configure.in
mail/confvars.sh
--- a/configure.in
+++ b/configure.in
@@ -6148,16 +6148,18 @@ if test -z "$IS_ALPHA"; then
 else
   MOZ_APP_MAXVERSION=$MOZ_APP_VERSION
 fi
 
 AC_SUBST(MOZ_APP_NAME)
 AC_SUBST(MOZ_APP_DISPLAYNAME)
 AC_SUBST(MOZ_APP_VERSION)
 AC_SUBST(MOZ_APP_MAXVERSION)
+AC_SUBST(MOZ_APP_VENDOR)
+AC_SUBST(MOZ_APP_ID)
 AC_SUBST(MAR_CHANNEL_ID)
 AC_SUBST(ACCEPTED_MAR_CHANNEL_IDS)
 AC_SUBST(FIREFOX_VERSION)
 AC_SUBST(THUNDERBIRD_VERSION)
 AC_SUBST(SUNBIRD_VERSION)
 AC_SUBST(SEAMONKEY_VERSION)
 AC_DEFINE_UNQUOTED(MOZ_UA_BUILDID, "$MOZ_UA_BUILDID")
 AC_SUBST(MOZ_UA_BUILDID)
--- a/mail/confvars.sh
+++ b/mail/confvars.sh
@@ -36,14 +36,15 @@ fi
 MOZ_APP_VERSION_TXT=${_topsrcdir}/$MOZ_BUILD_APP/config/version.txt
 MOZ_APP_VERSION=`cat $MOZ_APP_VERSION_TXT`
 THUNDERBIRD_VERSION=$MOZ_APP_VERSION
 
 MOZ_UA_BUILDID=20100101
 
 MOZ_BRANDING_DIRECTORY=mail/branding/nightly
 MOZ_OFFICIAL_BRANDING_DIRECTORY=other-licenses/branding/thunderbird
+MOZ_APP_ID={3550f703-e582-4d05-9a08-453d09bdfdc6}
 # This should usually be the same as the value MAR_CHANNEL_ID.
 # If more than one ID is needed, then you should use a comma separated list
 # of values.
 ACCEPTED_MAR_CHANNEL_IDS=thunderbird-comm-central
 # The MAR_CHANNEL_ID must not contain the following 3 characters: ",\t "
 MAR_CHANNEL_ID=thunderbird-comm-central