build fix draft
authorHiroyuki Ikezoe <hiikezoe@mozilla-japan.org>
Thu, 12 Sep 2013 18:25:02 +0900
changeset 19310 4b2627fd45c91df171753229e50850781415eabe
parent 19306 8f56eaf39ff1c14a2fa7e16a3be35c4674b7792e
child 19311 389f5d6fc39bf2adf637aa583045d9eb808cda19
push id973
push userhiikezoe@mozilla-japan.org
push dateThu, 12 Sep 2013 09:25:21 +0000
treeherdertry-comm-central@2452dc18849a [default view] [failures only]
build fix
build/mozconfig.common
mail/config/mozconfigs/linux32/debug
mail/config/mozconfigs/linux32/l10n-mozconfig
mail/config/mozconfigs/linux32/nightly
mail/config/mozconfigs/linux32/release
mail/config/mozconfigs/linux32/release-l10n
mail/config/mozconfigs/linux64/debug
mail/config/mozconfigs/linux64/l10n-mozconfig
mail/config/mozconfigs/linux64/nightly
mail/config/mozconfigs/linux64/release
mail/config/mozconfigs/linux64/release-l10n
mail/config/mozconfigs/macosx-universal/l10n-mozconfig
mail/config/mozconfigs/macosx-universal/nightly
mail/config/mozconfigs/macosx-universal/release
mail/config/mozconfigs/macosx-universal/release-l10n
mail/config/mozconfigs/macosx64/debug
mail/config/mozconfigs/win32/debug
mail/config/mozconfigs/win32/l10n-mozconfig
mail/config/mozconfigs/win32/nightly
mail/config/mozconfigs/win32/release
mail/config/mozconfigs/win32/release-l10n
mail/config/mozconfigs/win64/debug
mail/config/mozconfigs/win64/l10n-mozconfig
mail/config/mozconfigs/win64/nightly
--- a/build/mozconfig.common
+++ b/build/mozconfig.common
@@ -10,8 +10,10 @@
 # another mozconfig file, you'll need to use mozconfig.common.override instead
 # of this file.
 
 mk_add_options AUTOCLOBBER=1
 
 ac_add_options --enable-crashreporter
 
 ac_add_options --enable-release
+
+mk_add_options CLIENT_PY_ARGS="$([ -f $topsrcdir/build/client.py-args ] && cat $topsrcdir/build/client.py-args)"
--- a/mail/config/mozconfigs/linux32/debug
+++ b/mail/config/mozconfigs/linux32/debug
@@ -11,10 +11,9 @@ export MOZILLA_OFFICIAL=1
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
 
 # Run client.py
-mk_add_options CLIENT_PY_ARGS="$(cat $topsrcdir/build/client.py-args)"
 mk_add_options ALWAYS_RUN_CLIENT_PY=1
--- a/mail/config/mozconfigs/linux32/l10n-mozconfig
+++ b/mail/config/mozconfigs/linux32/l10n-mozconfig
@@ -18,10 +18,9 @@ export MOZILLA_OFFICIAL=1
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 
 # Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
 
 # Run client.py
-mk_add_options CLIENT_PY_ARGS="$(cat $topsrcdir/build/client.py-args)"
 mk_add_options ALWAYS_RUN_CLIENT_PY=1
--- a/mail/config/mozconfigs/linux32/nightly
+++ b/mail/config/mozconfigs/linux32/nightly
@@ -13,10 +13,9 @@ export MOZILLA_OFFICIAL=1
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 
 # Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
 
 # Run client.py
-mk_add_options CLIENT_PY_ARGS="$(cat $topsrcdir/build/client.py-args)"
 mk_add_options ALWAYS_RUN_CLIENT_PY=1
--- a/mail/config/mozconfigs/linux32/release
+++ b/mail/config/mozconfigs/linux32/release
@@ -8,10 +8,9 @@ ac_add_options --enable-calendar
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 
 # Run client.py
-mk_add_options CLIENT_PY_ARGS="$(cat $topsrcdir/build/client.py-args)"
 mk_add_options ALWAYS_RUN_CLIENT_PY=1
--- a/mail/config/mozconfigs/linux32/release-l10n
+++ b/mail/config/mozconfigs/linux32/release-l10n
@@ -2,11 +2,10 @@ ac_add_options --with-l10n-base=`pwd`/..
 ac_add_options --enable-application=mail
 ac_add_options --enable-official-branding
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 
 . $topsrcdir/build/unix/mozconfig.linux32
 
 # Run client.py
-mk_add_options CLIENT_PY_ARGS="$(cat $topsrcdir/build/client.py-args)"
 mk_add_options ALWAYS_RUN_CLIENT_PY=1
 
--- a/mail/config/mozconfigs/linux64/debug
+++ b/mail/config/mozconfigs/linux64/debug
@@ -11,10 +11,9 @@ export MOZILLA_OFFICIAL=1
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 
 # Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
 
 # Run client.py
-mk_add_options CLIENT_PY_ARGS="$(cat $topsrcdir/build/client.py-args)"
 mk_add_options ALWAYS_RUN_CLIENT_PY=1
--- a/mail/config/mozconfigs/linux64/l10n-mozconfig
+++ b/mail/config/mozconfigs/linux64/l10n-mozconfig
@@ -18,10 +18,9 @@ export MOZILLA_OFFICIAL=1
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 
 # Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
 
 # Run client.py
-mk_add_options CLIENT_PY_ARGS="$(cat $topsrcdir/build/client.py-args)"
 mk_add_options ALWAYS_RUN_CLIENT_PY=1
--- a/mail/config/mozconfigs/linux64/nightly
+++ b/mail/config/mozconfigs/linux64/nightly
@@ -13,10 +13,9 @@ export MOZILLA_OFFICIAL=1
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 
 # Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
 
 # Run client.py
-mk_add_options CLIENT_PY_ARGS="$(cat $topsrcdir/build/client.py-args)"
 mk_add_options ALWAYS_RUN_CLIENT_PY=1
--- a/mail/config/mozconfigs/linux64/release
+++ b/mail/config/mozconfigs/linux64/release
@@ -8,10 +8,9 @@ ac_add_options --enable-calendar
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 
 # Run client.py
-mk_add_options CLIENT_PY_ARGS="$(cat $topsrcdir/build/client.py-args)"
 mk_add_options ALWAYS_RUN_CLIENT_PY=1
--- a/mail/config/mozconfigs/linux64/release-l10n
+++ b/mail/config/mozconfigs/linux64/release-l10n
@@ -2,11 +2,10 @@ ac_add_options --with-l10n-base=`pwd`/..
 ac_add_options --enable-application=mail
 ac_add_options --enable-official-branding
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 
 . $topsrcdir/build/unix/mozconfig.linux
 
 # Run client.py
-mk_add_options CLIENT_PY_ARGS="$(cat $topsrcdir/build/client.py-args)"
 mk_add_options ALWAYS_RUN_CLIENT_PY=1
 
--- a/mail/config/mozconfigs/macosx-universal/l10n-mozconfig
+++ b/mail/config/mozconfigs/macosx-universal/l10n-mozconfig
@@ -25,10 +25,9 @@ mk_add_options MOZ_POSTFLIGHT_ALL+=calen
 export MOZ_DEBUG_SYMBOLS=1
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 ac_add_options --with-ccache
 
 # Run client.py
-mk_add_options CLIENT_PY_ARGS="$(cat $topsrcdir/build/client.py-args)"
 mk_add_options ALWAYS_RUN_CLIENT_PY=1
--- a/mail/config/mozconfigs/macosx-universal/nightly
+++ b/mail/config/mozconfigs/macosx-universal/nightly
@@ -25,10 +25,9 @@ export MOZ_DEBUG_SYMBOLS=1
 export MOZILLA_OFFICIAL=1
 
 # Make sure Lightning is also unified
 mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/lightning/build/universal.mk
 
 ac_add_options --with-ccache
 
 # Run client.py
-mk_add_options CLIENT_PY_ARGS="$(cat $topsrcdir/build/client.py-args)"
 mk_add_options ALWAYS_RUN_CLIENT_PY=1
--- a/mail/config/mozconfigs/macosx-universal/release
+++ b/mail/config/mozconfigs/macosx-universal/release
@@ -21,10 +21,9 @@ export MOZ_DEBUG_SYMBOLS=1
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Make sure Lightning is also unified
 mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/lightning/build/universal.mk
 
 # Run client.py
-mk_add_options CLIENT_PY_ARGS="$(cat $topsrcdir/build/client.py-args)"
 mk_add_options ALWAYS_RUN_CLIENT_PY=1
--- a/mail/config/mozconfigs/macosx-universal/release-l10n
+++ b/mail/config/mozconfigs/macosx-universal/release-l10n
@@ -1,10 +1,9 @@
 ac_add_options --with-l10n-base=`pwd`/../../mozilla-central
 ac_add_options --enable-application=mail
 ac_add_options --enable-official-branding
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 
 # Run client.py
-mk_add_options CLIENT_PY_ARGS="$(cat $topsrcdir/build/client.py-args)"
 mk_add_options ALWAYS_RUN_CLIENT_PY=1
 
--- a/mail/config/mozconfigs/macosx64/debug
+++ b/mail/config/mozconfigs/macosx64/debug
@@ -10,10 +10,9 @@ ac_add_options --enable-calendar
 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="$(cat $topsrcdir/build/client.py-args)"
 mk_add_options ALWAYS_RUN_CLIENT_PY=1
--- a/mail/config/mozconfigs/win32/debug
+++ b/mail/config/mozconfigs/win32/debug
@@ -22,10 +22,9 @@ else
   . $topsrcdir/build/win32/mozconfig.vs2010
 fi
 
 # Set up mapi includes (must be done after visual studio setup)
 export INCLUDE=$INCLUDE:/c/Office\ 2010\ Developer\ Resources/Outlook\ 2010\ MAPI\ Headers
 mk_export_correct_style INCLUDE
 
 # Run client.py
-mk_add_options CLIENT_PY_ARGS="$(cat $topsrcdir/build/client.py-args)"
 mk_add_options ALWAYS_RUN_CLIENT_PY=1
--- a/mail/config/mozconfigs/win32/l10n-mozconfig
+++ b/mail/config/mozconfigs/win32/l10n-mozconfig
@@ -26,10 +26,9 @@ else
   . $topsrcdir/build/win32/mozconfig.vs2010
 fi
 
 # Set up mapi includes (must be done after visual studio setup)
 export INCLUDE=$INCLUDE:/c/Office\ 2010\ Developer\ Resources/Outlook\ 2010\ MAPI\ Headers
 mk_export_correct_style INCLUDE
 
 # Run client.py
-mk_add_options CLIENT_PY_ARGS="$(cat $topsrcdir/build/client.py-args)"
 mk_add_options ALWAYS_RUN_CLIENT_PY=1
--- a/mail/config/mozconfigs/win32/nightly
+++ b/mail/config/mozconfigs/win32/nightly
@@ -24,10 +24,9 @@ else
   . $topsrcdir/build/win32/mozconfig.vs2010
 fi
 
 # Set up mapi includes (must be done after visual studio setup)
 export INCLUDE=$INCLUDE:/c/Office\ 2010\ Developer\ Resources/Outlook\ 2010\ MAPI\ Headers
 mk_export_correct_style INCLUDE
 
 # Run client.py
-mk_add_options CLIENT_PY_ARGS="$(cat $topsrcdir/build/client.py-args)"
 mk_add_options ALWAYS_RUN_CLIENT_PY=1
--- a/mail/config/mozconfigs/win32/release
+++ b/mail/config/mozconfigs/win32/release
@@ -25,10 +25,9 @@ else
   . $topsrcdir/build/win32/mozconfig.vs2010
 fi
 
 # Set up mapi includes (must be done after visual studio setup)
 export INCLUDE=$INCLUDE:/c/Office\ 2010\ Developer\ Resources/Outlook\ 2010\ MAPI\ Headers
 mk_export_correct_style INCLUDE
 
 # Run client.py
-mk_add_options CLIENT_PY_ARGS="$(cat $topsrcdir/build/client.py-args)"
 mk_add_options ALWAYS_RUN_CLIENT_PY=1
--- a/mail/config/mozconfigs/win32/release-l10n
+++ b/mail/config/mozconfigs/win32/release-l10n
@@ -1,10 +1,9 @@
 ac_add_options --enable-application=mail
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --enable-official-branding
 ac_add_options --with-l10n-base=`pwd`/../../mozilla-central
 
 # Run client.py
-mk_add_options CLIENT_PY_ARGS="$(cat $topsrcdir/build/client.py-args)"
 mk_add_options ALWAYS_RUN_CLIENT_PY=1
 
--- a/mail/config/mozconfigs/win64/debug
+++ b/mail/config/mozconfigs/win64/debug
@@ -18,10 +18,9 @@ fi
 
 . $topsrcdir/build/win64/mozconfig.vs2010
 
 # Set up mapi includes (must be done after visual studio setup)
 export INCLUDE=$INCLUDE:/c/Office\ 2010\ Developer\ Resources/Outlook\ 2010\ MAPI\ Headers
 mk_export_correct_style INCLUDE
 
 # Run client.py
-mk_add_options CLIENT_PY_ARGS="$(cat $topsrcdir/build/client.py-args)"
 mk_add_options ALWAYS_RUN_CLIENT_PY=1
--- a/mail/config/mozconfigs/win64/l10n-mozconfig
+++ b/mail/config/mozconfigs/win64/l10n-mozconfig
@@ -21,10 +21,9 @@ fi
 
 . $topsrcdir/build/win64/mozconfig.vs2010
 
 # Set up mapi includes (must be done after visual studio setup)
 export INCLUDE=$INCLUDE:/c/Office\ 2010\ Developer\ Resources/Outlook\ 2010\ MAPI\ Headers
 mk_export_correct_style INCLUDE
 
 # Run client.py
-mk_add_options CLIENT_PY_ARGS="$(cat $topsrcdir/build/client.py-args)"
 mk_add_options ALWAYS_RUN_CLIENT_PY=1
--- a/mail/config/mozconfigs/win64/nightly
+++ b/mail/config/mozconfigs/win64/nightly
@@ -22,10 +22,9 @@ fi
 
 . $topsrcdir/build/win64/mozconfig.vs2010
 
 # Set up mapi includes (must be done after visual studio setup)
 export INCLUDE=$INCLUDE:/c/Office\ 2010\ Developer\ Resources/Outlook\ 2010\ MAPI\ Headers
 mk_export_correct_style INCLUDE
 
 # Run client.py
-mk_add_options CLIENT_PY_ARGS="$(cat $topsrcdir/build/client.py-args)"
 mk_add_options ALWAYS_RUN_CLIENT_PY=1