Bug 746590 - Fix in-tree mozconfigs to specify correct gcc location for Firefox Automation, and add missing mozconfig files. r=jhopkins,a=Standard8 DONTBUILD
authorMark Banner <bugzilla@standard8.plus.com>
Wed, 18 Apr 2012 16:54:18 +0100
changeset 11235 de3bbe0ad60b8901869a3011d7fe4618c0daefab
parent 11234 1c39ec381f69378b9ca6a40e70e2a2726c71060c
child 11236 8994f54bce38699c238219c462801f24d0ff6189
push idunknown
push userunknown
push dateunknown
reviewersjhopkins, Standard8
bugs746590
Bug 746590 - Fix in-tree mozconfigs to specify correct gcc location for Firefox Automation, and add missing mozconfig files. r=jhopkins,a=Standard8 DONTBUILD
mail/config/mozconfigs/linux32/debug
mail/config/mozconfigs/linux32/nightly
mail/config/mozconfigs/linux32/release
mail/config/mozconfigs/linux64/debug
mail/config/mozconfigs/linux64/nightly
mail/config/mozconfigs/linux64/release
mail/config/mozconfigs/macosx-universal/debug
mail/config/mozconfigs/macosx-universal/nightly
mail/config/mozconfigs/macosx32/debug
mail/config/mozconfigs/macosx64/debug
mail/config/mozconfigs/win32/nightly
--- a/mail/config/mozconfigs/linux32/debug
+++ b/mail/config/mozconfigs/linux32/debug
@@ -3,18 +3,22 @@ ac_add_options --enable-debug
 ac_add_options --disable-optimize
 ac_add_options --enable-tests
 
 ac_add_options --enable-trace-malloc
 
 export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
 
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
+if test -e "$topsrcdir/mozilla/build/unix/mozconfig.linux"; then
+  . $topsrcdir/mozilla/build/unix/mozconfig.linux
+else
+  . $topsrcdir/build/unix/mozconfig.linux
+endif  
+
 # Avoid dependency on libstdc++ 4.5
 ac_add_options --enable-stdcxx-compat
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
--- a/mail/config/mozconfigs/linux32/nightly
+++ b/mail/config/mozconfigs/linux32/nightly
@@ -1,18 +1,22 @@
 ac_add_options --enable-application=mail
 ac_add_options --enable-optimize
 ac_add_options --enable-update-channel=nightly
 ac_add_options --enable-update-packaging
 ac_add_options --disable-debug
 ac_add_options --enable-tests
 ac_add_options --enable-codesighs
 
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
+if test -e "$topsrcdir/mozilla/build/unix/mozconfig.linux"; then
+  . $topsrcdir/mozilla/build/unix/mozconfig.linux
+else
+  . $topsrcdir/build/unix/mozconfig.linux
+endif  
+
 # Avoid dependency on libstdc++ 4.5
 ac_add_options --enable-stdcxx-compat
 
 export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
--- a/mail/config/mozconfigs/linux32/release
+++ b/mail/config/mozconfigs/linux32/release
@@ -1,18 +1,22 @@
 ac_add_options --enable-application=mail
 ac_add_options --enable-optimize
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --disable-debug
 ac_add_options --enable-tests
 ac_add_options --enable-official-branding
 
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
+if test -e "$topsrcdir/mozilla/build/unix/mozconfig.linux"; then
+  . $topsrcdir/mozilla/build/unix/mozconfig.linux
+else
+  . $topsrcdir/build/unix/mozconfig.linux
+endif  
+
 # Avoid dependency on libstdc++ 4.5
 ac_add_options --enable-stdcxx-compat
 
 export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
--- a/mail/config/mozconfigs/linux64/debug
+++ b/mail/config/mozconfigs/linux64/debug
@@ -3,18 +3,22 @@ ac_add_options --enable-debug
 ac_add_options --disable-optimize
 ac_add_options --enable-tests
 
 ac_add_options --enable-trace-malloc
 
 export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
 
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
+if test -e "$topsrcdir/mozilla/build/unix/mozconfig.linux"; then
+  . $topsrcdir/mozilla/build/unix/mozconfig.linux
+else
+  . $topsrcdir/build/unix/mozconfig.linux
+endif  
+
 # Avoid dependency on libstdc++ 4.5
 ac_add_options --enable-stdcxx-compat
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
--- a/mail/config/mozconfigs/linux64/nightly
+++ b/mail/config/mozconfigs/linux64/nightly
@@ -1,18 +1,22 @@
 ac_add_options --enable-application=mail
 ac_add_options --enable-optimize
 ac_add_options --enable-update-channel=nightly
 ac_add_options --enable-update-packaging
 ac_add_options --disable-debug
 ac_add_options --enable-tests
 ac_add_options --enable-codesighs
 
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
+if test -e "$topsrcdir/mozilla/build/unix/mozconfig.linux"; then
+  . $topsrcdir/mozilla/build/unix/mozconfig.linux
+else
+  . $topsrcdir/build/unix/mozconfig.linux
+endif  
+
 # Avoid dependency on libstdc++ 4.5
 ac_add_options --enable-stdcxx-compat
 
 export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
--- a/mail/config/mozconfigs/linux64/release
+++ b/mail/config/mozconfigs/linux64/release
@@ -1,18 +1,22 @@
 ac_add_options --enable-application=mail
 ac_add_options --enable-optimize
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --disable-debug
 ac_add_options --enable-tests
 ac_add_options --enable-official-branding
 
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
+if test -e "$topsrcdir/mozilla/build/unix/mozconfig.linux"; then
+  . $topsrcdir/mozilla/build/unix/mozconfig.linux
+else
+  . $topsrcdir/build/unix/mozconfig.linux
+endif  
+
 # Avoid dependency on libstdc++ 4.5
 ac_add_options --enable-stdcxx-compat
 
 export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/mail/config/mozconfigs/macosx-universal/debug
+++ /dev/null
@@ -1,24 +0,0 @@
-ac_add_options --enable-application=mail
-ac_add_options --enable-debug
-ac_add_options --disable-optimize
-ac_add_options --enable-tests
-
-ac_add_options --enable-trace-malloc
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
-# Enable parallel compiling
-CONCURRENCY=$(( `sysctl hw.logicalcpu | awk {'print $2'}`  + 2 ))
-mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"
-
-# Run client.py
-mk_add_options CLIENT_PY_ARGS="--hg-options='--verbose --time' --hgtool=../tools/buildfarm/utils/hgtool.py --skip-chatzilla --skip-inspector --skip-venkman --tinderbox-print"
-mk_add_options ALWAYS_RUN_CLIENT_PY=1
-
--- a/mail/config/mozconfigs/macosx-universal/nightly
+++ b/mail/config/mozconfigs/macosx-universal/nightly
@@ -1,28 +1,24 @@
-# mozconfig.common only exists in mozilla-central
-if test -e "$topsrcdir/mozilla/build/macosx/universal/mozconfig.common" || test -e "$topsrcdir/build/macosx/universal/mozconfig.common"; then
+if test -e "$topsrcdir/mozilla/build/macosx/universal/mozconfig"; then
+  oldtopsrcdir=$topsrcdir
+  export topsrcdir=$topsrcdir/mozilla
+else
+  # Big Hack that unsets CC / CXX so that mozconfig.common doesn't get
+  # mixed up with host/target CPUs when trying to work out how to do the
+  # universal build. When we redo the build system (bug 648979) this will
+  # go away.
+  unset CC
+  unset CXX
+fi
 
-  if test -e "$topsrcdir/mozilla/build/macosx/universal/mozconfig"; then
-    oldtopsrcdir=$topsrcdir
-    export topsrcdir=$topsrcdir/mozilla
-  else
-    # Big Hack that unsets CC / CXX so that mozconfig.common doesn't get
-    # mixed up with host/target CPUs when trying to work out how to do the
-    # universal build. When we redo the build system (bug 648979) this will
-    # go away.
-    unset CC
-    unset CXX
-  fi
-  
-  . $topsrcdir/build/macosx/universal/mozconfig
-  
-  if test -n $oldtopsrcdir; then
-    export topsrcdir=$oldtopsrcdir
-  fi
+. $topsrcdir/build/macosx/universal/mozconfig
+
+if test -n $oldtopsrcdir; then
+  export topsrcdir=$oldtopsrcdir
 fi
 
 ac_add_options --enable-application=mail
 ac_add_options --enable-update-channel=nightly
 ac_add_options --enable-update-packaging
 ac_add_options --enable-optimize
 ac_add_options --disable-debug
 ac_add_options --enable-tests
@@ -43,9 +39,8 @@ export MOZILLA_OFFICIAL=1
 ac_add_options --with-ccache=/usr/bin/ccache
 # Enable parallel compiling
 CONCURRENCY=$(( `sysctl hw.logicalcpu | awk {'print $2'}`  + 2 ))
 mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"
 
 # Run client.py
 mk_add_options CLIENT_PY_ARGS="--hg-options='--verbose --time' --hgtool=../tools/buildfarm/utils/hgtool.py --skip-chatzilla --skip-comm --skip-inspector --skip-venkman --tinderbox-print"
 mk_add_options ALWAYS_RUN_CLIENT_PY=1
-
new file mode 100644
--- /dev/null
+++ b/mail/config/mozconfigs/macosx32/debug
@@ -0,0 +1,29 @@
+if test -e "$topsrcdir/mozilla/build/macosx/mozconfig.leopard"; then
+  oldtopsrcdir=$topsrcdir
+  export topsrcdir=$topsrcdir/mozilla
+fi
+
+. $topsrcdir/build/macosx/mozconfig.leopard
+
+if test -n $oldtopsrcdir; then
+  export topsrcdir=$oldtopsrcdir
+fi
+
+ac_add_options --enable-application=mail
+ac_add_options --enable-debug
+ac_add_options --enable-trace-malloc
+
+# Enable parallel compiling
+mk_add_options MOZ_MAKE_FLAGS="-j12"
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
+
+# For NSS symbols
+export MOZ_DEBUG_SYMBOLS=1
+
+ac_add_options --with-ccache
+
+# Run client.py
+mk_add_options CLIENT_PY_ARGS="--hg-options='--verbose --time' --hgtool=../tools/buildfarm/utils/hgtool.py --skip-chatzilla --skip-comm --skip-inspector --skip-venkman --tinderbox-print"
+mk_add_options ALWAYS_RUN_CLIENT_PY=1
new file mode 100644
--- /dev/null
+++ b/mail/config/mozconfigs/macosx64/debug
@@ -0,0 +1,29 @@
+if test -e "$topsrcdir/mozilla/build/macosx/common"; then
+  oldtopsrcdir=$topsrcdir
+  export topsrcdir=$topsrcdir/mozilla
+fi
+
+. $topsrcdir/build/macosx/common
+
+if test -n $oldtopsrcdir; then
+  export topsrcdir=$oldtopsrcdir
+fi
+
+ac_add_options --enable-application=mail
+ac_add_options --enable-debug
+ac_add_options --enable-trace-malloc
+
+# Enable parallel compiling
+mk_add_options MOZ_MAKE_FLAGS="-j12"
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
+
+# For NSS symbols
+export MOZ_DEBUG_SYMBOLS=1
+
+ac_add_options --with-ccache
+
+# Run client.py
+mk_add_options CLIENT_PY_ARGS="--hg-options='--verbose --time' --hgtool=../tools/buildfarm/utils/hgtool.py --skip-chatzilla --skip-comm --skip-inspector --skip-venkman --tinderbox-print"
+mk_add_options ALWAYS_RUN_CLIENT_PY=1
--- a/mail/config/mozconfigs/win32/nightly
+++ b/mail/config/mozconfigs/win32/nightly
@@ -9,12 +9,14 @@ ac_add_options --enable-tests
 ac_add_options --enable-jemalloc
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
+export WIN32_REDIST_DIR=/d/msvs8/VC/redist/x86/Microsoft.VC80.CRT
+
 # Run client.py
 mk_add_options CLIENT_PY_ARGS="--hg-options='--verbose --time' --hgtool=../tools/buildfarm/utils/hgtool.py --skip-chatzilla --skip-comm --skip-inspector --skip-venkman --tinderbox-print"
 mk_add_options ALWAYS_RUN_CLIENT_PY=1