Bug 738612 - Include common mozconfigs so try pushes can modify them easily. r=ted

This commit is contained in:
Steve Fink 2012-08-21 11:37:12 -07:00
parent 42ee86a5dd
commit 4a13236600
39 changed files with 101 additions and 0 deletions

View File

@ -0,0 +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 by all b2g mozconfigs
. "$topsrcdir/build/mozconfig.common"

View File

@ -1,3 +1,5 @@
. "$topsrcdir/b2g/config/mozconfigs/common"
mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-b2g mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-b2g
mk_add_options MOZ_MAKE_FLAGS="-j8" mk_add_options MOZ_MAKE_FLAGS="-j8"

View File

@ -1,3 +1,5 @@
. "$topsrcdir/b2g/config/mozconfigs/common"
mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-b2g mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-b2g
mk_add_options MOZ_MAKE_FLAGS="-j8" mk_add_options MOZ_MAKE_FLAGS="-j8"

View File

@ -1,3 +1,5 @@
. "$topsrcdir/b2g/config/mozconfigs/common"
mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-b2g mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-b2g
mk_add_options MOZ_MAKE_FLAGS="-j8" mk_add_options MOZ_MAKE_FLAGS="-j8"

View File

@ -1,3 +1,5 @@
. "$topsrcdir/b2g/config/mozconfigs/common"
ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL} ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
ac_add_options --enable-update-packaging ac_add_options --enable-update-packaging
ac_add_options --enable-codesighs ac_add_options --enable-codesighs

View File

@ -1,3 +1,5 @@
. "$topsrcdir/b2g/config/mozconfigs/common"
# for pgo # for pgo
mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py' mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py'

View File

@ -0,0 +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 by all browser mozconfigs
. "$topsrcdir/build/mozconfig.common"

View File

@ -1,4 +1,5 @@
. $topsrcdir/build/macosx/mozconfig.leopard . $topsrcdir/build/macosx/mozconfig.leopard
ac_add_options --enable-debug ac_add_options --enable-debug
ac_add_options --enable-trace-malloc ac_add_options --enable-trace-malloc
ac_add_options --enable-signmar ac_add_options --enable-signmar

View File

@ -1,3 +1,5 @@
. "$topsrcdir/browser/config/mozconfigs/common"
ac_add_options --with-l10n-base=../../l10n-central ac_add_options --with-l10n-base=../../l10n-central
ac_add_options --enable-official-branding ac_add_options --enable-official-branding
ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL} ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}

View File

@ -1,3 +1,5 @@
. "$topsrcdir/browser/config/mozconfigs/common"
ac_add_options --enable-debug ac_add_options --enable-debug
ac_add_options --enable-trace-malloc ac_add_options --enable-trace-malloc
ac_add_options --enable-signmar ac_add_options --enable-signmar

View File

@ -1,3 +1,5 @@
. "$topsrcdir/browser/config/mozconfigs/common"
ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL} ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
ac_add_options --enable-update-packaging ac_add_options --enable-update-packaging
ac_add_options --enable-official-branding ac_add_options --enable-official-branding

View File

@ -1,3 +1,5 @@
. "$topsrcdir/browser/config/mozconfigs/common"
# for pgo # for pgo
mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py' mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py'

View File

@ -1,3 +1,5 @@
. "$topsrcdir/browser/config/mozconfigs/common"
# for pgo # for pgo
mk_add_options MOZ_PGO=1 mk_add_options MOZ_PGO=1
mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py' mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py'

View File

@ -1,3 +1,9 @@
# 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/.
. "$topsrcdir/build/mozconfig.common"
if [ -d "$topsrcdir/clang" ]; then if [ -d "$topsrcdir/clang" ]; then
# mozilla-central based build # mozilla-central based build
export CC=$topsrcdir/clang/bin/clang export CC=$topsrcdir/clang/bin/clang

9
build/mozconfig.common Normal file
View File

@ -0,0 +1,9 @@
# 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/.
# Common mozconfig for all users
#
# Add options to this file that will be inherited by all in-tree mozconfigs.
# This is useful for eg try builds with nondefault options that apply to all
# architectures.

View File

@ -1,2 +1,4 @@
. "$topsrcdir/build/mozconfig.common"
CC=/tools/gcc-4.5-0moz3/bin/gcc CC=/tools/gcc-4.5-0moz3/bin/gcc
CXX=/tools/gcc-4.5-0moz3/bin/g++ CXX=/tools/gcc-4.5-0moz3/bin/g++

View File

@ -1,3 +1,5 @@
. "$topsrcdir/mobile/android/config/mozconfigs/common"
# Global options # Global options
mk_add_options MOZ_MAKE_FLAGS=-j4 mk_add_options MOZ_MAKE_FLAGS=-j4
ac_add_options --enable-debug ac_add_options --enable-debug

View File

@ -1,3 +1,5 @@
. "$topsrcdir/mobile/android/config/mozconfigs/common"
# L10n # L10n
ac_add_options --with-l10n-base=../../l10n-central ac_add_options --with-l10n-base=../../l10n-central

View File

@ -1,3 +1,5 @@
. "$topsrcdir/mobile/android/config/mozconfigs/common"
# L10n # L10n
ac_add_options --with-l10n-base=.. ac_add_options --with-l10n-base=..

View File

@ -1,3 +1,5 @@
. "$topsrcdir/mobile/android/config/mozconfigs/common"
# Global options # Global options
mk_add_options MOZ_MAKE_FLAGS="-j4" mk_add_options MOZ_MAKE_FLAGS="-j4"

View File

@ -1,3 +1,5 @@
. "$topsrcdir/mobile/android/config/mozconfigs/common"
# Global options # Global options
mk_add_options MOZ_MAKE_FLAGS="-j4" mk_add_options MOZ_MAKE_FLAGS="-j4"

View File

@ -1,3 +1,5 @@
. "$topsrcdir/mobile/android/config/mozconfigs/common"
# Global options # Global options
mk_add_options MOZ_MAKE_FLAGS=-j4 mk_add_options MOZ_MAKE_FLAGS=-j4
ac_add_options --enable-debug ac_add_options --enable-debug

View File

@ -1,3 +1,5 @@
. "$topsrcdir/mobile/android/config/mozconfigs/common"
# L10n # L10n
ac_add_options --with-l10n-base=../../l10n-central ac_add_options --with-l10n-base=../../l10n-central

View File

@ -1,3 +1,5 @@
. "$topsrcdir/mobile/android/config/mozconfigs/common"
# L10n # L10n
ac_add_options --with-l10n-base=.. ac_add_options --with-l10n-base=..

View File

@ -1,3 +1,5 @@
. "$topsrcdir/mobile/android/config/mozconfigs/common"
# Global options # Global options
mk_add_options MOZ_MAKE_FLAGS="-j4" mk_add_options MOZ_MAKE_FLAGS="-j4"

View File

@ -1,3 +1,5 @@
. "$topsrcdir/mobile/android/config/mozconfigs/common"
# Global options # Global options
mk_add_options MOZ_MAKE_FLAGS="-j4" mk_add_options MOZ_MAKE_FLAGS="-j4"

View File

@ -1,3 +1,5 @@
. "$topsrcdir/mobile/android/config/mozconfigs/common"
# Global options # Global options
mk_add_options MOZ_MAKE_FLAGS=-j4 mk_add_options MOZ_MAKE_FLAGS=-j4
ac_add_options --enable-debug ac_add_options --enable-debug

View File

@ -1,3 +1,5 @@
. "$topsrcdir/mobile/android/config/mozconfigs/common"
# L10n # L10n
ac_add_options --with-l10n-base=../../l10n-central ac_add_options --with-l10n-base=../../l10n-central

View File

@ -1,3 +1,5 @@
. "$topsrcdir/mobile/android/config/mozconfigs/common"
# L10n # L10n
ac_add_options --with-l10n-base=.. ac_add_options --with-l10n-base=..

View File

@ -1,3 +1,5 @@
. "$topsrcdir/mobile/android/config/mozconfigs/common"
# Global options # Global options
mk_add_options MOZ_MAKE_FLAGS="-j4" mk_add_options MOZ_MAKE_FLAGS="-j4"

View File

@ -1,3 +1,5 @@
. "$topsrcdir/mobile/android/config/mozconfigs/common"
# Global options # Global options
mk_add_options MOZ_MAKE_FLAGS="-j4" mk_add_options MOZ_MAKE_FLAGS="-j4"

View File

@ -0,0 +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 by all native android mozconfigs
. "$topsrcdir/build/mozconfig.common"

View File

@ -0,0 +1 @@
. "$topsrcdir/build/mozconfig.common"

View File

@ -1,3 +1,5 @@
. "$topsrcdir/mobile/xul/config/mozconfigs/android/common"
# Global options # Global options
mk_add_options MOZ_MAKE_FLAGS=-j4 mk_add_options MOZ_MAKE_FLAGS=-j4
ac_add_options --enable-debug ac_add_options --enable-debug

View File

@ -1,3 +1,5 @@
. "$topsrcdir/mobile/xul/config/mozconfigs/android/common"
# Global options # Global options
mk_add_options MOZ_MAKE_FLAGS="-j4" mk_add_options MOZ_MAKE_FLAGS="-j4"

View File

@ -1,3 +1,5 @@
. "$topsrcdir/mobile/xul/config/mozconfigs/android/common"
# Global options # Global options
mk_add_options MOZ_MAKE_FLAGS="-j4" mk_add_options MOZ_MAKE_FLAGS="-j4"

View File

@ -0,0 +1 @@
. "$topsrcdir/build/mozconfig.common"

View File

@ -1,3 +1,5 @@
. "$topsrcdir/xulrunner/config/mozconfigs/common"
export MOZILLA_OFFICIAL=1 export MOZILLA_OFFICIAL=1
export JAVA_HOME=/d/jdk1.6.0_14 export JAVA_HOME=/d/jdk1.6.0_14

View File

@ -1,3 +1,5 @@
. "$topsrcdir/xulrunner/config/mozconfigs/common"
ac_add_options --target=x86_64-pc-mingw32 ac_add_options --target=x86_64-pc-mingw32
ac_add_options --host=x86_64-pc-mingw32 ac_add_options --host=x86_64-pc-mingw32