wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 575283 - Remove redundant/invalid options from the now in-tree mozconfigs; r=catlee,ted

Browse Source 
Removes options that are now set by default (eg enable symbols, app=browser) and
those that have since been removed from configure (eg --disable-javaxpcom). Also
removes |--enable-jemalloc| if |--enable-trace-malloc| present, since the latter
force disables jemalloc regardless.
Note: This changeset is effectively no-op. No behaviour change is intended.
This commit is contained in:
Ed Morley 2011-10-14 22:25:01 +01:00
parent d80b23f5b1
commit be43964848
34 changed files with 6 additions and 204 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
browser/config/mozconfigs/linux32/debug
View File

@ -1,9 +1,4 @@
ac_add_options --enable-application=browser
ac_add_options --enable-debug
ac_add_options --enable-libxul
ac_add_options --enable-tests
ac_add_options --enable-trace-malloc
CC=/tools/gcc-4.5/bin/gcc
@ -11,13 +6,6 @@ CXX=/tools/gcc-4.5/bin/g++
# Avoid dependency on libstdc++ 4.5
ac_add_options --enable-stdcxx-compat
export CFLAGS="-gdwarf-2"
export CXXFLAGS="-gdwarf-2"
# For NSS symbols
export MOZ_DEBUG_SYMBOLS=1
ac_add_options --enable-debug-symbols="-gdwarf-2"
# Needed to enable breakpad in application.ini
export MOZILLA_OFFICIAL=1

1
browser/config/mozconfigs/linux32/l10n-mozconfig
View File

@ -1,5 +1,4 @@
ac_add_options --with-l10n-base=../../l10n-central
ac_add_options --enable-application=browser
ac_add_options --enable-official-branding
ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
ac_add_options --enable-update-packaging

11
browser/config/mozconfigs/linux32/nightly
View File

@ -1,9 +1,5 @@
ac_add_options --enable-application=browser
ac_add_options --enable-optimize
ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
ac_add_options --enable-update-packaging
ac_add_options --disable-debug
ac_add_options --enable-tests
ac_add_options --enable-codesighs
# Nightlies only since this has a cost in performance
@ -14,13 +10,6 @@ CXX=/tools/gcc-4.5/bin/g++
# Avoid dependency on libstdc++ 4.5
ac_add_options --enable-stdcxx-compat
export CFLAGS="-gdwarf-2"
export CXXFLAGS="-gdwarf-2"
# For NSS symbols
export MOZ_DEBUG_SYMBOLS=1
ac_add_options --enable-debug-symbols="-gdwarf-2"
# Needed to enable breakpad in application.ini
export MOZILLA_OFFICIAL=1

12
browser/config/mozconfigs/linux32/qt
View File

@ -1,9 +1,4 @@
ac_add_options --enable-application=browser
ac_add_options --enable-optimize
ac_add_options --enable-update-packaging
ac_add_options --disable-debug
ac_add_options --enable-tests
ac_add_options --enable-codesighs
CC=/tools/gcc-4.5/bin/gcc
@ -11,13 +6,6 @@ CXX=/tools/gcc-4.5/bin/g++
# Avoid dependency on libstdc++ 4.5
ac_add_options --enable-stdcxx-compat
export CFLAGS="-gdwarf-2"
export CXXFLAGS="-gdwarf-2"
# For NSS symbols
export MOZ_DEBUG_SYMBOLS=1
ac_add_options --enable-debug-symbols="-gdwarf-2"
# Needed to enable breakpad in application.ini
export MOZILLA_OFFICIAL=1

11
browser/config/mozconfigs/linux32/release
View File

@ -1,9 +1,5 @@
ac_add_options --enable-application=browser
ac_add_options --enable-optimize
ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
ac_add_options --enable-update-packaging
ac_add_options --disable-debug
ac_add_options --enable-tests
ac_add_options --enable-official-branding
CC=/tools/gcc-4.5/bin/gcc
@ -11,13 +7,6 @@ CXX=/tools/gcc-4.5/bin/g++
# Avoid dependency on libstdc++ 4.5
ac_add_options --enable-stdcxx-compat
export CFLAGS="-gdwarf-2"
export CXXFLAGS="-gdwarf-2"
# For NSS symbols
export MOZ_DEBUG_SYMBOLS=1
ac_add_options --enable-debug-symbols="-gdwarf-2"
# PGO
mk_add_options MOZ_PGO=1
mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'

12
browser/config/mozconfigs/linux32/rpm
View File

@ -1,9 +1,4 @@
ac_add_options --enable-application=browser
ac_add_options --enable-optimize
ac_add_options --enable-update-packaging
ac_add_options --disable-debug
ac_add_options --enable-tests
ac_add_options --enable-codesighs
# Options for rpm versions of mozconfigs
@ -19,13 +14,6 @@ CXX=/tools/gcc-4.5/bin/g++
# Avoid dependency on libstdc++ 4.5
ac_add_options --enable-stdcxx-compat
export CFLAGS="-gdwarf-2"
export CXXFLAGS="-gdwarf-2"
# For NSS symbols
export MOZ_DEBUG_SYMBOLS=1
ac_add_options --enable-debug-symbols="-gdwarf-2"
# Needed to enable breakpad in application.ini
export MOZILLA_OFFICIAL=1

11
browser/config/mozconfigs/linux64/debug
View File

@ -1,8 +1,4 @@
ac_add_options --enable-application=browser
ac_add_options --enable-debug
ac_add_options --enable-tests
ac_add_options --enable-trace-malloc
CC=/tools/gcc-4.5/bin/gcc
@ -10,13 +6,6 @@ CXX=/tools/gcc-4.5/bin/g++
# Avoid dependency on libstdc++ 4.5
ac_add_options --enable-stdcxx-compat
#export CFLAGS="-gdwarf-2"
#export CXXFLAGS="-gdwarf-2"
# For NSS symbols
export MOZ_DEBUG_SYMBOLS=1
ac_add_options --enable-debug-symbols="-gdwarf-2"
# Needed to enable breakpad in application.ini
export MOZILLA_OFFICIAL=1

1
browser/config/mozconfigs/linux64/l10n-mozconfig
View File

@ -1,5 +1,4 @@
ac_add_options --with-l10n-base=../../l10n-central
ac_add_options --enable-application=browser
ac_add_options --enable-official-branding
ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
ac_add_options --enable-update-packaging

11
browser/config/mozconfigs/linux64/nightly
View File

@ -1,9 +1,5 @@
ac_add_options --enable-application=browser
ac_add_options --enable-optimize
ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
ac_add_options --enable-update-packaging
ac_add_options --disable-debug
ac_add_options --enable-tests
ac_add_options --enable-codesighs
# Nightlies only since this has a cost in performance
@ -14,13 +10,6 @@ CXX=/tools/gcc-4.5/bin/g++
# Avoid dependency on libstdc++ 4.5
ac_add_options --enable-stdcxx-compat
export CFLAGS="-gdwarf-2"
export CXXFLAGS="-gdwarf-2"
# For NSS symbols
export MOZ_DEBUG_SYMBOLS=1
ac_add_options --enable-debug-symbols="-gdwarf-2"
# Needed to enable breakpad in application.ini
export MOZILLA_OFFICIAL=1

11
browser/config/mozconfigs/linux64/release
View File

@ -1,9 +1,5 @@
ac_add_options --enable-application=browser
ac_add_options --enable-optimize
ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
ac_add_options --enable-update-packaging
ac_add_options --disable-debug
ac_add_options --enable-tests
ac_add_options --enable-official-branding
CC=/tools/gcc-4.5/bin/gcc
@ -11,13 +7,6 @@ CXX=/tools/gcc-4.5/bin/g++
# Avoid dependency on libstdc++ 4.5
ac_add_options --enable-stdcxx-compat
export CFLAGS="-gdwarf-2"
export CXXFLAGS="-gdwarf-2"
# For NSS symbols
export MOZ_DEBUG_SYMBOLS=1
ac_add_options --enable-debug-symbols="-gdwarf-2"
# PGO
mk_add_options MOZ_PGO=1
mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'

12
browser/config/mozconfigs/linux64/rpm
View File

@ -1,9 +1,4 @@
ac_add_options --enable-application=browser
ac_add_options --enable-optimize
ac_add_options --enable-update-packaging
ac_add_options --disable-debug
ac_add_options --enable-tests
ac_add_options --enable-codesighs
# Options for rpm versions of mozconfigs
@ -19,13 +14,6 @@ CXX=/tools/gcc-4.5/bin/g++
# Avoid dependency on libstdc++ 4.5
ac_add_options --enable-stdcxx-compat
export CFLAGS="-gdwarf-2"
export CXXFLAGS="-gdwarf-2"
# For NSS symbols
export MOZ_DEBUG_SYMBOLS=1
ac_add_options --enable-debug-symbols="-gdwarf-2"
# Needed to enable breakpad in application.ini
export MOZILLA_OFFICIAL=1

10
browser/config/mozconfigs/macosx-universal/nightly
View File

@ -1,22 +1,16 @@
. $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-tests
ac_add_options --enable-codesighs
ac_add_options --disable-install-strip
# Nightlies only since this has a cost in performance
ac_add_options --enable-js-diagnostics
export CFLAGS="-gdwarf-2"
export CXXFLAGS="-gdwarf-2"
# For NSS symbols
export MOZ_DEBUG_SYMBOLS=1
ac_add_options --enable-debug-symbols="-gdwarf-2"
# Needed to enable breakpad in application.ini
export MOZILLA_OFFICIAL=1

10
browser/config/mozconfigs/macosx-universal/release
View File

@ -1,18 +1,12 @@
. $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-tests
ac_add_options --enable-official-branding
export CFLAGS="-gdwarf-2"
export CXXFLAGS="-gdwarf-2"
# For NSS symbols
export MOZ_DEBUG_SYMBOLS=1
ac_add_options --enable-debug-symbols="-gdwarf-2"
# Needed to enable breakpad in application.ini
export MOZILLA_OFFICIAL=1

10
browser/config/mozconfigs/macosx-universal/shark
View File

@ -2,17 +2,12 @@
# 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
export CFLAGS="-gdwarf-2"
export CXXFLAGS="-gdwarf-2"
# For NSS symbols
export MOZ_DEBUG_SYMBOLS=1
ac_add_options --enable-debug-symbols="-gdwarf-2"
# Needed to enable breakpad in application.ini
export MOZILLA_OFFICIAL=1
@ -22,7 +17,6 @@ mk_add_options MOZ_MAKE_FLAGS="-j4"
# shark specific options
ac_add_options --enable-shark
ac_add_options --enable-dtrace
ac_add_options --enable-debugger-info-modules
# Need this to prevent name conflicts with the normal nightly build packages
export MOZ_PKG_SPECIAL="shark"

9
browser/config/mozconfigs/macosx32/debug
View File

@ -2,18 +2,9 @@
#. $topsrcdir/build/macosx/universal/mozconfig
ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.5.sdk
ac_add_options --enable-debug
ac_add_options --enable-libxul
ac_add_options --enable-application=browser
ac_add_options --enable-tests
ac_add_options --enable-trace-malloc
# For NSS symbols
export MOZ_DEBUG_SYMBOLS=1
ac_add_options --enable-debug-symbols="-gdwarf-2"
# Enable parallel compiling
mk_add_options MOZ_MAKE_FLAGS="-j4"

8
browser/config/mozconfigs/macosx64/debug
View File

@ -1,15 +1,7 @@
ac_add_options --enable-debug
ac_add_options --enable-libxul
ac_add_options --enable-application=browser
ac_add_options --enable-tests
ac_add_options --enable-trace-malloc
ac_add_options --enable-accessibility
# For NSS symbols
export MOZ_DEBUG_SYMBOLS=1
ac_add_options --enable-debug-symbols="-gdwarf-2"
# Enable parallel compiling
mk_add_options MOZ_MAKE_FLAGS="-j4"

1
browser/config/mozconfigs/macosx64/l10n-mozconfig
View File

@ -1,5 +1,4 @@
ac_add_options --with-l10n-base=../../l10n-central
ac_add_options --enable-application=browser
ac_add_options --enable-official-branding
ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
ac_add_options --enable-update-packaging

7
browser/config/mozconfigs/win32/debug
View File

@ -1,12 +1,5 @@
ac_add_options --enable-application=browser
ac_add_options --enable-jemalloc
ac_add_options --enable-debug
ac_add_options --enable-libxul
ac_add_options --enable-trace-malloc
ac_add_options --enable-tests
# For NSS symbols
export MOZ_DEBUG_SYMBOLS=1
# Needed to enable breakpad in application.ini
export MOZILLA_OFFICIAL=1

1
browser/config/mozconfigs/win32/l10n-mozconfig
View File

@ -1,4 +1,3 @@
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

5
browser/config/mozconfigs/win32/nightly
View File

@ -1,18 +1,13 @@
# for pgo
mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py'
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-jemalloc
ac_add_options --enable-tests
# Nightlies only since this has a cost in performance
ac_add_options --enable-js-diagnostics
# For NSS symbols
export MOZ_DEBUG_SYMBOLS=1
# Needed to enable breakpad in application.ini
export MOZILLA_OFFICIAL=1

5
browser/config/mozconfigs/win32/release
View File

@ -2,16 +2,11 @@
mk_add_options MOZ_PGO=1
mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py'
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-jemalloc
ac_add_options --enable-tests
ac_add_options --enable-official-branding
# For NSS symbols
export MOZ_DEBUG_SYMBOLS=1
# Needed to enable breakpad in application.ini
export MOZILLA_OFFICIAL=1

3
browser/config/mozconfigs/win64/debug
View File

@ -1,10 +1,7 @@
ac_add_options --target=x86_64-pc-mingw32
ac_add_options --host=x86_64-pc-mingw32
ac_add_options --enable-application=browser
ac_add_options --enable-jemalloc
ac_add_options --enable-debug
ac_add_options --enable-libxul
ac_add_options --enable-trace-malloc
# Needed to enable breakpad in application.ini

2
browser/config/mozconfigs/win64/nightly
View File

@ -4,11 +4,9 @@ ac_add_options --host=x86_64-pc-mingw32
# for pgo
mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py'
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-jemalloc
ac_add_options --enable-debug-symbols
# Nightlies only since this has a cost in performance
ac_add_options --enable-js-diagnostics

1
mobile/config/mozconfigs/android/debug
View File

@ -14,7 +14,6 @@ ac_add_options --with-android-tools="/tools/android-sdk-r13/tools"
ac_add_options --with-android-toolchain=/tools/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86
ac_add_options --with-android-platform=/tools/android-ndk-r5c/platforms/android-5/arch-arm
ac_add_options --with-system-zlib
ac_add_options --enable-debug-symbols="-gdwarf-2"
export JAVA_HOME=/tools/jdk6
export MOZILLA_OFFICIAL=1

4
mobile/config/mozconfigs/android/nightly
View File

@ -1,7 +1,5 @@
# Global options
mk_add_options MOZ_MAKE_FLAGS=-j4
ac_add_options --disable-debug
ac_add_options --enable-optimize
# Nightlies only since this has a cost in performance
ac_add_options --enable-js-diagnostics
@ -18,9 +16,7 @@ ac_add_options --with-android-tools="/tools/android-sdk-r13/tools"
ac_add_options --with-android-toolchain=/tools/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86
ac_add_options --with-android-platform=/tools/android-ndk-r5c/platforms/android-5/arch-arm
ac_add_options --with-system-zlib
ac_add_options --enable-updater
ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
ac_add_options --enable-debug-symbols="-gdwarf-2"
export JAVA_HOME=/tools/jdk6
export MOZILLA_OFFICIAL=1

2
mobile/config/mozconfigs/linux-desktop/nightly
View File

@ -1,5 +1,4 @@
mk_add_options MOZ_PKG_FORMAT=BZ2
ac_add_options --disable-javaxpcom
ac_add_options --enable-application=mobile
# Nightlies only since this has a cost in performance
@ -10,5 +9,4 @@ CXX=/tools/gcc-4.5/bin/g++
# Avoid dependency on libstdc++ 4.5
ac_add_options --enable-stdcxx-compat
ac_add_options --enable-debug-symbols="-gdwarf-2"
export MOZILLA_OFFICIAL=1

2
mobile/config/mozconfigs/macosx-desktop/nightly
View File

@ -8,10 +8,8 @@ ac_cv_visibility_pragma=no
ac_add_options --disable-install-strip
ac_add_options --disable-installer
ac_add_options --enable-application=mobile
ac_add_options --enable-ipc
# Nightlies only since this has a cost in performance
ac_add_options --enable-js-diagnostics
ac_add_options --enable-debug-symbols="-gdwarf-2"
export MOZILLA_OFFICIAL=1

4
mobile/config/mozconfigs/win32-desktop/nightly
View File

@ -3,15 +3,11 @@ mk_add_options MOZ_PKG_FORMAT=ZIP
export WIN32_REDIST_DIR=/d/msvs8/VC/redist/x86/Microsoft.VC80.CRT
ac_add_options --enable-tests
ac_add_options --enable-jemalloc
ac_add_options --disable-javaxpcom
ac_add_options --enable-application=mobile
ac_add_options --enable-ipc
ac_add_options --disable-webm
# Nightlies only since this has a cost in performance
ac_add_options --enable-js-diagnostics
ac_add_options --enable-debug-symbols
export MOZILLA_OFFICIAL=1

4
xulrunner/config/mozconfigs/linux32/xulrunner
View File

@ -1,10 +1,6 @@
export MOZILLA_OFFICIAL=1
export JAVA_HOME=/tools/jdk
# For NSS symbols
export MOZ_DEBUG_SYMBOLS=1
ac_add_options --enable-debug-symbols="-gdwarf-2"
ac_add_options --enable-application=xulrunner
ac_add_options --disable-tests

5
xulrunner/config/mozconfigs/linux32/xulrunner-qt
View File

@ -1,10 +1,6 @@
export MOZILLA_OFFICIAL=1
export JAVA_HOME=/tools/jdk
# For NSS symbols
export MOZ_DEBUG_SYMBOLS=1
ac_add_options --enable-debug-symbols="-gdwarf-2"
ac_add_options --enable-application=xulrunner
ac_add_options --disable-tests
@ -24,4 +20,3 @@ export PKG_CONFIG_PATH=/tools/qt-4.6.3/qt/lib/pkgconfig
ac_add_options --with-qtdir=/tools/qt-4.6.3/qt
ac_add_options --enable-default-toolkit=cairo-qt
ac_add_options --disable-crashreporter

4
xulrunner/config/mozconfigs/linux64/xulrunner
View File

@ -1,10 +1,6 @@
export MOZILLA_OFFICIAL=1
export JAVA_HOME=/tools/jdk
# For NSS symbols
export MOZ_DEBUG_SYMBOLS=1
ac_add_options --enable-debug-symbols="-gdwarf-2"
ac_add_options --enable-application=xulrunner
ac_add_options --disable-tests

4
xulrunner/config/mozconfigs/macosx-universal/xulrunner
View File

@ -2,10 +2,6 @@
export MOZILLA_OFFICIAL=1
# For NSS symbols
export MOZ_DEBUG_SYMBOLS=1
ac_add_options --enable-debug-symbols="-gdwarf-2"
ac_add_options --enable-application=xulrunner
ac_add_options --disable-tests

3
xulrunner/config/mozconfigs/win32/xulrunner
View File

@ -1,9 +1,6 @@
export MOZILLA_OFFICIAL=1
export JAVA_HOME=/d/jdk1.6.0_14
# For NSS symbols
export MOZ_DEBUG_SYMBOLS=1
ac_add_options --enable-application=xulrunner
ac_add_options --enable-jemalloc
ac_add_options --disable-installer

1
xulrunner/config/mozconfigs/win64/xulrunner
View File

@ -8,6 +8,5 @@ ac_add_options --enable-application=xulrunner
ac_add_options --enable-jemalloc
ac_add_options --disable-installer
ac_add_options --disable-tests
ac_add_options --enable-debug-symbols
mk_add_options MOZ_MAKE_FLAGS=-j1