Bug 687275 - mozconfig detection code: remove an unnecessary pipe -> string -> pipe redirection and use FOUND_MOZCONFIG instead of MOZCONFIG. r=ted
authorSiddharth Agarwal <sid.bugzilla@gmail.com>
Fri, 23 Sep 2011 23:22:44 +0530
changeset 79260 97beb3824d4717e5382ae7770a4bfb38668b9590
parent 78427 959c1e6bdb11759dcb380ab96df71f13b2f7086d
child 79261 d1bbc6ce76823507aa3190a19b33893c3a1dfdc6
push id434
push userclegnitto@mozilla.com
push dateWed, 21 Dec 2011 12:10:54 +0000
treeherdermozilla-beta@bddb6ed8dd47 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs687275
milestone9.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 687275 - mozconfig detection code: remove an unnecessary pipe -> string -> pipe redirection and use FOUND_MOZCONFIG instead of MOZCONFIG. r=ted
build/autoconf/mozconfig-find
build/autoconf/mozconfig2client-mk
build/autoconf/mozconfig2configure
--- a/build/autoconf/mozconfig-find
+++ b/build/autoconf/mozconfig-find
@@ -55,17 +55,17 @@ abspath() {
     regexes='^\([A-Za-z]:\|\\\\\|\/\) ^\/'
   else
     regexes='^\/'
   fi
 
   for regex in $regexes; do
     if echo $1 | grep -q $regex; then
       echo $1
-      exit 0
+      return
     fi
   done
 
   # If we're at this point, we have a relative path
   echo `pwd`/$1
 }
 
 if [ -n "$MOZCONFIG" ] && ! [ -f "$MOZCONFIG" ]; then
@@ -83,17 +83,17 @@ if [ -z "$MOZCONFIG" ] && [ -f "$topsrcd
   exit 1
 fi
 
 for _config in "$MOZCONFIG" \
                "$topsrcdir/.mozconfig" \
                "$topsrcdir/mozconfig"
 do
   if test -f "$_config"; then
-    echo `abspath $_config`
+    abspath $_config
     exit 0
   fi
 done
 
 # We used to support a number of other implicit .mozconfig locations. We now
 # detect if we were about to use any of these locations and issue an error if we
 # find any.
 for _config in "$topsrcdir/mozconfig.sh" \
--- a/build/autoconf/mozconfig2client-mk
+++ b/build/autoconf/mozconfig2client-mk
@@ -70,17 +70,17 @@ mk_add_options() {
     # and substitute '@<word>@' with '$(<word>)'.
     _opt=`echo "$_opt" | sed -e 's/\([\"\\]\)/\\\1/g; s/@\([^@]*\)@/\$(\1)/g;'`
     echo $_opt;
     opts="${opts:+$opts^}$_opt";
   done >> $tmp_file
 }
 
 mk_echo_options() {
-  echo "Adding client.mk options from $MOZCONFIG:"
+  echo "Adding client.mk options from $FOUND_MOZCONFIG:"
   IFS=^
   for _opt in $opts; do
     echo "    $_opt"
   done
 }
 
 # Main
 #--------------------------------------------------
--- a/build/autoconf/mozconfig2configure
+++ b/build/autoconf/mozconfig2configure
@@ -87,17 +87,17 @@ ac_add_app_options() {
 
 mk_add_options() {
   # These options are for client.mk
   # configure can safely ignore them.
   :
 }
 
 ac_echo_options() {
-  echo "Adding configure options from $MOZCONFIG:"
+  echo "Adding configure options from $FOUND_MOZCONFIG:"
   eval "set -- $mozconfig_ac_options"
   for _opt
   do
     echo "  $_opt"
   done
 }
 
 # Main