Commit c1d35d7e authored by Ehsan Akhgari's avatar Ehsan Akhgari
Browse files

Merge the latest green changeset from mozilla-inbound into mozilla-central

parents 35feb590 8c7f3d1d

browser/config/mozconfigs/macosx-lion-universal/nightly

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
. $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

browser/config/mozconfigs/macosx-lion-universal/release

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
. $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

browser/config/mozconfigs/macosx-lion-universal/shark

deleted100644 → 0
+0 −26
Original line number Diff line number Diff line 
# 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

browser/config/mozconfigs/macosx-universal/nightly

+2 −1
Original line number Diff line number Diff line
@@ -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

browser/config/mozconfigs/macosx-universal/shark

+2 −1
Original line number Diff line number Diff line
@@ -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