Backed out changeset: 4cba71fe1365 (Bug 903439) for using an incorrect config path.
authorFrank-Rainer Grahl <frgrahl@gmx.net>
Tue, 25 Jul 2017 19:55:49 +0200
changeset 28485 c9e047305620281f694b2ecd5a265f540ef0bdd3
parent 28484 a88021d3418e20d171ef80efd5c42d6acd304b39
child 28486 6795cf66d9c88e8900e8b0ce1be5bf4090dd325c
push id1986
push userclokep@gmail.com
push dateWed, 02 Aug 2017 14:43:31 +0000
treeherdercomm-beta@b51c9adf2c9e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs903439
Backed out changeset: 4cba71fe1365 (Bug 903439) for using an incorrect config path.
suite/config/mozconfigs/linux32/nightly
suite/config/mozconfigs/linux32/release
suite/config/mozconfigs/linux64/nightly
suite/config/mozconfigs/linux64/release
suite/config/mozconfigs/macosx64/nightly
suite/config/mozconfigs/macosx64/release
suite/config/mozconfigs/mozconfig.linux.common
suite/config/mozconfigs/mozconfig.macosx.common
suite/config/mozconfigs/mozconfig.win.common
suite/config/mozconfigs/win32/nightly
suite/config/mozconfigs/win32/release
suite/config/mozconfigs/win64/nightly
suite/config/mozconfigs/win64/release
--- a/suite/config/mozconfigs/linux32/nightly
+++ b/suite/config/mozconfigs/linux32/nightly
@@ -1,10 +1,9 @@
 . "$topsrcdir/build/unix/mozconfig.linux32"
-. "$topsrcdir/suite/config/mozconfig.linux.common"
 
 # Disable webrender on Linux buildbot builders to avoid the Rust requirement
 # of libX11 version > 1.4.99.1 (see bug 1350011).
 ac_add_options --disable-webrender
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-profiling
--- a/suite/config/mozconfigs/linux32/release
+++ b/suite/config/mozconfigs/linux32/release
@@ -1,10 +1,9 @@
 . "$topsrcdir/build/unix/mozconfig.linux32"
-. "$topsrcdir/suite/config/mozconfig.linux.common"
 
 # Disable webrender on Linux buildbot builders to avoid the Rust requirement
 # of libX11 version > 1.4.99.1 (see bug 1350011).
 ac_add_options --disable-webrender
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-official-branding
--- a/suite/config/mozconfigs/linux64/nightly
+++ b/suite/config/mozconfigs/linux64/nightly
@@ -1,10 +1,9 @@
 . "$topsrcdir/build/unix/mozconfig.linux"
-. "$topsrcdir/suite/config/mozconfig.linux.common"
 
 # Disable webrender on Linux buildbot builders to avoid the Rust requirement
 # of libX11 version > 1.4.99.1 (see bug 1350011).
 ac_add_options --disable-webrender
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-profiling
--- a/suite/config/mozconfigs/linux64/release
+++ b/suite/config/mozconfigs/linux64/release
@@ -1,10 +1,9 @@
 . "$topsrcdir/build/unix/mozconfig.linux"
-. "$topsrcdir/suite/config/mozconfig.linux.common"
 
 # Disable webrender on Linux buildbot builders to avoid the Rust requirement
 # of libX11 version > 1.4.99.1 (see bug 1350011).
 ac_add_options --disable-webrender
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-official-branding
--- a/suite/config/mozconfigs/macosx64/nightly
+++ b/suite/config/mozconfigs/macosx64/nightly
@@ -1,10 +1,9 @@
 . $topsrcdir/build/macosx/mozconfig.common
-. $topsrcdir/suite/config/mozconfig.macosx.common
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --disable-install-strip
 ac_add_options --enable-profiling
 ac_add_options --enable-calendar
 
 # Package js shell
--- a/suite/config/mozconfigs/macosx64/release
+++ b/suite/config/mozconfigs/macosx64/release
@@ -1,10 +1,9 @@
 . $topsrcdir/build/macosx/mozconfig.common
-. $topsrcdir/suite/config/mozconfig.macosx.common
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-official-branding
 ac_add_options --enable-calendar
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
--- a/suite/config/mozconfigs/mozconfig.linux.common
+++ b/suite/config/mozconfigs/mozconfig.linux.common
@@ -1,7 +1,3 @@
-# Common statements that are applicable to both Linux32 and Linux64.
-
-ac_add_options --with-google-api-keyfile=/builds/google-api.key
+# Common statements that are applicable to both Linux32 and Linux64
 
-# SeaMonkey uses the google api key for Geolocation services
-# See Bug 1352850 - Switch to Google for Geolocation services
-# ac_add_options --with-mozilla-api-keyfile=/builds/mozilla-desktop-geoloc-api.key
+TOOLTOOL_DIR=${topsrcdir}
deleted file mode 100644
--- a/suite/config/mozconfigs/mozconfig.macosx.common
+++ /dev/null
@@ -1,9 +0,0 @@
-# Common statements that are applicable to macOS x64.
-
-# Same location as on Linux so no need to distingush when doing
-# a macOS cross compile on Linux.
-ac_add_options --with-google-api-keyfile=/builds/google-api.key
-
-# SeaMonkey uses the google api key for Geolocation services.
-# See Bug 1352850 - Switch to Google for Geolocation services.
-# ac_add_options --with-mozilla-api-keyfile=/builds/mozilla-desktop-geoloc-api.key
deleted file mode 100644
--- a/suite/config/mozconfigs/mozconfig.win.common
+++ /dev/null
@@ -1,7 +0,0 @@
-# Common statements that are applicable to Windows x86 and x64.
-
-ac_add_options --with-google-api-keyfile=c:/builds/google-api.key
-
-# SeaMonkey uses the google api key for Geolocation services
-# See Bug 1352850 - Switch to Google for Geolocation services
-# ac_add_options --with-mozilla-api-keyfile=c:/builds/mozilla-desktop-geoloc-api.key
--- a/suite/config/mozconfigs/win32/nightly
+++ b/suite/config/mozconfigs/win32/nightly
@@ -1,11 +1,10 @@
 . "$topsrcdir/build/mozconfig.win-common"
 . "$topsrcdir/build/mozconfig.common"
-. "$topsrcdir/suite/config/mozconfig.win.common"
 
 ac_add_options --enable-application=suite
 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
--- a/suite/config/mozconfigs/win32/release
+++ b/suite/config/mozconfigs/win32/release
@@ -1,11 +1,10 @@
 . "$topsrcdir/build/mozconfig.win-common"
 . "$topsrcdir/build/mozconfig.common"
-. "$topsrcdir/suite/config/mozconfig.win.common"
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-official-branding
 ac_add_options --enable-jemalloc
 ac_add_options --enable-calendar
 
 # Needed to enable breakpad in application.ini
--- a/suite/config/mozconfigs/win64/nightly
+++ b/suite/config/mozconfigs/win64/nightly
@@ -1,11 +1,10 @@
 . "$topsrcdir/build/mozconfig.win-common"
 . "$topsrcdir/build/mozconfig.common"
-. "$topsrcdir/suite/config/mozconfig.win.common"
 
 ac_add_options --target=x86_64-pc-mingw32
 ac_add_options --host=x86_64-pc-mingw32
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-jemalloc
 ac_add_options --enable-profiling
--- a/suite/config/mozconfigs/win64/release
+++ b/suite/config/mozconfigs/win64/release
@@ -1,11 +1,10 @@
 . "$topsrcdir/build/mozconfig.win-common"
 . "$topsrcdir/build/mozconfig.common"
-. "$topsrcdir/suite/config/mozconfig.win.common"
 
 ac_add_options --target=x86_64-pc-mingw32
 ac_add_options --host=x86_64-pc-mingw32
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-official-branding
 ac_add_options --enable-jemalloc