Bug 1425131: Refactor win64 mozconfigs; r=me
authorTom Prince <mozilla@hocat.ca>
Wed, 13 Dec 2017 14:13:16 -0700
changeset 29768 1bf6631f02522412e2bd0c82db943c49e8ff5a2e
parent 29767 599e0b970229391dfe85ecd1c7063074a87c19b3
child 29769 f14a2331480c63fe38dedf30b649d32e5c791733
push id2108
push userclokep@gmail.com
push dateMon, 22 Jan 2018 17:53:55 +0000
treeherdercomm-beta@c44930d8ad9b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs1425131
Bug 1425131: Refactor win64 mozconfigs; r=me
mail/config/mozconfigs/win64/debug
mail/config/mozconfigs/win64/nightly
--- a/mail/config/mozconfigs/win64/debug
+++ b/mail/config/mozconfigs/win64/debug
@@ -1,18 +1,18 @@
+. "$topsrcdir/build/mozconfig.comm-support"
 . "$topsrcdir/build/mozconfig.win-common"
 . "$topsrcdir/build/mozconfig.common"
 . "$topsrcdir/build/mozconfig.stylo"
+. "$commtopsrcdir/mail/config/mozconfigs/common"
 
 ac_add_options --target=x86_64-pc-mingw32
 ac_add_options --host=x86_64-pc-mingw32
 
-ac_add_options --enable-application=mail
 ac_add_options --enable-debug
-ac_add_options --enable-calendar
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Package js shell
 export MOZ_PACKAGE_JSSHELL=1
 
 # Disable checking that add-ons are signed by the trusted root
@@ -21,14 +21,12 @@ MOZ_ADDON_SIGNING=0
 MOZ_REQUIRE_ADDON_SIGNING=0
 
 . $topsrcdir/build/win64/mozconfig.vs-latest
 
 # 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="$([ -f $topsrcdir/build/client.py-args ] && cat $topsrcdir/build/client.py-args)"
-mk_add_options ALWAYS_RUN_CLIENT_PY=1
-
-# Use the TOOLTOOL provided xz for mar generation.
-mk_add_options "export XZ=$TOOLTOOL_DIR/xz/xz.exe"
+if [ "$MOZ_IS_COMM_TOPDIR" == "1" ]; then
+  # Use the TOOLTOOL provided xz for mar generation.
+  mk_add_options "export XZ=$TOOLTOOL_DIR/xz/xz.exe"
+fi
--- a/mail/config/mozconfigs/win64/nightly
+++ b/mail/config/mozconfigs/win64/nightly
@@ -1,20 +1,20 @@
+. "$topsrcdir/build/mozconfig.comm-support"
 . "$topsrcdir/build/mozconfig.win-common"
 . "$topsrcdir/build/mozconfig.common"
 . "$topsrcdir/build/mozconfig.stylo"
+. "$commtopsrcdir/mail/config/mozconfigs/common"
 
 ac_add_options --target=x86_64-pc-mingw32
 ac_add_options --host=x86_64-pc-mingw32
 
-ac_add_options --enable-application=mail
-ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
+ac_add_options --enable-update-channel="${MOZ_UPDATE_CHANNEL}"
 ac_add_options --enable-jemalloc
 ac_add_options --enable-profiling
-ac_add_options --enable-calendar
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
 
 # Disable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=0
@@ -25,16 +25,14 @@ MOZ_REQUIRE_ADDON_SIGNING=0
 export MOZ_PACKAGE_JSSHELL=1
 
 . $topsrcdir/build/win64/mozconfig.vs-latest
 
 # 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="$([ -f $topsrcdir/build/client.py-args ] && cat $topsrcdir/build/client.py-args)"
-mk_add_options ALWAYS_RUN_CLIENT_PY=1
-
-# Use the TOOLTOOL provided xz for mar generation.
-mk_add_options "export XZ=$TOOLTOOL_DIR/xz/xz.exe"
+if [ "$MOZ_IS_COMM_TOPDIR" == "1" ]; then
+  # Use the TOOLTOOL provided xz for mar generation.
+  mk_add_options "export XZ=$TOOLTOOL_DIR/xz/xz.exe"
+fi
 
 mk_add_options "export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE=c:/builds/crash-stats-api.token"