Bug 1121000 - Remove support for non-unified builds; r=gps
authorEhsan Akhgari <ehsan@mozilla.com>
Thu, 27 Nov 2014 21:25:27 -0500
changeset 252670 b3d466fde338214d5739d54d3144a9a3536bdc97
parent 252669 38fdf8e1c502a426373afce8f060461cffffc38f
child 252671 4ed0ad42de73da1240caaf1dd5dfd081f87bd99d
push id721
push userjlund@mozilla.com
push dateTue, 21 Apr 2015 23:03:33 +0000
treeherdermozilla-release@d27c9211ebb3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs1121000
milestone38.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1121000 - Remove support for non-unified builds; r=gps
browser/config/mozconfigs/linux32/debug
browser/config/mozconfigs/linux64/debug-nonunified
browser/config/mozconfigs/linux64/debug-static-analysis-clang
browser/config/mozconfigs/linux64/nightly-nonunified
browser/config/mozconfigs/macosx-universal/nightly-nonunified
browser/config/mozconfigs/macosx64/debug-asan
browser/config/mozconfigs/macosx64/debug-nonunified
browser/config/mozconfigs/win32/debug-nonunified
browser/config/mozconfigs/win32/nightly-nonunified
browser/config/mozconfigs/win64/debug-nonunified
browser/config/mozconfigs/win64/nightly-nonunified
configure.in
js/src/configure.in
mobile/android/config/mozconfigs/android-api-10/debug-nonunified
mobile/android/config/mozconfigs/android-api-10/nightly-nonunified
mobile/android/config/mozconfigs/android-api-11/debug-nonunified
mobile/android/config/mozconfigs/android-api-11/nightly-nonunified
mobile/android/config/mozconfigs/android-armv6/debug
mobile/android/config/mozconfigs/android-x86/debug
mobile/android/config/mozconfigs/android/debug-nonunified
mobile/android/config/mozconfigs/android/nightly-nonunified
python/mozbuild/mozbuild/backend/recursivemake.py
xulrunner/config/mozconfigs/common
--- a/browser/config/mozconfigs/linux32/debug
+++ b/browser/config/mozconfigs/linux32/debug
@@ -1,15 +1,13 @@
 ac_add_options --enable-debug
 ac_add_options --enable-dmd
 ac_add_options --enable-signmar
 ac_add_options --with-google-oauth-api-keyfile=/builds/google-oauth-api.key
 
-ac_add_options --disable-unified-compilation
-
 MOZ_AUTOMATION_L10N_CHECK=0
 
 . $topsrcdir/build/unix/mozconfig.linux32
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 #Use ccache
deleted file mode 100644
--- a/browser/config/mozconfigs/linux64/debug-nonunified
+++ /dev/null
@@ -1,5 +0,0 @@
-MOZ_AUTOMATION_UPLOAD=0
-
-. "$topsrcdir/browser/config/mozconfigs/linux64/debug"
-
-ac_add_options --disable-unified-compilation
--- a/browser/config/mozconfigs/linux64/debug-static-analysis-clang
+++ b/browser/config/mozconfigs/linux64/debug-static-analysis-clang
@@ -2,18 +2,16 @@ MOZ_AUTOMATION_BUILD_SYMBOLS=0
 MOZ_AUTOMATION_PACKAGE_TESTS=0
 MOZ_AUTOMATION_L10N_CHECK=0
 
 . "$topsrcdir/build/mozconfig.common"
 
 ac_add_options --enable-debug
 ac_add_options --enable-dmd
 
-ac_add_options --disable-unified-compilation
-
 # Use Clang as specified in manifest
 export CC="$topsrcdir/clang/bin/clang"
 export CXX="$topsrcdir/clang/bin/clang++"
 
 # Add the static checker
 ac_add_options --enable-clang-plugin
 
 # Avoid dependency on libstdc++ 4.7
deleted file mode 100644
--- a/browser/config/mozconfigs/linux64/nightly-nonunified
+++ /dev/null
@@ -1,6 +0,0 @@
-MOZ_AUTOMATION_UPLOAD=0
-MOZ_AUTOMATION_PRETTY=1
-
-. "$topsrcdir/browser/config/mozconfigs/linux64/nightly"
-
-ac_add_options --disable-unified-compilation
deleted file mode 100644
--- a/browser/config/mozconfigs/macosx-universal/nightly-nonunified
+++ /dev/null
@@ -1,5 +0,0 @@
-MOZ_AUTOMATION_PRETTY=1
-MOZ_AUTOMATION_UPLOAD=0
-. "$topsrcdir/browser/config/mozconfigs/macosx-universal/nightly"
-
-ac_add_options --disable-unified-compilation
--- a/browser/config/mozconfigs/macosx64/debug-asan
+++ b/browser/config/mozconfigs/macosx64/debug-asan
@@ -1,17 +1,15 @@
 . $topsrcdir/build/unix/mozconfig.asan
 
 ac_add_options --enable-application=browser
 ac_add_options --enable-debug
 ac_add_options --enable-optimize="-O1"
 ac_add_options --with-google-oauth-api-keyfile=/builds/google-oauth-api.key
 
-ac_add_options --disable-unified-compilation
-
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
 
 if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then
 ac_add_options --with-macbundlename-prefix=Firefox
 fi
 
 # Need this to prevent name conflicts with the normal nightly build packages
deleted file mode 100644
--- a/browser/config/mozconfigs/macosx64/debug-nonunified
+++ /dev/null
@@ -1,4 +0,0 @@
-MOZ_AUTOMATION_UPLOAD=0
-. "$topsrcdir/browser/config/mozconfigs/macosx64/debug"
-
-ac_add_options --disable-unified-compilation
deleted file mode 100644
--- a/browser/config/mozconfigs/win32/debug-nonunified
+++ /dev/null
@@ -1,6 +0,0 @@
-. "$topsrcdir/build/mozconfig.win-common"
-MOZ_AUTOMATION_L10N_CHECK=0
-MOZ_AUTOMATION_UPLOAD=0
-. "$topsrcdir/browser/config/mozconfigs/win32/debug"
-
-ac_add_options --disable-unified-compilation
deleted file mode 100644
--- a/browser/config/mozconfigs/win32/nightly-nonunified
+++ /dev/null
@@ -1,6 +0,0 @@
-. "$topsrcdir/build/mozconfig.win-common"
-MOZ_AUTOMATION_PRETTY=1
-MOZ_AUTOMATION_UPLOAD=0
-. "$topsrcdir/browser/config/mozconfigs/win32/nightly"
-
-ac_add_options --disable-unified-compilation
deleted file mode 100644
--- a/browser/config/mozconfigs/win64/debug-nonunified
+++ /dev/null
@@ -1,3 +0,0 @@
-. "$topsrcdir/browser/config/mozconfigs/win64/debug"
-
-ac_add_options --disable-unified-compilation
deleted file mode 100644
--- a/browser/config/mozconfigs/win64/nightly-nonunified
+++ /dev/null
@@ -1,3 +0,0 @@
-. "$topsrcdir/browser/config/mozconfigs/win64/nightly"
-
-ac_add_options --disable-unified-compilation
--- a/configure.in
+++ b/configure.in
@@ -3538,27 +3538,16 @@ case "$GRE_MILESTONE" in
       RELEASE_BUILD=1
       AC_DEFINE(RELEASE_BUILD)
       ;;
 esac
 AC_SUBST(NIGHTLY_BUILD)
 AC_SUBST(RELEASE_BUILD)
 
 dnl ========================================================
-dnl Disable compiling sources in unified mode.
-dnl ========================================================
-
-MOZ_ARG_DISABLE_BOOL(unified-compilation,
-[  --disable-unified-compilation
-                          Disable unified compilation of some C/C++ sources],
-    MOZ_DISABLE_UNIFIED_COMPILATION=1,
-    MOZ_DISABLE_UNIFIED_COMPILATION=)
-AC_SUBST(MOZ_DISABLE_UNIFIED_COMPILATION)
-
-dnl ========================================================
 dnl Multiprocess Firefox Nightly Testing UI
 dnl To be removed in Bug 1003313
 dnl ========================================================
 if test -n "$NIGHTLY_BUILD"; then
     E10S_TESTING_ONLY=1
     AC_DEFINE(E10S_TESTING_ONLY)
 fi
 
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -2775,31 +2775,16 @@ case "$GRE_MILESTONE" in
       RELEASE_BUILD=1
       AC_DEFINE(RELEASE_BUILD)
       ;;
 esac
 AC_SUBST(NIGHTLY_BUILD)
 AC_SUBST(RELEASE_BUILD)
 
 dnl ========================================================
-dnl Disable compiling sources in unified mode.
-dnl ========================================================
-
-if test -z "$NIGHTLY_BUILD"; then
-    MOZ_DISABLE_UNIFIED_COMPILATION=1
-fi
-
-MOZ_ARG_DISABLE_BOOL(unified-compilation,
-[  --disable-unified-compilation
-                          Disable unified compilation of some C/C++ sources],
-    MOZ_DISABLE_UNIFIED_COMPILATION=1,
-    MOZ_DISABLE_UNIFIED_COMPILATION=)
-AC_SUBST(MOZ_DISABLE_UNIFIED_COMPILATION)
-
-dnl ========================================================
 dnl =
 dnl = Check for external package dependencies
 dnl =
 dnl ========================================================
 MOZ_ARG_HEADER(External Packages)
 
 MOZ_CONFIG_NSPR(js)
 
deleted file mode 100644
--- a/mobile/android/config/mozconfigs/android-api-10/debug-nonunified
+++ /dev/null
@@ -1,4 +0,0 @@
-. "$topsrcdir/mobile/android/config/mozconfigs/android-api-10/debug"
-
-ac_add_options --disable-unified-compilation
-
deleted file mode 100644
--- a/mobile/android/config/mozconfigs/android-api-10/nightly-nonunified
+++ /dev/null
@@ -1,4 +0,0 @@
-. "$topsrcdir/mobile/android/config/mozconfigs/android-api-10/nightly"
-
-ac_add_options --disable-unified-compilation
-
deleted file mode 100644
--- a/mobile/android/config/mozconfigs/android-api-11/debug-nonunified
+++ /dev/null
@@ -1,4 +0,0 @@
-. "$topsrcdir/mobile/android/config/mozconfigs/android-api-11/debug"
-
-ac_add_options --disable-unified-compilation
-
deleted file mode 100644
--- a/mobile/android/config/mozconfigs/android-api-11/nightly-nonunified
+++ /dev/null
@@ -1,4 +0,0 @@
-. "$topsrcdir/mobile/android/config/mozconfigs/android-api-11/nightly"
-
-ac_add_options --disable-unified-compilation
-
--- a/mobile/android/config/mozconfigs/android-armv6/debug
+++ b/mobile/android/config/mozconfigs/android-armv6/debug
@@ -1,13 +1,12 @@
 . "$topsrcdir/mobile/android/config/mozconfigs/common"
 
 # Global options
 ac_add_options --enable-debug
-ac_add_options --disable-unified-compilation
 
 # Android
 ac_add_options --target=arm-linux-androideabi
 ac_add_options --with-arch=armv6
 
 export MOZILLA_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1
 export MOZ_PKG_SPECIAL=armv6
--- a/mobile/android/config/mozconfigs/android-x86/debug
+++ b/mobile/android/config/mozconfigs/android-x86/debug
@@ -1,13 +1,12 @@
 . "$topsrcdir/mobile/android/config/mozconfigs/common"
 
 # Global options
 ac_add_options --enable-debug
-ac_add_options --disable-unified-compilation
 
 # Android
 ac_add_options --target=i386-linux-android
 
 export MOZILLA_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1
 
 ac_add_options --with-branding=mobile/android/branding/nightly
deleted file mode 100644
--- a/mobile/android/config/mozconfigs/android/debug-nonunified
+++ /dev/null
@@ -1,3 +0,0 @@
-. "$topsrcdir/mobile/android/config/mozconfigs/android/debug"
-
-ac_add_options --disable-unified-compilation
deleted file mode 100644
--- a/mobile/android/config/mozconfigs/android/nightly-nonunified
+++ /dev/null
@@ -1,3 +0,0 @@
-. "$topsrcdir/mobile/android/config/mozconfigs/android/nightly"
-
-ac_add_options --disable-unified-compilation
--- a/python/mozbuild/mozbuild/backend/recursivemake.py
+++ b/python/mozbuild/mozbuild/backend/recursivemake.py
@@ -389,18 +389,17 @@ class RecursiveMakeBackend(CommonBackend
                 '.mm': 'UNIFIED_CMMSRCS',
                 '.cpp': 'UNIFIED_CPPSRCS',
             }
 
             var = suffix_map[obj.canonical_suffix]
             non_unified_var = var[len('UNIFIED_'):]
 
             files_per_unification = obj.files_per_unified_file
-            do_unify = not self.environment.substs.get(
-                'MOZ_DISABLE_UNIFIED_COMPILATION') and files_per_unification > 1
+            do_unify = files_per_unification > 1
             # Sorted so output is consistent and we don't bump mtimes.
             source_files = list(sorted(obj.files))
 
             if do_unify:
                 # On Windows, path names have a maximum length of 255 characters,
                 # so avoid creating extremely long path names.
                 unified_prefix = mozpath.relpath(backend_file.objdir,
                     backend_file.environment.topobjdir)
--- a/xulrunner/config/mozconfigs/common
+++ b/xulrunner/config/mozconfigs/common
@@ -1,9 +1,7 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # This file is included at the top of all xulrunner mozconfigs
 
 . "$topsrcdir/build/mozconfig.common"
-
-ac_add_options --disable-unified-compilation