Commit 141da7cd authored by Phil Ringnalda's avatar Phil Ringnalda
Browse files

Merge mozilla-central to mozilla-inbound

parents 60872f99 8800027a

.hgtags

+1 −0
Original line number Diff line number Diff line
@@ -80,3 +80,4 @@ bbc7014db2de49e2301680d2a86be8a53108a88a AURORA_BASE_20120131 
bbc7014db2de49e2301680d2a86be8a53108a88a AURORA_BASE_20120131

b6627f28b7ec17e1b46a594df0f780d3a40847e4 FIREFOX_AURORA_13_BASE

357da346ceb705d196a46574804c7c4ec44ac186 FIREFOX_AURORA_14_BASE

26dcd1b1a20893ad99341c61c6b1239ff1523858 FIREFOX_AURORA_15_BASE

b2g/config/mozconfigs/desktop/linux32/nightly

0 → 100644
+40 −0
Original line number Diff line number Diff line 
ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}

ac_add_options --enable-update-packaging

ac_add_options --enable-codesighs

ac_add_options --enable-signmar



# Nightlies only since this has a cost in performance

#ac_add_options --enable-js-diagnostics



. $topsrcdir/build/unix/mozconfig.linux



# Avoid dependency on libstdc++ 4.5

ac_add_options --enable-stdcxx-compat



# This will overwrite the default of stripping everything and keep the symbol table.

# This is useful for profiling and debugging and only increases the package size

# by 2 MBs.

STRIP_FLAGS="--strip-debug"



# PGO

mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'



# 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"



# Use ccache

ac_add_options --with-ccache=/usr/bin/ccache



#B2G options

ac_add_options --enable-application=b2g

ac_add_options --enable-marionette

ac_add_options --disable-elf-hack

export CXXFLAGS=-DMOZ_ENABLE_JS_DUMP

b2g/config/mozconfigs/desktop/linux64/nightly

0 → 100644
+40 −0
Original line number Diff line number Diff line 
ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}

ac_add_options --enable-update-packaging

ac_add_options --enable-codesighs

ac_add_options --enable-signmar



# Nightlies only since this has a cost in performance

ac_add_options --enable-js-diagnostics



. $topsrcdir/build/unix/mozconfig.linux



# Avoid dependency on libstdc++ 4.5

ac_add_options --enable-stdcxx-compat



# This will overwrite the default of stripping everything and keep the symbol table.

# This is useful for profiling and debugging and only increases the package size

# by 2 MBs.

STRIP_FLAGS="--strip-debug"



# PGO

mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'



# 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"



# Use ccache

ac_add_options --with-ccache=/usr/bin/ccache



#B2G options

ac_add_options --enable-application=b2g

ac_add_options --enable-marionette

ac_add_options --disable-elf-hack

export CXXFLAGS=-DMOZ_ENABLE_JS_DUMP

b2g/config/mozconfigs/desktop/macosx64/nightly

0 → 100644
+27 −0
Original line number Diff line number Diff line 
ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}

ac_add_options --enable-update-packaging

ac_add_options --enable-codesighs

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



# B2G Stuff

ac_add_options --enable-application=b2g

ac_add_options --enable-debug-symbols

ac_add_options --with-ccache

ac_add_options --enable-marionette



export CXXFLAGS=-DMOZ_ENABLE_JS_DUMP

b2g/config/mozconfigs/desktop/win32/nightly

0 → 100644
+35 −0
Original line number Diff line number Diff line 
# for pgo

mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py'



ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}

ac_add_options --enable-update-packaging

ac_add_options --enable-jemalloc

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=-j1



if test "$PROCESSOR_ARCHITECTURE" = "AMD64" -o "$PROCESSOR_ARCHITEW6432" = "AMD64"; then

  . $topsrcdir/build/win32/mozconfig.vs2010-win64

else

  . $topsrcdir/build/win32/mozconfig.vs2010

fi



# For known full-clobber builds on Windows (like nightlies/try), 

# this speeds things up. IS_NIGHTLY is set by the build automation.

if test "$IS_NIGHTLY" != ""; then 

  ac_add_options --disable-auto-deps

fi



# B2G Options

ac_add_options --enable-application=b2g

ac_add_options --enable-marionette



export CXXFLAGS=-DMOZ_ENABLE_JS_DUMP