Bug 554331 Thunderbird Mac nightly builds broken (making complete update) due to not being able to find the right topsrcdir. r=gozer
authorMark Banner <bugzilla@standard8.plus.com>
Tue, 23 Mar 2010 16:34:53 +0000
changeset 5244 09fdfcc147b58b173b19c0284324881161b7941d
parent 5243 016ad0250fe19561abc0ee180a8f1678405cc788
child 5245 7b8aea4d0fd658301e1a5ea301ba559b5fc7a045
push idunknown
push userunknown
push dateunknown
reviewersgozer
bugs554331
Bug 554331 Thunderbird Mac nightly builds broken (making complete update) due to not being able to find the right topsrcdir. r=gozer
configure.in
mail/confvars.sh
suite/confvars.sh
--- a/configure.in
+++ b/configure.in
@@ -5028,18 +5028,18 @@ MOZ_ARG_WITH_STRING(branding,
 [  --with-branding=dir    Use branding from the specified directory.],
     MOZ_BRANDING_DIRECTORY=$withval)
 
 REAL_BRANDING_DIRECTORY="${MOZ_BRANDING_DIRECTORY}"
 if test -z "$REAL_BRANDING_DIRECTORY"; then
   REAL_BRANDING_DIRECTORY=${MOZ_BUILD_APP}/branding/nightly
 fi
 
-if test -f "$topsrcdir/$REAL_BRANDING_DIRECTORY/configure.sh"; then
-  . "$topsrcdir/$REAL_BRANDING_DIRECTORY/configure.sh"
+if test -f "${_topsrcdir}/$REAL_BRANDING_DIRECTORY/configure.sh"; then
+  . "${_topsrcdir}/$REAL_BRANDING_DIRECTORY/configure.sh"
 fi
 
 AC_SUBST(MOZ_BRANDING_DIRECTORY)
 
 dnl ========================================================
 dnl = Distribution ID
 dnl ========================================================
 MOZ_ARG_WITH_STRING(distribution-id,
--- a/mail/confvars.sh
+++ b/mail/confvars.sh
@@ -51,24 +51,24 @@ MOZ_COMPOSER=1
 MOZ_SAFE_BROWSING=1
 MOZ_TOOLKIT_SEARCH=
 
 # Needed for the mozilla-central build side of the system.
 # Can be dropped when we branch MOZILLA_1_9_2_BRANCH
 MOZILLA_BRANCH_VERSION=`echo ${MOZILLA_VERSION} | sed -e 's/^\([0-9]\.[0-9]\.[0-9]\).*/\1/;'`
 
 if test "$MOZILLA_BRANCH_VERSION" = "1.9.2"; then
-  MOZ_APP_VERSION_TXT=$topsrcdir/$MOZ_BUILD_APP/config/version-192.txt
+  MOZ_APP_VERSION_TXT=${_topsrcdir}/$MOZ_BUILD_APP/config/version-192.txt
   # Use unofficial branding for the 1.9.2 branch
   MOZ_BRANDING_DIRECTORY=mail/branding/unofficial
   MOZ_NO_XPCOM_OBSOLETE=1
   # MOZ_OJI is only required to be cleared for MOZILLA_1_9_2_BRANCH (OS X).
   MOZ_OJI=
 else
-  MOZ_APP_VERSION_TXT=$topsrcdir/$MOZ_BUILD_APP/config/version.txt
+  MOZ_APP_VERSION_TXT=${_topsrcdir}/$MOZ_BUILD_APP/config/version.txt
   MOZ_BRANDING_DIRECTORY=mail/branding/nightly
 fi
 
 MOZ_APP_VERSION=`cat $MOZ_APP_VERSION_TXT`
 
 THUNDERBIRD_VERSION=$MOZ_APP_VERSION
 MOZ_OFFICIAL_BRANDING_DIRECTORY=other-licenses/branding/thunderbird
 
--- a/suite/confvars.sh
+++ b/suite/confvars.sh
@@ -40,17 +40,17 @@ MOZ_APP_NAME=seamonkey
 MOZ_APP_DISPLAYNAME=SeaMonkey
 MOZ_MAIL_NEWS=1
 if [ "$COMM_BUILD" ]; then
   MOZ_LDAP_XPCOM=1
 fi
 MOZ_STATIC_MAIL_BUILD=1
 MOZ_COMPOSER=1
 MOZ_SUITE=1
-MOZ_APP_VERSION=`cat $topsrcdir/$MOZ_BUILD_APP/config/version.txt`
+MOZ_APP_VERSION=`cat ${_topsrcdir}/$MOZ_BUILD_APP/config/version.txt`
 SEAMONKEY_VERSION=$MOZ_APP_VERSION
 MOZ_EXTENSIONS_DEFAULT=" venkman inspector irc gnomevfs reporter"
 MOZ_PLACES=1
 MOZ_UPDATER=1
 MOZ_HELP_VIEWER=1
 MOZ_TOOLKIT_SEARCH=
 
 # Disable libxul which is (now) the default on mozilla-central. (Bug 394502)