From dbf075823e1a14d79039c0ddd85969c41c44470b Mon Sep 17 00:00:00 2001 From: John Ford Date: Thu, 5 Apr 2012 13:46:25 -0700 Subject: [PATCH 1/3] bug 720027 - modify mozconfigs to support fast building on Lion r=ted --- .../mozconfigs/macosx-lion-universal/nightly | 25 ------------------ .../mozconfigs/macosx-lion-universal/release | 20 -------------- .../mozconfigs/macosx-lion-universal/shark | 26 ------------------- .../mozconfigs/macosx-universal/nightly | 3 ++- .../config/mozconfigs/macosx-universal/shark | 3 ++- browser/config/mozconfigs/macosx32-lion/debug | 13 ---------- browser/config/mozconfigs/macosx32/debug | 3 ++- browser/config/mozconfigs/macosx64-lion/debug | 18 ------------- .../mozconfigs/macosx64-lion/l10n-mozconfig | 5 ---- browser/config/mozconfigs/macosx64/debug | 3 ++- .../config/mozconfigs/macosx64/l10n-mozconfig | 1 + 11 files changed, 9 insertions(+), 111 deletions(-) delete mode 100644 browser/config/mozconfigs/macosx-lion-universal/nightly delete mode 100644 browser/config/mozconfigs/macosx-lion-universal/release delete mode 100644 browser/config/mozconfigs/macosx-lion-universal/shark delete mode 100644 browser/config/mozconfigs/macosx32-lion/debug delete mode 100644 browser/config/mozconfigs/macosx64-lion/debug delete mode 100644 browser/config/mozconfigs/macosx64-lion/l10n-mozconfig diff --git a/browser/config/mozconfigs/macosx-lion-universal/nightly b/browser/config/mozconfigs/macosx-lion-universal/nightly deleted file mode 100644 index 571e8029610..00000000000 --- a/browser/config/mozconfigs/macosx-lion-universal/nightly +++ /dev/null @@ -1,25 +0,0 @@ -. $topsrcdir/build/macosx/universal/mozconfig - -# Universal builds override the default of browser (bug 575283 comment 29) -ac_add_options --enable-application=browser - -ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL} -ac_add_options --enable-update-packaging -ac_add_options --enable-codesighs -ac_add_options --disable-install-strip -ac_add_options --enable-signmar - -# Nightlies only since this has a cost in performance -ac_add_options --enable-js-diagnostics - -# Needed to enable breakpad in application.ini -export MOZILLA_OFFICIAL=1 - -export MOZ_TELEMETRY_REPORTING=1 -mk_add_options MOZ_MAKE_FLAGS="-j12" - -ac_add_options --with-macbundlename-prefix=Firefox - -# Treat warnings as errors in directories with FAIL_ON_WARNINGS. -ac_add_options --enable-warnings-as-errors -ac_add_options --with-ccache diff --git a/browser/config/mozconfigs/macosx-lion-universal/release b/browser/config/mozconfigs/macosx-lion-universal/release deleted file mode 100644 index 0acefb03ecd..00000000000 --- a/browser/config/mozconfigs/macosx-lion-universal/release +++ /dev/null @@ -1,20 +0,0 @@ -. $topsrcdir/build/macosx/universal/mozconfig - -# Universal builds override the default of browser (bug 575283 comment 29) -ac_add_options --enable-application=browser - -ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL} -ac_add_options --enable-update-packaging -ac_add_options --enable-official-branding - -# Needed to enable breakpad in application.ini -export MOZILLA_OFFICIAL=1 - -export MOZ_TELEMETRY_REPORTING=1 - -# Treat warnings as errors in directories with FAIL_ON_WARNINGS. -ac_add_options --enable-warnings-as-errors - -# Enable parallel compiling -mk_add_options MOZ_MAKE_FLAGS="-j4" -ac_add_options --with-ccache diff --git a/browser/config/mozconfigs/macosx-lion-universal/shark b/browser/config/mozconfigs/macosx-lion-universal/shark deleted file mode 100644 index 48f355dbe1b..00000000000 --- a/browser/config/mozconfigs/macosx-lion-universal/shark +++ /dev/null @@ -1,26 +0,0 @@ -# Just like nightlies, but without tests, not on an update channel, and with -# shark and dtrace enabled -. $topsrcdir/build/macosx/universal/mozconfig - -# Universal builds override the default of browser (bug 575283 comment 29) -ac_add_options --enable-application=browser - -ac_add_options --disable-tests -ac_add_options --disable-install-strip - -# Needed to enable breakpad in application.ini -export MOZILLA_OFFICIAL=1 - -# Enable parallel compiling -mk_add_options MOZ_MAKE_FLAGS="-j12" - -# shark specific options -ac_add_options --enable-shark -ac_add_options --enable-dtrace - -# Need this to prevent name conflicts with the normal nightly build packages -export MOZ_PKG_SPECIAL="shark" - -# Treat warnings as errors in directories with FAIL_ON_WARNINGS. -ac_add_options --enable-warnings-as-errors -ac_add_options --with-ccache diff --git a/browser/config/mozconfigs/macosx-universal/nightly b/browser/config/mozconfigs/macosx-universal/nightly index a0cd245694d..734ce3f15e8 100644 --- a/browser/config/mozconfigs/macosx-universal/nightly +++ b/browser/config/mozconfigs/macosx-universal/nightly @@ -16,12 +16,13 @@ ac_add_options --enable-js-diagnostics export MOZILLA_OFFICIAL=1 export MOZ_TELEMETRY_REPORTING=1 -mk_add_options MOZ_MAKE_FLAGS="-j4" +mk_add_options MOZ_MAKE_FLAGS="-j12" ac_add_options --with-macbundlename-prefix=Firefox # Treat warnings as errors in directories with FAIL_ON_WARNINGS. ac_add_options --enable-warnings-as-errors +ac_add_options --with-ccache # Package js shell. export MOZ_PACKAGE_JSSHELL=1 diff --git a/browser/config/mozconfigs/macosx-universal/shark b/browser/config/mozconfigs/macosx-universal/shark index 671a00cfb0c..48f355dbe1b 100644 --- a/browser/config/mozconfigs/macosx-universal/shark +++ b/browser/config/mozconfigs/macosx-universal/shark @@ -12,7 +12,7 @@ ac_add_options --disable-install-strip export MOZILLA_OFFICIAL=1 # Enable parallel compiling -mk_add_options MOZ_MAKE_FLAGS="-j4" +mk_add_options MOZ_MAKE_FLAGS="-j12" # shark specific options ac_add_options --enable-shark @@ -23,3 +23,4 @@ export MOZ_PKG_SPECIAL="shark" # Treat warnings as errors in directories with FAIL_ON_WARNINGS. ac_add_options --enable-warnings-as-errors +ac_add_options --with-ccache diff --git a/browser/config/mozconfigs/macosx32-lion/debug b/browser/config/mozconfigs/macosx32-lion/debug deleted file mode 100644 index 10dcda14498..00000000000 --- a/browser/config/mozconfigs/macosx32-lion/debug +++ /dev/null @@ -1,13 +0,0 @@ -. $topsrcdir/build/macosx/mozconfig.leopard -ac_add_options --enable-debug -ac_add_options --enable-trace-malloc -ac_add_options --enable-signmar - -# Enable parallel compiling -mk_add_options MOZ_MAKE_FLAGS="-j12" - -# Needed to enable breakpad in application.ini -export MOZILLA_OFFICIAL=1 - -ac_add_options --with-macbundlename-prefix=Firefox -ac_add_options --with-ccache diff --git a/browser/config/mozconfigs/macosx32/debug b/browser/config/mozconfigs/macosx32/debug index 8b13f66b0b6..d63a10e3561 100644 --- a/browser/config/mozconfigs/macosx32/debug +++ b/browser/config/mozconfigs/macosx32/debug @@ -4,12 +4,13 @@ ac_add_options --enable-trace-malloc ac_add_options --enable-signmar # Enable parallel compiling -mk_add_options MOZ_MAKE_FLAGS="-j4" +mk_add_options MOZ_MAKE_FLAGS="-j12" # Needed to enable breakpad in application.ini export MOZILLA_OFFICIAL=1 ac_add_options --with-macbundlename-prefix=Firefox +ac_add_options --with-ccache # Package js shell. export MOZ_PACKAGE_JSSHELL=1 diff --git a/browser/config/mozconfigs/macosx64-lion/debug b/browser/config/mozconfigs/macosx64-lion/debug deleted file mode 100644 index daa52c4ee59..00000000000 --- a/browser/config/mozconfigs/macosx64-lion/debug +++ /dev/null @@ -1,18 +0,0 @@ -. $topsrcdir/build/macosx/common - -ac_add_options --enable-debug -ac_add_options --enable-trace-malloc -ac_add_options --enable-accessibility -ac_add_options --enable-signmar - -# Enable parallel compiling -mk_add_options MOZ_MAKE_FLAGS="-j12" - -# Needed to enable breakpad in application.ini -export MOZILLA_OFFICIAL=1 - -ac_add_options --with-macbundlename-prefix=Firefox - -# Treat warnings as errors in directories with FAIL_ON_WARNINGS. -ac_add_options --enable-warnings-as-errors -ac_add_options --with-ccache diff --git a/browser/config/mozconfigs/macosx64-lion/l10n-mozconfig b/browser/config/mozconfigs/macosx64-lion/l10n-mozconfig deleted file mode 100644 index 304914322ca..00000000000 --- a/browser/config/mozconfigs/macosx64-lion/l10n-mozconfig +++ /dev/null @@ -1,5 +0,0 @@ -ac_add_options --with-l10n-base=../../l10n-central -ac_add_options --enable-official-branding -ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL} -ac_add_options --enable-update-packaging -ac_add_options --with-ccache diff --git a/browser/config/mozconfigs/macosx64/debug b/browser/config/mozconfigs/macosx64/debug index 7e0994cea65..c1bcc436e28 100644 --- a/browser/config/mozconfigs/macosx64/debug +++ b/browser/config/mozconfigs/macosx64/debug @@ -6,7 +6,7 @@ ac_add_options --enable-accessibility ac_add_options --enable-signmar # Enable parallel compiling -mk_add_options MOZ_MAKE_FLAGS="-j4" +mk_add_options MOZ_MAKE_FLAGS="-j12" # Needed to enable breakpad in application.ini export MOZILLA_OFFICIAL=1 @@ -15,6 +15,7 @@ ac_add_options --with-macbundlename-prefix=Firefox # Treat warnings as errors in directories with FAIL_ON_WARNINGS. ac_add_options --enable-warnings-as-errors +ac_add_options --with-ccache # Package js shell. export MOZ_PACKAGE_JSSHELL=1 diff --git a/browser/config/mozconfigs/macosx64/l10n-mozconfig b/browser/config/mozconfigs/macosx64/l10n-mozconfig index 52e60067768..304914322ca 100644 --- a/browser/config/mozconfigs/macosx64/l10n-mozconfig +++ b/browser/config/mozconfigs/macosx64/l10n-mozconfig @@ -2,3 +2,4 @@ ac_add_options --with-l10n-base=../../l10n-central ac_add_options --enable-official-branding ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL} ac_add_options --enable-update-packaging +ac_add_options --with-ccache From 3e8969946c7c2d3d6c1455ce8e24d77cefd9dc5d Mon Sep 17 00:00:00 2001 From: John Ford Date: Fri, 6 Apr 2012 09:04:14 -0700 Subject: [PATCH 2/3] bug 720027 - add whitespace to mozconfig. really just to trigger builds --- browser/config/mozconfigs/macosx-universal/nightly | 1 + 1 file changed, 1 insertion(+) diff --git a/browser/config/mozconfigs/macosx-universal/nightly b/browser/config/mozconfigs/macosx-universal/nightly index 734ce3f15e8..303e098c18b 100644 --- a/browser/config/mozconfigs/macosx-universal/nightly +++ b/browser/config/mozconfigs/macosx-universal/nightly @@ -26,3 +26,4 @@ ac_add_options --with-ccache # Package js shell. export MOZ_PACKAGE_JSSHELL=1 + From 4cede8a07393d0f13377da27bce1286116fc3793 Mon Sep 17 00:00:00 2001 From: Chris AtLee Date: Mon, 14 May 2012 12:04:37 -0400 Subject: [PATCH 3/3] Bug 753132: Update mozconfig for doing 32-bit builds on 64-bit machines. r=ted --- Makefile.in | 2 +- build/win32/mozconfig.vs2010-win64 | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile.in b/Makefile.in index a942284e511..b747d4cbed9 100644 --- a/Makefile.in +++ b/Makefile.in @@ -177,7 +177,7 @@ EXTRA_BUILDID := -$(MOZ_SYMBOLS_EXTRA_BUILDID) endif SYMBOL_INDEX_NAME = \ - $(MOZ_APP_NAME)-$(MOZ_APP_VERSION)-$(OS_TARGET)-$(BUILDID)$(EXTRA_BUILDID)-symbols.txt + $(MOZ_APP_NAME)-$(MOZ_APP_VERSION)-$(OS_TARGET)-$(BUILDID)-$(CPU_ARCH)$(EXTRA_BUILDID)-symbols.txt buildsymbols: ifdef MOZ_CRASHREPORTER diff --git a/build/win32/mozconfig.vs2010-win64 b/build/win32/mozconfig.vs2010-win64 index 2208939d624..56b59c141e7 100644 --- a/build/win32/mozconfig.vs2010-win64 +++ b/build/win32/mozconfig.vs2010-win64 @@ -1,12 +1,13 @@ export INCLUDE=/c/tools/msvs10/vc/include:/c/tools/msvs10/vc/atlmfc/include:/c/tools/sdks/v7.0/include:/c/tools/sdks/v7.0/include/atl:/c/tools/sdks/dx10/include export LIBPATH=/c/tools/msvs10/vc/lib:/c/tools/msvs10/vc/atlmfc/lib export LIB=/c/tools/msvs10/vc/lib:/c/tools/msvs10/vc/atlmfc/lib:/c/tools/sdks/v7.0/lib:/c/tools/sdks/dx10/lib -export PATH="/c/tools/msvs10/Common7/IDE:/c/tools/msvs10/VC/BIN:/c/tools/msvs10/Common7/Tools:/c/tools/msvs10/VC/VCPackages:${PATH}" export WIN32_REDIST_DIR=/c/tools/msvs10/VC/redist/x86/Microsoft.VC100.CRT - +export MOZ_TOOLS=C:/mozilla-build/moztools +export PATH="/c/tools/msvs10/Common7/IDE:/c/tools/msvs10/VC/BIN:/c/tools/msvs10/Common7/Tools:/c/tools/msvs10/VC/VCPackages:/c/mozilla-build/moztools:/c/Tools/sdks/v7.0/bin:${PATH}" mk_add_options "export LIB=$LIB" mk_add_options "export LIBPATH=$LIBPATH" mk_add_options "export PATH=$PATH" mk_add_options "export INCLUDE=$INCLUDE" mk_add_options "export WIN32_REDIST_DIR=$WIN32_REDIST_DIR" +mk_add_options "export MOZ_TOOLS=$MOZ_TOOLS"