Backed out changeset 8d3c3420986b and Windows changes from changeset 0943558ecc1f to fix Windows bustage.
authorRyan VanderMeulen <ryanvm@gmail.com>
Wed, 21 May 2014 10:43:46 -0400
changeset 16231 c72af32003645c2808c81d178a4a519c2ed1ad32
parent 16230 8d3c3420986b7785a46f68d130115de5946b1f7e
child 16232 678a0897be2aa84567244d40da17e161f230f38a
push id10145
push userryanvm@gmail.com
push dateWed, 21 May 2014 14:43:54 +0000
treeherdercomm-central@c72af3200364 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
backs out8d3c3420986b7785a46f68d130115de5946b1f7e
Backed out changeset 8d3c3420986b and Windows changes from changeset 0943558ecc1f to fix Windows bustage.
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
mail/config/tooltool-manifests/win32/releng.manifest
mail/config/tooltool-manifests/win64/releng.manifest
suite/config/tooltool-manifests/win32/releng.manifest
suite/config/tooltool-manifests/win64/releng.manifest
--- a/mail/config/mozconfigs/win32/debug
+++ b/mail/config/mozconfigs/win32/debug
@@ -1,9 +1,8 @@
-no_tooltool=1
 . "$topsrcdir/build/mozconfig.common"
 
 ac_add_options --enable-application=mail
 ac_add_options --enable-debug
 ac_add_options --enable-trace-malloc
 ac_add_options --enable-signmar
 ac_add_options --enable-require-all-d3dc-versions
 ac_add_options --enable-calendar
--- a/mail/config/mozconfigs/win32/l10n-mozconfig
+++ b/mail/config/mozconfigs/win32/l10n-mozconfig
@@ -1,9 +1,8 @@
-no_tooltool=1
 . "$topsrcdir/build/mozconfig.common"
 
 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-jemalloc
 ac_add_options --with-l10n-base=../../l10n
 
--- a/mail/config/mozconfigs/win32/nightly
+++ b/mail/config/mozconfigs/win32/nightly
@@ -1,9 +1,8 @@
-no_tooltool=1
 . "$topsrcdir/build/mozconfig.common"
 
 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-jemalloc
 ac_add_options --enable-require-all-d3dc-versions
 ac_add_options --enable-signmar
--- a/mail/config/mozconfigs/win32/release
+++ b/mail/config/mozconfigs/win32/release
@@ -1,9 +1,8 @@
-no_tooltool=1
 . "$topsrcdir/build/mozconfig.common"
 
 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-jemalloc
 ac_add_options --enable-require-all-d3dc-versions
 ac_add_options --enable-official-branding
--- a/mail/config/mozconfigs/win32/release-l10n
+++ b/mail/config/mozconfigs/win32/release-l10n
@@ -1,9 +1,8 @@
-no_tooltool=1
 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="$([ -f $topsrcdir/build/client.py-args ] && cat $topsrcdir/build/client.py-args)"
--- a/mail/config/mozconfigs/win64/debug
+++ b/mail/config/mozconfigs/win64/debug
@@ -1,9 +1,8 @@
-no_tooltool=1
 . "$topsrcdir/build/mozconfig.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-trace-malloc
--- a/mail/config/mozconfigs/win64/l10n-mozconfig
+++ b/mail/config/mozconfigs/win64/l10n-mozconfig
@@ -1,9 +1,8 @@
-no_tooltool=1
 . "$topsrcdir/build/mozconfig.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-packaging
--- a/mail/config/mozconfigs/win64/nightly
+++ b/mail/config/mozconfigs/win64/nightly
@@ -1,9 +1,8 @@
-no_tooltool=1
 . "$topsrcdir/build/mozconfig.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-packaging
deleted file mode 100644
--- a/mail/config/tooltool-manifests/win32/releng.manifest
+++ /dev/null
@@ -1,20 +0,0 @@
-[
-{
-"size": 266240,
-"digest": "bb345b0e700ffab4d09436981f14b5de84da55a3f18a7f09ebc4364a4488acdeab8d46f447b12ac70f2da1444a68b8ce8b8675f0dae2ccf845e966d1df0f0869",
-"algorithm": "sha512",
-"filename": "mozmake.exe"
-},
-{
-"size": 51,
-"digest": "c8e40edb314eeabfb92c77cf5ff9a7857033f15dd65a00349bcf9e3e5b75624afc71f733b2ff7e029c20a78313038409c2bd022bf7e5a7e0c487fc2c2d640986",
-"algorithm": "sha512",
-"filename": "setup.sh"
-},
-{
-"size": 165226,
-"digest": "79280f7595bc9e1613e05f8b2f0db3798ac739b96191e0f133e8ccd8ad149fedc84a1046e59863574189db28363a01712ae7b368ad1714e30ff88e7ebd5dad23",
-"algorithm": "sha512",
-"filename": "sccache.tar.bz2"
-}
-]
deleted file mode 100644
--- a/mail/config/tooltool-manifests/win64/releng.manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-[
-{
-"size": 266240,
-"digest": "bb345b0e700ffab4d09436981f14b5de84da55a3f18a7f09ebc4364a4488acdeab8d46f447b12ac70f2da1444a68b8ce8b8675f0dae2ccf845e966d1df0f0869",
-"algorithm": "sha512",
-"filename": "mozmake.exe"
-}
-]
deleted file mode 100644
--- a/suite/config/tooltool-manifests/win32/releng.manifest
+++ /dev/null
@@ -1,20 +0,0 @@
-[
-{
-"size": 266240,
-"digest": "bb345b0e700ffab4d09436981f14b5de84da55a3f18a7f09ebc4364a4488acdeab8d46f447b12ac70f2da1444a68b8ce8b8675f0dae2ccf845e966d1df0f0869",
-"algorithm": "sha512",
-"filename": "mozmake.exe"
-},
-{
-"size": 51,
-"digest": "c8e40edb314eeabfb92c77cf5ff9a7857033f15dd65a00349bcf9e3e5b75624afc71f733b2ff7e029c20a78313038409c2bd022bf7e5a7e0c487fc2c2d640986",
-"algorithm": "sha512",
-"filename": "setup.sh"
-},
-{
-"size": 165226,
-"digest": "79280f7595bc9e1613e05f8b2f0db3798ac739b96191e0f133e8ccd8ad149fedc84a1046e59863574189db28363a01712ae7b368ad1714e30ff88e7ebd5dad23",
-"algorithm": "sha512",
-"filename": "sccache.tar.bz2"
-}
-]
deleted file mode 100644
--- a/suite/config/tooltool-manifests/win64/releng.manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-[
-{
-"size": 266240,
-"digest": "bb345b0e700ffab4d09436981f14b5de84da55a3f18a7f09ebc4364a4488acdeab8d46f447b12ac70f2da1444a68b8ce8b8675f0dae2ccf845e966d1df0f0869",
-"algorithm": "sha512",
-"filename": "mozmake.exe"
-}
-]