try: -b o -p linux64,macosx64,win64 -u none -t all
authorChris AtLee <catlee@mozilla.com>
Tue, 07 Jul 2015 17:03:16 -0400
changeset 501342 fa7efed1756d4f1bd37d6086e4b989c7264c2817
parent 500663 e7e69cc8c07bfe4a069920f883ee970c73a9dfac
child 564485 2c6b80fbfbcfc6632744c64428e28cf2eb1b2454
push id77301
push usercatlee@mozilla.com
push dateTue, 07 Jul 2015 21:04:49 +0000
treeherdertry@fa7efed1756d [default view] [failures only]
milestone42.0a1
try: -b o -p linux64,macosx64,win64 -u none -t all
build/mozconfig.automation
build/mozconfig.common
toolkit/mozapps/installer/packager.py
--- a/build/mozconfig.automation
+++ b/build/mozconfig.automation
@@ -9,17 +9,17 @@
 # package step will run.  This file contains the default settings, which can be
 # overridden by setting them earlier in the appropriate mozconfig.
 
 mk_add_options "export MOZ_AUTOMATION_BUILD_SYMBOLS=${MOZ_AUTOMATION_BUILD_SYMBOLS-1}"
 mk_add_options "export MOZ_AUTOMATION_L10N_CHECK=${MOZ_AUTOMATION_L10N_CHECK-1}"
 mk_add_options "export MOZ_AUTOMATION_PACKAGE=${MOZ_AUTOMATION_PACKAGE-1}"
 mk_add_options "export MOZ_AUTOMATION_PACKAGE_TESTS=${MOZ_AUTOMATION_PACKAGE_TESTS-1}"
 mk_add_options "export MOZ_AUTOMATION_INSTALLER=${MOZ_AUTOMATION_INSTALLER-0}"
-mk_add_options "export MOZ_AUTOMATION_UPDATE_PACKAGING=${MOZ_AUTOMATION_UPDATE_PACKAGING-0}"
+mk_add_options "export MOZ_AUTOMATION_UPDATE_PACKAGING=1"
 mk_add_options "export MOZ_AUTOMATION_UPLOAD=${MOZ_AUTOMATION_UPLOAD-1}"
 mk_add_options "export MOZ_AUTOMATION_UPLOAD_SYMBOLS=${MOZ_AUTOMATION_UPLOAD_SYMBOLS-0}"
 mk_add_options "export MOZ_AUTOMATION_SDK=${MOZ_AUTOMATION_SDK-0}"
 
 # If we are also building with MOZ_PKG_PRETTYNAMES, set the corresponding
 # stages.
 if test "$MOZ_AUTOMATION_PRETTY" = "1"; then
     mk_add_options "export MOZ_AUTOMATION_PRETTY_PACKAGE=${MOZ_AUTOMATION_PACKAGE-1}"
--- a/build/mozconfig.common
+++ b/build/mozconfig.common
@@ -11,9 +11,17 @@
 # of this file.
 
 mk_add_options AUTOCLOBBER=1
 
 ac_add_options --enable-crashreporter
 
 ac_add_options --enable-release
 
+if [ `uname` != "Darwin" ]; then
+    export MOZ_PGO=1
+    mk_add_options "export MOZ_PGO=1"
+fi
+
+export SCCACHE_DISABLE=1
+mk_add_options "SCCACHE_DISABLE=1"
+
 . "$topsrcdir/build/mozconfig.automation"
--- a/toolkit/mozapps/installer/packager.py
+++ b/toolkit/mozapps/installer/packager.py
@@ -281,17 +281,18 @@ def main():
     if args.format == 'flat':
         formatter = FlatFormatter(copier)
     elif args.format == 'jar':
         formatter = JarFormatter(copier, optimize=args.optimizejars)
     elif args.format == 'omni':
         formatter = OmniJarFormatter(copier,
                                      buildconfig.substs['OMNIJAR_NAME'],
                                      optimize=args.optimizejars,
-                                     non_resources=args.non_resource)
+                                     non_resources=args.non_resource,
+                                     compress=False)
     else:
         errors.fatal('Unknown format: %s' % args.format)
 
     # Adjust defines according to the requested format.
     if isinstance(formatter, OmniJarFormatter):
         defines['MOZ_OMNIJAR'] = 1
     elif 'MOZ_OMNIJAR' in defines:
         del defines['MOZ_OMNIJAR']