--- a/mozilla/config.py
+++ b/mozilla/config.py
@@ -14,17 +14,16 @@ from master_common import setMainFirefox
GLOBAL_VARS = {
# It's a little unfortunate to have both of these but some things (HgPoller)
# require an URL while other things (BuildSteps) require only the host.
# Since they're both right here it shouldn't be
# a problem to keep them in sync.
'hgurl': 'https://hg.mozilla.org/',
'hghost': 'hg.mozilla.org',
- 'config_subdir': 'mozilla2',
'objdir': 'obj-firefox',
'objdir_unittests': 'objdir',
'stage_username': 'ffxbld',
'stage_username_xulrunner': 'xrbld',
'stage_base_path': '/home/ftp/pub',
'stage_group': None,
'stage_ssh_key': 'ffxbld_rsa',
'stage_ssh_xulrunner_key': 'xrbld_dsa',deleted file mode 100644
--- a/mozilla2/android-debug/generic/nightly/mozconfig
+++ /dev/null
@@ -1,21 +0,0 @@
-# Global options
-mk_add_options MOZ_MAKE_FLAGS=-j4
-ac_add_options --enable-debug
-ac_add_options --disable-optimize
-
-# Build Fennec
-ac_add_options --enable-application=mobile/android
-
-# Android
-ac_add_options --target=arm-linux-androideabi
-ac_add_options --with-android-ndk="/tools/android-ndk-r5c"
-ac_add_options --with-android-sdk="/tools/android-sdk-r15/platforms/android-14"
-ac_add_options --with-android-tools="/tools/android-sdk-r15/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 MOZILLA_OFFICIAL=1
-
-ac_add_options --with-branding=mobile/android/branding/nightly
deleted file mode 100644
--- a/mozilla2/android-debug/mozilla-aurora/nightly/mozconfig
+++ /dev/null
@@ -1,21 +0,0 @@
-# Global options
-mk_add_options MOZ_MAKE_FLAGS=-j4
-ac_add_options --enable-debug
-ac_add_options --disable-optimize
-
-# Build Fennec
-ac_add_options --enable-application=mobile/android
-
-# Android
-ac_add_options --target=arm-linux-androideabi
-ac_add_options --with-android-ndk="/tools/android-ndk-r5c"
-ac_add_options --with-android-sdk="/tools/android-sdk-r15/platforms/android-14"
-ac_add_options --with-android-tools="/tools/android-sdk-r15/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 MOZILLA_OFFICIAL=1
-
-ac_add_options --with-branding=mobile/android/branding/aurora
deleted file mode 100644
--- a/mozilla2/android-debug/mozilla-beta/nightly/mozconfig
+++ /dev/null
@@ -1,21 +0,0 @@
-# Global options
-mk_add_options MOZ_MAKE_FLAGS=-j4
-ac_add_options --enable-debug
-ac_add_options --disable-optimize
-
-# Build Fennec
-ac_add_options --enable-application=mobile/android
-
-# Android
-ac_add_options --target=arm-linux-androideabi
-ac_add_options --with-android-ndk="/tools/android-ndk-r5c"
-ac_add_options --with-android-sdk="/tools/android-sdk-r15/platforms/android-14"
-ac_add_options --with-android-tools="/tools/android-sdk-r15/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 MOZILLA_OFFICIAL=1
-
-ac_add_options --with-branding=mobile/android/branding/beta
deleted file mode 100644
--- a/mozilla2/android-debug/mozilla-central/nightly/mozconfig
+++ /dev/null
@@ -1,21 +0,0 @@
-# Global options
-mk_add_options MOZ_MAKE_FLAGS=-j4
-ac_add_options --enable-debug
-ac_add_options --disable-optimize
-
-# Build Fennec
-ac_add_options --enable-application=mobile/android
-
-# Android
-ac_add_options --target=arm-linux-androideabi
-ac_add_options --with-android-ndk="/tools/android-ndk-r5c"
-ac_add_options --with-android-sdk="/tools/android-sdk-r15/platforms/android-14"
-ac_add_options --with-android-tools="/tools/android-sdk-r15/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 MOZILLA_OFFICIAL=1
-
-ac_add_options --with-branding=mobile/android/branding/nightly
deleted file mode 100644
--- a/mozilla2/android-debug/try/nightly/mozconfig
+++ /dev/null
@@ -1,28 +0,0 @@
-# Global options
-mk_add_options MOZ_MAKE_FLAGS=-j4
-ac_add_options --enable-debug
-ac_add_options --disable-optimize
-
-# Build Fennec
-ac_add_options --enable-application=mobile/android
-
-# Android
-ac_add_options --target=arm-linux-androideabi
-ac_add_options --with-android-ndk="/tools/android-ndk-r5c"
-ac_add_options --with-android-sdk="/tools/android-sdk-r15/platforms/android-14"
-ac_add_options --with-android-tools="/tools/android-sdk-r15/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 MOZILLA_OFFICIAL=1
-
-ac_add_options --with-branding=mobile/android/branding/nightly
-
-if [ -f $topsrcdir/mozconfig-extra ] ; then
- . $topsrcdir/mozconfig-extra
-fi
-if [ -f $topsrcdir/mozconfig-extra-android-debug ] ; then
- . $topsrcdir/mozconfig-extra-android-debug
-fi
deleted file mode 100644
--- a/mozilla2/android-debug/ux/nightly/mozconfig
+++ /dev/null
@@ -1,21 +0,0 @@
-# Global options
-mk_add_options MOZ_MAKE_FLAGS=-j4
-ac_add_options --enable-debug
-ac_add_options --disable-optimize
-
-# Build Fennec
-ac_add_options --enable-application=mobile/android
-
-# Android
-ac_add_options --target=arm-linux-androideabi
-ac_add_options --with-android-ndk="/tools/android-ndk-r5c"
-ac_add_options --with-android-sdk="/tools/android-sdk-r15/platforms/android-14"
-ac_add_options --with-android-tools="/tools/android-sdk-r15/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 MOZILLA_OFFICIAL=1
-
-ac_add_options --with-branding=mobile/android/branding/nightly
deleted file mode 100644
--- a/mozilla2/android/generic/nightly/mozconfig
+++ /dev/null
@@ -1,22 +0,0 @@
-# Global options
-mk_add_options MOZ_MAKE_FLAGS=-j4
-ac_add_options --disable-debug
-ac_add_options --enable-optimize
-
-# Build Fennec
-ac_add_options --enable-application=mobile/android
-
-# Android
-ac_add_options --target=arm-linux-androideabi
-ac_add_options --with-android-ndk="/tools/android-ndk-r5c"
-ac_add_options --with-android-sdk="/tools/android-sdk-r15/platforms/android-14"
-ac_add_options --with-android-tools="/tools/android-sdk-r15/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-debug-symbols="-gdwarf-2"
-
-export MOZILLA_OFFICIAL=1
-
-ac_add_options --with-branding=mobile/android/branding/nightly
deleted file mode 100644
--- a/mozilla2/android/mozilla-aurora/nightly/l10n-mozconfig
+++ /dev/null
@@ -1,27 +0,0 @@
-# L10n
-ac_add_options --with-l10n-base=..
-
-# Global options
-mk_add_options MOZ_MAKE_FLAGS=-j4
-ac_add_options --disable-debug
-ac_add_options --enable-optimize
-ac_add_options --disable-tests
-
-# Build Fennec
-ac_add_options --enable-application=mobile/android
-
-# Android
-ac_add_options --target=arm-linux-androideabi
-ac_add_options --with-android-ndk="/tools/android-ndk-r5c"
-ac_add_options --with-android-sdk="/tools/android-sdk-r15/platforms/android-14"
-ac_add_options --with-android-tools="/tools/android-sdk-r15/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=aurora
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-export MOZILLA_OFFICIAL=1
-
-ac_add_options --with-branding=mobile/android/branding/aurora
deleted file mode 100644
--- a/mozilla2/android/mozilla-aurora/nightly/mozconfig
+++ /dev/null
@@ -1,23 +0,0 @@
-# Global options
-mk_add_options MOZ_MAKE_FLAGS=-j4
-ac_add_options --disable-debug
-ac_add_options --enable-optimize
-
-# Build Fennec
-ac_add_options --enable-application=mobile/android
-
-# Android
-ac_add_options --target=arm-linux-androideabi
-ac_add_options --with-android-ndk="/tools/android-ndk-r5c"
-ac_add_options --with-android-sdk="/tools/android-sdk-r15/platforms/android-14"
-ac_add_options --with-android-tools="/tools/android-sdk-r15/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=aurora
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-export MOZILLA_OFFICIAL=1
-
-ac_add_options --with-branding=mobile/android/branding/aurora
deleted file mode 100644
--- a/mozilla2/android/mozilla-beta/nightly/l10n-mozconfig
+++ /dev/null
@@ -1,27 +0,0 @@
-# L10n
-ac_add_options --with-l10n-base=..
-
-# Global options
-mk_add_options MOZ_MAKE_FLAGS=-j4
-ac_add_options --disable-debug
-ac_add_options --enable-optimize
-ac_add_options --disable-tests
-
-# Build Fennec
-ac_add_options --enable-application=mobile/android
-
-# Android
-ac_add_options --target=arm-linux-androideabi
-ac_add_options --with-android-ndk="/tools/android-ndk-r5c"
-ac_add_options --with-android-sdk="/tools/android-sdk-r15/platforms/android-14"
-ac_add_options --with-android-tools="/tools/android-sdk-r15/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=nightly
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-export MOZILLA_OFFICIAL=1
-
-ac_add_options --with-branding=mobile/android/branding/beta
deleted file mode 100644
--- a/mozilla2/android/mozilla-beta/nightly/mozconfig
+++ /dev/null
@@ -1,23 +0,0 @@
-# Global options
-mk_add_options MOZ_MAKE_FLAGS=-j4
-ac_add_options --disable-debug
-ac_add_options --enable-optimize
-
-# Build Fennec
-ac_add_options --enable-application=mobile/android
-
-# Android
-ac_add_options --target=arm-linux-androideabi
-ac_add_options --with-android-ndk="/tools/android-ndk-r5c"
-ac_add_options --with-android-sdk="/tools/android-sdk-r15/platforms/android-14"
-ac_add_options --with-android-tools="/tools/android-sdk-r15/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=nightly
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-export MOZILLA_OFFICIAL=1
-
-ac_add_options --with-branding=mobile/android/branding/beta
deleted file mode 100644
--- a/mozilla2/android/mozilla-beta/release/l10n-mozconfig
+++ /dev/null
@@ -1,27 +0,0 @@
-# L10n
-ac_add_options --with-l10n-base=..
-
-# Global options
-ac_add_options --disable-debug
-ac_add_options --enable-optimize
-ac_add_options --disable-tests
-
-# Build Fennec
-ac_add_options --enable-application=mobile/android
-
-# Android
-ac_add_options --target=arm-linux-androideabi
-ac_add_options --with-android-ndk="/tools/android-ndk-r5c"
-ac_add_options --with-android-sdk="/tools/android-sdk-r15/platforms/android-14"
-ac_add_options --with-android-tools="/tools/android-sdk-r15/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=beta
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-export MOZILLA_OFFICIAL=1
-
-ac_add_options --enable-official-branding
-ac_add_options --with-branding=mobile/android/branding/beta
deleted file mode 100644
--- a/mozilla2/android/mozilla-beta/release/mozconfig
+++ /dev/null
@@ -1,24 +0,0 @@
-# Global options
-ac_add_options --disable-debug
-ac_add_options --enable-optimize
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-
-# Build Fennec
-ac_add_options --enable-application=mobile/android
-
-# Android
-ac_add_options --target=arm-linux-androideabi
-ac_add_options --with-android-ndk="/tools/android-ndk-r5c"
-ac_add_options --with-android-sdk="/tools/android-sdk-r15/platforms/android-14"
-ac_add_options --with-android-tools="/tools/android-sdk-r15/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=beta
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-export MOZILLA_OFFICIAL=1
-
-ac_add_options --enable-official-branding
-ac_add_options --with-branding=mobile/android/branding/beta
deleted file mode 100644
--- a/mozilla2/android/mozilla-central/nightly/l10n-mozconfig
+++ /dev/null
@@ -1,30 +0,0 @@
-# L10n
-ac_add_options --with-l10n-base=../../l10n-central
-
-# Global options
-mk_add_options MOZ_MAKE_FLAGS=-j4
-ac_add_options --disable-debug
-ac_add_options --enable-optimize
-ac_add_options --disable-tests
-
-# Mozilla-Central nightlies only since this has a cost in performance
-ac_add_options --enable-js-diagnostics
-
-# Build Fennec
-ac_add_options --enable-application=mobile/android
-
-# Android
-ac_add_options --target=arm-linux-androideabi
-ac_add_options --with-android-ndk="/tools/android-ndk-r5c"
-ac_add_options --with-android-sdk="/tools/android-sdk-r15/platforms/android-14"
-ac_add_options --with-android-tools="/tools/android-sdk-r15/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=nightly
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-export MOZILLA_OFFICIAL=1
-
-ac_add_options --with-branding=mobile/android/branding/nightly
deleted file mode 100644
--- a/mozilla2/android/mozilla-central/nightly/mozconfig
+++ /dev/null
@@ -1,26 +0,0 @@
-# Global options
-mk_add_options MOZ_MAKE_FLAGS=-j4
-ac_add_options --disable-debug
-ac_add_options --enable-optimize
-
-# Mozilla-Central nightlies only since this has a cost in performance
-ac_add_options --enable-js-diagnostics
-
-# Build Fennec
-ac_add_options --enable-application=mobile/android
-
-# Android
-ac_add_options --target=arm-linux-androideabi
-ac_add_options --with-android-ndk="/tools/android-ndk-r5c"
-ac_add_options --with-android-sdk="/tools/android-sdk-r15/platforms/android-14"
-ac_add_options --with-android-tools="/tools/android-sdk-r15/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=nightly
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-export MOZILLA_OFFICIAL=1
-
-ac_add_options --with-branding=mobile/android/branding/nightly
deleted file mode 100644
--- a/mozilla2/android/mozilla-release/release/l10n-mozconfig
+++ /dev/null
@@ -1,27 +0,0 @@
-# L10n
-ac_add_options --with-l10n-base=..
-
-# Global options
-ac_add_options --disable-debug
-ac_add_options --enable-optimize
-ac_add_options --disable-tests
-
-# Build Fennec
-ac_add_options --enable-application=mobile/android
-
-# Android
-ac_add_options --target=arm-linux-androideabi
-ac_add_options --with-android-ndk="/tools/android-ndk-r5c"
-ac_add_options --with-android-sdk="/tools/android-sdk-r15/platforms/android-14"
-ac_add_options --with-android-tools="/tools/android-sdk-r15/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=release
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-export MOZILLA_OFFICIAL=1
-
-ac_add_options --enable-official-branding
-ac_add_options --with-branding=mobile/android/branding/official
deleted file mode 100644
--- a/mozilla2/android/try/nightly/mozconfig
+++ /dev/null
@@ -1,29 +0,0 @@
-# Global options
-mk_add_options MOZ_MAKE_FLAGS=-j4
-ac_add_options --disable-debug
-ac_add_options --enable-optimize
-
-# Build Fennec
-ac_add_options --enable-application=mobile/android
-
-# Android
-ac_add_options --target=arm-linux-androideabi
-ac_add_options --with-android-ndk="/tools/android-ndk-r5c"
-ac_add_options --with-android-sdk="/tools/android-sdk-r15/platforms/android-14"
-ac_add_options --with-android-tools="/tools/android-sdk-r15/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-debug-symbols="-gdwarf-2"
-
-export MOZILLA_OFFICIAL=1
-
-ac_add_options --with-branding=mobile/android/branding/nightly
-
-if [ -f $topsrcdir/mozconfig-extra ] ; then
- . $topsrcdir/mozconfig-extra
-fi
-if [ -f $topsrcdir/mozconfig-extra-android ] ; then
- . $topsrcdir/mozconfig-extra-android
-fi
deleted file mode 100644
--- a/mozilla2/android/ux/nightly/mozconfig
+++ /dev/null
@@ -1,22 +0,0 @@
-# Global options
-mk_add_options MOZ_MAKE_FLAGS=-j4
-ac_add_options --disable-debug
-ac_add_options --enable-optimize
-
-# Build Fennec
-ac_add_options --enable-application=mobile/android
-
-# Android
-ac_add_options --target=arm-linux-androideabi
-ac_add_options --with-android-ndk="/tools/android-ndk-r5c"
-ac_add_options --with-android-sdk="/tools/android-sdk-r15/platforms/android-14"
-ac_add_options --with-android-tools="/tools/android-sdk-r15/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-debug-symbols="-gdwarf-2"
-
-export MOZILLA_OFFICIAL=1
-
-ac_add_options --with-branding=mobile/android/branding/nightly
deleted file mode 100644
--- a/mozilla2/linux/comm-beta/release/l10n-mozconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-ac_add_options --with-l10n-base=`pwd`/../../mozilla-beta
-ac_add_options --enable-application=mail
-ac_add_options --enable-official-branding
-ac_add_options --enable-update-channel=beta
-ac_add_options --enable-update-packaging
-ac_add_options --enable-stdcxx-compat
-ac_add_options --enable-calendar
-
-CC=/tools/gcc-4.5-0moz3/bin/gcc
-CXX=/tools/gcc-4.5-0moz3/bin/g++
-
-# Run client.py
-mk_add_options CLIENT_PY_ARGS="--hg-options='--time' --skip-chatzilla --skip-comm --skip-inspector --skip-venkman --tinderbox-print --comm-rev=${COMM_REV} --mozilla-rev=${MOZILLA_REV}"
-mk_add_options ALWAYS_RUN_CLIENT_PY=1
-deleted file mode 100644
--- a/mozilla2/linux/comm-beta/release/mozconfig
+++ /dev/null
@@ -1,33 +0,0 @@
-ac_add_options --enable-application=mail
-ac_add_options --enable-optimize
-ac_add_options --enable-update-channel=beta
-ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-ac_add_options --enable-official-branding
-ac_add_options --enable-calendar
-
-CC="/tools/gcc-4.7.2-0moz1/bin/gcc"
-CXX="/tools/gcc-4.7.2-0moz1/bin/g++"
-
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-
-if test `uname -m` = "x86_64"; then
- # -march=pentiumpro is what our 32-bit native toolchain defaults to
- CC="$CC -m32 -march=pentiumpro"
- CXX="$CXX -m32 -march=pentiumpro"
- ac_add_options --target=i686-pc-linux
- ac_add_options --x-libraries=/usr/lib
- export PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig:/usr/share/pkgconfig
-fi
-
-# Run client.py
-mk_add_options CLIENT_PY_ARGS="--hg-options='--verbose --time' --hgtool=../tools/buildfarm/utils/hgtool.py --skip-chatzilla --skip-comm --skip-inspector --skip-venkman --tinderbox-print --comm-rev=${COMM_REV} --mozilla-rev=${MOZILLA_REV}"
-mk_add_options ALWAYS_RUN_CLIENT_PY=1deleted file mode 100644
--- a/mozilla2/linux/comm-esr10/release/l10n-mozconfig
+++ /dev/null
@@ -1,14 +0,0 @@
-ac_add_options --with-l10n-base=`pwd`/../../mozilla-release
-ac_add_options --enable-application=mail
-ac_add_options --enable-official-branding
-ac_add_options --enable-update-channel=esr
-ac_add_options --enable-update-packaging
-ac_add_options --enable-stdcxx-compat
-
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-
-# Run client.py
-mk_add_options CLIENT_PY_ARGS="--hg-options='--time' --skip-chatzilla --skip-comm --skip-inspector --skip-venkman --tinderbox-print --comm-rev=${COMM_REV} --mozilla-rev=${MOZILLA_REV}"
-mk_add_options ALWAYS_RUN_CLIENT_PY=1
-deleted file mode 100644
--- a/mozilla2/linux/comm-esr10/release/mozconfig
+++ /dev/null
@@ -1,31 +0,0 @@
-ac_add_options --enable-application=mail
-ac_add_options --enable-optimize
-ac_add_options --enable-update-channel=esr
-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
-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"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-# Enable parallel compiling
-CONCURRENCY=$(( `grep processor /proc/cpuinfo | wc -l` + 2 ))
-mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"
-
-# Run client.py
-# don't use hgtool here, as the source tarball builders don't clone the scripts repo.
-mk_add_options CLIENT_PY_ARGS="--hg-options='--time' --hgtool=../tools/buildfarm/utils/hgtool.py --skip-chatzilla --skip-comm --skip-inspector --skip-venkman --tinderbox-print --comm-rev=${COMM_REV} --mozilla-rev=${MOZILLA_REV}"
-mk_add_options ALWAYS_RUN_CLIENT_PY=1deleted file mode 100644
--- a/mozilla2/linux/comm-esr31/release/mozconfig
+++ /dev/null
@@ -1,33 +0,0 @@
-ac_add_options --enable-application=mail
-ac_add_options --enable-optimize
-ac_add_options --enable-update-channel=release
-ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-ac_add_options --enable-official-branding
-ac_add_options --enable-calendar
-
-CC="/tools/gcc-4.7.2-0moz1/bin/gcc"
-CXX="/tools/gcc-4.7.2-0moz1/bin/g++"
-
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-
-if test `uname -m` = "x86_64"; then
- # -march=pentiumpro is what our 32-bit native toolchain defaults to
- CC="$CC -m32 -march=pentiumpro"
- CXX="$CXX -m32 -march=pentiumpro"
- ac_add_options --target=i686-pc-linux
- ac_add_options --x-libraries=/usr/lib
- export PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig:/usr/share/pkgconfig
-fi
-
-# Run client.py
-mk_add_options CLIENT_PY_ARGS="--hg-options='--verbose --time' --hgtool=../tools/buildfarm/utils/hgtool.py --skip-chatzilla --skip-comm --skip-inspector --skip-venkman --tinderbox-print --comm-rev=${COMM_REV} --mozilla-rev=${MOZILLA_REV}"
-mk_add_options ALWAYS_RUN_CLIENT_PY=1deleted file mode 100644
--- a/mozilla2/linux/comm-release/release/l10n-mozconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-ac_add_options --with-l10n-base=`pwd`/../../mozilla-release
-ac_add_options --enable-application=mail
-ac_add_options --enable-official-branding
-ac_add_options --enable-update-channel=release
-ac_add_options --enable-update-packaging
-ac_add_options --enable-stdcxx-compat
-ac_add_options --enable-calendar
-
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-
-# Run client.py
-mk_add_options CLIENT_PY_ARGS="--hg-options='--time' --skip-chatzilla --skip-comm --skip-inspector --skip-venkman --tinderbox-print --comm-rev=${COMM_REV} --mozilla-rev=${MOZILLA_REV}"
-mk_add_options ALWAYS_RUN_CLIENT_PY=1
-deleted file mode 100644
--- a/mozilla2/linux/comm-release/release/mozconfig
+++ /dev/null
@@ -1,28 +0,0 @@
-ac_add_options --enable-application=mail
-ac_add_options --enable-optimize
-ac_add_options --enable-update-channel=release
-ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-ac_add_options --enable-official-branding
-ac_add_options --enable-calendar
-
-. $topsrcdir/build/unix/mozconfig.linux
-
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-
-# Enable parallel compiling
-CONCURRENCY=$(( `grep processor /proc/cpuinfo | wc -l` + 2 ))
-mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"
-
-# Run client.py
-# don't use hgtool here, as the source tarball builders don't clone the scripts repo.
-mk_add_options CLIENT_PY_ARGS="--hg-options='--time' --hgtool=../tools/buildfarm/utils/hgtool.py --skip-chatzilla --skip-comm --skip-inspector --skip-venkman --tinderbox-print --comm-rev=${COMM_REV} --mozilla-rev=${MOZILLA_REV}"
-mk_add_options ALWAYS_RUN_CLIENT_PY=1deleted file mode 100644
--- a/mozilla2/linux/generic/debug/mozconfig
+++ /dev/null
@@ -1,36 +0,0 @@
-ac_add_options --enable-application=browser
-
-ac_add_options --disable-optimize
-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
-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
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-
-if [ -f $topsrcdir/mozconfig-extra ] ; then
- . $topsrcdir/mozconfig-extra
-fi
-if [ -f $topsrcdir/mozconfig-extra-linux ] ; then
- . $topsrcdir/mozconfig-extra-linux
-fi
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
deleted file mode 100644
--- a/mozilla2/linux/generic/nightly/mozconfig
+++ /dev/null
@@ -1,36 +0,0 @@
-ac_add_options --enable-application=browser
-ac_add_options --enable-optimize
-ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-
-CC=/tools/gcc-4.5/bin/gcc
-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
-
-# PGO
-mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-if [ -f $topsrcdir/mozconfig-extra ] ; then
- . $topsrcdir/mozconfig-extra
-fi
-if [ -f $topsrcdir/mozconfig-extra-linux ] ; then
- . $topsrcdir/mozconfig-extra-linux
-fi
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
deleted file mode 100644
--- a/mozilla2/linux/generic/qt/mozconfig
+++ /dev/null
@@ -1,36 +0,0 @@
-ac_add_options --enable-application=browser
-ac_add_options --enable-optimize
-#ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-
-CC=/tools/gcc-4.5/bin/gcc
-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
-
-# PGO
-mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
-
-# QT Options
-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
deleted file mode 100644
--- a/mozilla2/linux/mozilla-aurora/codecoverage/mozconfig
+++ /dev/null
@@ -1,19 +0,0 @@
-export CFLAGS="-fprofile-arcs -ftest-coverage"
-export CXXFLAGS="-fprofile-arcs -ftest-coverage"
-export LDFLAGS="-lgcov -static-libgcc"
-export EXTRA_DSO_LDFLAGS="-lgcov -static-libgcc"
-
-# Don't use ccache here
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
-ac_add_options --enable-application=browser
-
-ac_add_options --enable-debug
-ac_add_options --enable-tests
-ac_add_options --disable-optimize
-ac_add_options --enable-chrome-format=flat
-
-mk_add_options MOZ_MAKE_FLAGS="-j3"
deleted file mode 100644
--- a/mozilla2/linux/mozilla-aurora/debug/mozconfig
+++ /dev/null
@@ -1,29 +0,0 @@
-ac_add_options --enable-application=browser
-
-ac_add_options --disable-optimize
-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
-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
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
deleted file mode 100644
--- a/mozilla2/linux/mozilla-aurora/nightly-rpm/mozconfig
+++ /dev/null
@@ -1,40 +0,0 @@
-ac_add_options --enable-application=browser
-ac_add_options --enable-optimize
-ac_add_options --enable-update-channel=aurora
-ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-
-# Options for rpm versions of mozconfigs
-PREFIX=/usr
-LIBDIR=${PREFIX}/lib
-ac_add_options --with-app-name=mozilla-aurora
-ac_add_options --disable-updater
-ac_add_options --prefix=$PREFIX
-ac_add_options --libdir=$LIBDIR
-
-CC=/tools/gcc-4.5/bin/gcc
-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
-
-export MOZ_TELEMETRY_REPORTING=1
-
-# PGO
-mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccachedeleted file mode 100644
--- a/mozilla2/linux/mozilla-aurora/nightly/mozconfig
+++ /dev/null
@@ -1,32 +0,0 @@
-ac_add_options --enable-application=browser
-ac_add_options --enable-optimize
-ac_add_options --enable-update-channel=aurora
-ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-
-CC=/tools/gcc-4.5/bin/gcc
-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
-
-export MOZ_TELEMETRY_REPORTING=1
-
-# PGO
-mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
deleted file mode 100644
--- a/mozilla2/linux/mozilla-aurora/qt/mozconfig
+++ /dev/null
@@ -1,36 +0,0 @@
-ac_add_options --enable-application=browser
-ac_add_options --enable-optimize
-#ac_add_options --enable-update-channel=aurora
-ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-
-CC=/tools/gcc-4.5/bin/gcc
-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
-
-# PGO
-mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
-
-# QT Options
-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
deleted file mode 100644
--- a/mozilla2/linux/mozilla-aurora/release/l10n-mozconfig
+++ /dev/null
@@ -1,8 +0,0 @@
-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=beta
-ac_add_options --enable-update-packaging
-
-CC=/tools/gcc-4.3.3/installed/bin/gcc
-CXX=/tools/gcc-4.3.3/installed/bin/g++
deleted file mode 100644
--- a/mozilla2/linux/mozilla-aurora/release/mozconfig
+++ /dev/null
@@ -1,26 +0,0 @@
-ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-update-packaging
-ac_add_options --enable-official-branding
-
-. $topsrcdir/build/unix/mozconfig.linux
-
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
-# PGO
-mk_add_options MOZ_PGO=1
-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"
-
-# Package js shell.
-export MOZ_PACKAGE_JSSHELL=1deleted file mode 100644
--- a/mozilla2/linux/mozilla-aurora/xulrunner-qt/mozconfig
+++ /dev/null
@@ -1,26 +0,0 @@
-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
-
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
-
-# QT Options
-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
-
deleted file mode 100644
--- a/mozilla2/linux/mozilla-aurora/xulrunner/mozconfig
+++ /dev/null
@@ -1,19 +0,0 @@
-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
-
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
deleted file mode 100644
--- a/mozilla2/linux/mozilla-beta/codecoverage/mozconfig
+++ /dev/null
@@ -1,19 +0,0 @@
-export CFLAGS="-fprofile-arcs -ftest-coverage"
-export CXXFLAGS="-fprofile-arcs -ftest-coverage"
-export LDFLAGS="-lgcov -static-libgcc"
-export EXTRA_DSO_LDFLAGS="-lgcov -static-libgcc"
-
-# Don't use ccache here
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
-ac_add_options --enable-application=browser
-
-ac_add_options --enable-debug
-ac_add_options --enable-tests
-ac_add_options --disable-optimize
-ac_add_options --enable-chrome-format=flat
-
-mk_add_options MOZ_MAKE_FLAGS="-j3"
deleted file mode 100644
--- a/mozilla2/linux/mozilla-beta/debug/mozconfig
+++ /dev/null
@@ -1,29 +0,0 @@
-ac_add_options --enable-application=browser
-
-ac_add_options --disable-optimize
-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
-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
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
deleted file mode 100644
--- a/mozilla2/linux/mozilla-beta/nightly-rpm/mozconfig
+++ /dev/null
@@ -1,41 +0,0 @@
-ac_add_options --enable-application=browser
-ac_add_options --enable-optimize
-ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-
-# Options for rpm versions of mozconfigs
-PREFIX=/usr
-LIBDIR=${PREFIX}/lib
-ac_add_options --with-app-name=minefield
-ac_add_options --disable-updater
-ac_add_options --prefix=$PREFIX
-ac_add_options --libdir=$LIBDIR
-
-CC=/tools/gcc-4.5/bin/gcc
-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
-
-export MOZ_TELEMETRY_REPORTING=1
-
-# PGO
-
-mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccachedeleted file mode 100644
--- a/mozilla2/linux/mozilla-beta/nightly/mozconfig
+++ /dev/null
@@ -1,32 +0,0 @@
-ac_add_options --enable-application=browser
-ac_add_options --enable-optimize
-ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-
-CC=/tools/gcc-4.5/bin/gcc
-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
-
-export MOZ_TELEMETRY_REPORTING=1
-
-# PGO
-mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
deleted file mode 100644
--- a/mozilla2/linux/mozilla-beta/qt/mozconfig
+++ /dev/null
@@ -1,37 +0,0 @@
-ac_add_options --enable-application=browser
-ac_add_options --enable-optimize
-#ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-
-CC=/tools/gcc-4.5/bin/gcc
-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
-
-# PGO
-
-mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
-
-# QT Options
-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
deleted file mode 100644
--- a/mozilla2/linux/mozilla-beta/release/l10n-mozconfig
+++ /dev/null
@@ -1,18 +0,0 @@
-ac_add_options --with-l10n-base=..
-ac_add_options --enable-application=browser
-ac_add_options --enable-official-branding
-ac_add_options --enable-update-channel=beta
-ac_add_options --enable-update-packaging
-ac_add_options --enable-stdcxx-compat
-
-CC="/tools/gcc-4.7.2-0moz1/bin/gcc"
-CXX="/tools/gcc-4.7.2-0moz1/bin/g++"
-
-if test `uname -m` = "x86_64"; then
- # -march=pentiumpro is what our 32-bit native toolchain defaults to
- CC="$CC -m32 -march=pentiumpro"
- CXX="$CXX -m32 -march=pentiumpro"
- ac_add_options --target=i686-pc-linux
- ac_add_options --x-libraries=/usr/lib
- export PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig:/usr/share/pkgconfig
-fi
deleted file mode 100644
--- a/mozilla2/linux/mozilla-beta/release/mozconfig
+++ /dev/null
@@ -1,33 +0,0 @@
-ac_add_options --enable-application=browser
-ac_add_options --enable-update-channel=beta
-ac_add_options --enable-update-packaging
-ac_add_options --enable-official-branding
-ac_add_options --with-google-api-keyfile=/builds/gapi.data
-
-CC="/tools/gcc-4.7.3-0moz1/bin/gcc"
-CXX="/tools/gcc-4.7.3-0moz1/bin/g++"
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
-# PGO
-mk_add_options MOZ_PGO=1
-
-# 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
-
-# Package js shell.
-export MOZ_PACKAGE_JSSHELL=1
-
-if test `uname -m` = "x86_64"; then
- # -march=pentiumpro is what our 32-bit native toolchain defaults to
- CC="$CC -m32 -march=pentiumpro"
- CXX="$CXX -m32 -march=pentiumpro"
- ac_add_options --target=i686-pc-linux
- ac_add_options --x-libraries=/usr/lib
- export PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig:/usr/share/pkgconfig
-fi
deleted file mode 100644
--- a/mozilla2/linux/mozilla-beta/xulrunner-qt/mozconfig
+++ /dev/null
@@ -1,26 +0,0 @@
-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
-
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
-
-# QT Options
-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
-
deleted file mode 100644
--- a/mozilla2/linux/mozilla-beta/xulrunner/mozconfig
+++ /dev/null
@@ -1,25 +0,0 @@
-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
-
-CC="/tools/gcc-4.7.2-0moz1/bin/gcc"
-CXX="/tools/gcc-4.7.2-0moz1/bin/g++"
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
-
-if test `uname -m` = "x86_64"; then
- # -march=pentiumpro is what our 32-bit native toolchain defaults to
- CC="$CC -m32 -march=pentiumpro"
- CXX="$CXX -m32 -march=pentiumpro"
- ac_add_options --target=i686-pc-linux
- ac_add_options --x-libraries=/usr/lib
- export PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig:/usr/share/pkgconfig
-fi
deleted file mode 100644
--- a/mozilla2/linux/mozilla-central/codecoverage/mozconfig
+++ /dev/null
@@ -1,19 +0,0 @@
-export CFLAGS="-fprofile-arcs -ftest-coverage"
-export CXXFLAGS="-fprofile-arcs -ftest-coverage"
-export LDFLAGS="-lgcov -static-libgcc"
-export EXTRA_DSO_LDFLAGS="-lgcov -static-libgcc"
-
-# Don't use ccache here
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
-ac_add_options --enable-application=browser
-
-ac_add_options --enable-debug
-ac_add_options --enable-tests
-ac_add_options --disable-optimize
-ac_add_options --enable-chrome-format=flat
-
-mk_add_options MOZ_MAKE_FLAGS="-j3"
deleted file mode 100644
--- a/mozilla2/linux/mozilla-central/debug/mozconfig
+++ /dev/null
@@ -1,29 +0,0 @@
-ac_add_options --enable-application=browser
-
-ac_add_options --disable-optimize
-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
-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
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
deleted file mode 100644
--- a/mozilla2/linux/mozilla-central/nightly-rpm/mozconfig
+++ /dev/null
@@ -1,38 +0,0 @@
-ac_add_options --enable-application=browser
-ac_add_options --enable-optimize
-ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-
-# Options for rpm versions of mozconfigs
-PREFIX=/usr
-LIBDIR=${PREFIX}/lib
-ac_add_options --with-app-name=mozilla-nightly
-ac_add_options --disable-updater
-ac_add_options --prefix=$PREFIX
-ac_add_options --libdir=$LIBDIR
-
-CC=/tools/gcc-4.5/bin/gcc
-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
-
-export MOZ_TELEMETRY_REPORTING=1
-mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccachedeleted file mode 100644
--- a/mozilla2/linux/mozilla-central/nightly/mozconfig
+++ /dev/null
@@ -1,35 +0,0 @@
-ac_add_options --enable-application=browser
-ac_add_options --enable-optimize
-ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-
-# Mozilla-Central nightlies only since this has a cost in performance
-ac_add_options --enable-js-diagnostics
-
-CC=/tools/gcc-4.5/bin/gcc
-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
-
-export MOZ_TELEMETRY_REPORTING=1
-
-# PGO
-mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
deleted file mode 100644
--- a/mozilla2/linux/mozilla-central/qt/mozconfig
+++ /dev/null
@@ -1,36 +0,0 @@
-ac_add_options --enable-application=browser
-ac_add_options --enable-optimize
-#ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-
-CC=/tools/gcc-4.5/bin/gcc
-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
-
-# PGO
-mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
-
-# QT Options
-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
deleted file mode 100644
--- a/mozilla2/linux/mozilla-central/release/l10n-mozconfig
+++ /dev/null
@@ -1,8 +0,0 @@
-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=beta
-ac_add_options --enable-update-packaging
-
-CC=/tools/gcc-4.3.3/installed/bin/gcc
-CXX=/tools/gcc-4.3.3/installed/bin/g++
deleted file mode 100644
--- a/mozilla2/linux/mozilla-central/release/mozconfig
+++ /dev/null
@@ -1,28 +0,0 @@
-ac_add_options --enable-application=browser
-ac_add_options --enable-optimize
-ac_add_options --enable-update-channel=beta
-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
-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'
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-export MOZ_TELEMETRY_REPORTING=1
deleted file mode 100644
--- a/mozilla2/linux/mozilla-central/xulrunner-qt/mozconfig
+++ /dev/null
@@ -1,26 +0,0 @@
-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
-
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
-
-# QT Options
-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
-
deleted file mode 100644
--- a/mozilla2/linux/mozilla-central/xulrunner/mozconfig
+++ /dev/null
@@ -1,19 +0,0 @@
-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
-
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
deleted file mode 100644
--- a/mozilla2/linux/mozilla-esr10/release/l10n-mozconfig
+++ /dev/null
@@ -1,9 +0,0 @@
-ac_add_options --with-l10n-base=../../mozilla-release
-ac_add_options --enable-application=browser
-ac_add_options --enable-official-branding
-ac_add_options --enable-update-channel=esr
-ac_add_options --enable-update-packaging
-ac_add_options --enable-stdcxx-compat
-
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
deleted file mode 100644
--- a/mozilla2/linux/mozilla-esr10/release/mozconfig
+++ /dev/null
@@ -1,20 +0,0 @@
-ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-update-packaging
-ac_add_options --enable-official-branding
-
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
-# PGO
-mk_add_options MOZ_PGO=1
-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
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"deleted file mode 100644
--- a/mozilla2/linux/mozilla-esr10/xulrunner/mozconfig
+++ /dev/null
@@ -1,19 +0,0 @@
-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
-
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
deleted file mode 100644
--- a/mozilla2/linux/mozilla-esr31/release/mozconfig
+++ /dev/null
@@ -1,33 +0,0 @@
-ac_add_options --enable-application=browser
-ac_add_options --enable-update-channel=esr
-ac_add_options --enable-update-packaging
-ac_add_options --enable-official-branding
-ac_add_options --with-google-api-keyfile=/builds/gapi.data
-
-CC="/tools/gcc-4.7.3-0moz1/bin/gcc"
-CXX="/tools/gcc-4.7.3-0moz1/bin/g++"
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
-# PGO
-mk_add_options MOZ_PGO=1
-
-# 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
-
-# Package js shell.
-export MOZ_PACKAGE_JSSHELL=1
-
-if test `uname -m` = "x86_64"; then
- # -march=pentiumpro is what our 32-bit native toolchain defaults to
- CC="$CC -m32 -march=pentiumpro"
- CXX="$CXX -m32 -march=pentiumpro"
- ac_add_options --target=i686-pc-linux
- ac_add_options --x-libraries=/usr/lib
- export PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig:/usr/share/pkgconfig
-fi
deleted file mode 100644
--- a/mozilla2/linux/mozilla-release/codecoverage/mozconfig
+++ /dev/null
@@ -1,19 +0,0 @@
-export CFLAGS="-fprofile-arcs -ftest-coverage"
-export CXXFLAGS="-fprofile-arcs -ftest-coverage"
-export LDFLAGS="-lgcov -static-libgcc"
-export EXTRA_DSO_LDFLAGS="-lgcov -static-libgcc"
-
-# Don't use ccache here
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
-ac_add_options --enable-application=browser
-
-ac_add_options --enable-debug
-ac_add_options --enable-tests
-ac_add_options --disable-optimize
-ac_add_options --enable-chrome-format=flat
-
-mk_add_options MOZ_MAKE_FLAGS="-j3"
deleted file mode 100644
--- a/mozilla2/linux/mozilla-release/debug/mozconfig
+++ /dev/null
@@ -1,29 +0,0 @@
-ac_add_options --enable-application=browser
-
-ac_add_options --disable-optimize
-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
-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
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
deleted file mode 100644
--- a/mozilla2/linux/mozilla-release/nightly-rpm/mozconfig
+++ /dev/null
@@ -1,41 +0,0 @@
-ac_add_options --enable-application=browser
-ac_add_options --enable-optimize
-ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-
-# Options for rpm versions of mozconfigs
-PREFIX=/usr
-LIBDIR=${PREFIX}/lib
-ac_add_options --with-app-name=minefield
-ac_add_options --disable-updater
-ac_add_options --prefix=$PREFIX
-ac_add_options --libdir=$LIBDIR
-
-CC=/tools/gcc-4.5/bin/gcc
-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
-
-export MOZ_TELEMETRY_REPORTING=1
-
-# PGO
-
-mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccachedeleted file mode 100644
--- a/mozilla2/linux/mozilla-release/qt/mozconfig
+++ /dev/null
@@ -1,37 +0,0 @@
-ac_add_options --enable-application=browser
-ac_add_options --enable-optimize
-#ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-
-CC=/tools/gcc-4.5/bin/gcc
-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
-
-# PGO
-
-mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
-
-# QT Options
-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
deleted file mode 100644
--- a/mozilla2/linux/mozilla-release/release/l10n-mozconfig
+++ /dev/null
@@ -1,18 +0,0 @@
-ac_add_options --with-l10n-base=..
-ac_add_options --enable-application=browser
-ac_add_options --enable-official-branding
-ac_add_options --enable-update-channel=release
-ac_add_options --enable-update-packaging
-ac_add_options --enable-stdcxx-compat
-
-CC="/tools/gcc-4.7.2-0moz1/bin/gcc"
-CXX="/tools/gcc-4.7.2-0moz1/bin/g++"
-
-if test `uname -m` = "x86_64"; then
- # -march=pentiumpro is what our 32-bit native toolchain defaults to
- CC="$CC -m32 -march=pentiumpro"
- CXX="$CXX -m32 -march=pentiumpro"
- ac_add_options --target=i686-pc-linux
- ac_add_options --x-libraries=/usr/lib
- export PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig:/usr/share/pkgconfig
-fi
deleted file mode 100644
--- a/mozilla2/linux/mozilla-release/release/mozconfig
+++ /dev/null
@@ -1,33 +0,0 @@
-ac_add_options --enable-application=browser
-ac_add_options --enable-update-channel=release
-ac_add_options --enable-update-packaging
-ac_add_options --enable-official-branding
-ac_add_options --with-google-api-keyfile=/builds/gapi.data
-
-CC="/tools/gcc-4.7.3-0moz1/bin/gcc"
-CXX="/tools/gcc-4.7.3-0moz1/bin/g++"
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
-# PGO
-mk_add_options MOZ_PGO=1
-
-# 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
-
-# Package js shell.
-export MOZ_PACKAGE_JSSHELL=1
-
-if test `uname -m` = "x86_64"; then
- # -march=pentiumpro is what our 32-bit native toolchain defaults to
- CC="$CC -m32 -march=pentiumpro"
- CXX="$CXX -m32 -march=pentiumpro"
- ac_add_options --target=i686-pc-linux
- ac_add_options --x-libraries=/usr/lib
- export PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig:/usr/share/pkgconfig
-fi
deleted file mode 100644
--- a/mozilla2/linux/mozilla-release/xulrunner-qt/mozconfig
+++ /dev/null
@@ -1,26 +0,0 @@
-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
-
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
-
-# QT Options
-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
-
deleted file mode 100644
--- a/mozilla2/linux/mozilla-release/xulrunner/mozconfig
+++ /dev/null
@@ -1,25 +0,0 @@
-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
-
-CC="/tools/gcc-4.7.2-0moz1/bin/gcc"
-CXX="/tools/gcc-4.7.2-0moz1/bin/g++"
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
-
-if test `uname -m` = "x86_64"; then
- # -march=pentiumpro is what our 32-bit native toolchain defaults to
- CC="$CC -m32 -march=pentiumpro"
- CXX="$CXX -m32 -march=pentiumpro"
- ac_add_options --target=i686-pc-linux
- ac_add_options --x-libraries=/usr/lib
- export PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig:/usr/share/pkgconfig
-fi
deleted file mode 100644
--- a/mozilla2/linux/try/debug/mozconfig
+++ /dev/null
@@ -1,36 +0,0 @@
-ac_add_options --enable-application=browser
-
-ac_add_options --disable-optimize
-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
-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
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-
-if [ -f $topsrcdir/mozconfig-extra ] ; then
- . $topsrcdir/mozconfig-extra
-fi
-if [ -f $topsrcdir/mozconfig-extra-linux ] ; then
- . $topsrcdir/mozconfig-extra-linux
-fi
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
deleted file mode 100644
--- a/mozilla2/linux/try/nightly/mozconfig
+++ /dev/null
@@ -1,37 +0,0 @@
-ac_add_options --enable-application=browser
-ac_add_options --enable-optimize
-ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-ac_add_options --disable-auto-deps
-
-CC=/tools/gcc-4.5/bin/gcc
-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 PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-if [ -f $topsrcdir/mozconfig-extra ] ; then
- . $topsrcdir/mozconfig-extra
-fi
-if [ -f $topsrcdir/mozconfig-extra-linux ] ; then
- . $topsrcdir/mozconfig-extra-linux
-fi
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
deleted file mode 100644
--- a/mozilla2/linux/try/qt/mozconfig
+++ /dev/null
@@ -1,42 +0,0 @@
-ac_add_options --enable-application=browser
-ac_add_options --enable-optimize
-#ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-
-CC=/tools/gcc-4.5/bin/gcc
-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 PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-if [ -f $topsrcdir/mozconfig-extra ] ; then
- . $topsrcdir/mozconfig-extra
-fi
-if [ -f $topsrcdir/mozconfig-extra-linux ] ; then
- . $topsrcdir/mozconfig-extra-linux
-fi
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
-
-# QT Options
-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
deleted file mode 100644
--- a/mozilla2/linux/ux/debug/mozconfig
+++ /dev/null
@@ -1,29 +0,0 @@
-ac_add_options --enable-application=browser
-
-ac_add_options --disable-optimize
-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
-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
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
deleted file mode 100644
--- a/mozilla2/linux/ux/nightly-rpm/mozconfig
+++ /dev/null
@@ -1,38 +0,0 @@
-ac_add_options --enable-application=browser
-ac_add_options --enable-optimize
-ac_add_options --enable-update-channel=nightly-ux
-ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-
-# Options for rpm versions of mozconfigs
-PREFIX=/usr
-LIBDIR=${PREFIX}/lib
-ac_add_options --with-app-name=mozilla-nightly
-ac_add_options --disable-updater
-ac_add_options --prefix=$PREFIX
-ac_add_options --libdir=$LIBDIR
-
-CC=/tools/gcc-4.5/bin/gcc
-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
-
-# PGO
-mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccachedeleted file mode 100644
--- a/mozilla2/linux/ux/nightly/mozconfig
+++ /dev/null
@@ -1,30 +0,0 @@
-ac_add_options --enable-application=browser
-ac_add_options --enable-optimize
-ac_add_options --enable-update-channel=nightly-ux
-ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-
-CC=/tools/gcc-4.5/bin/gcc
-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
-
-# PGO
-mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
deleted file mode 100644
--- a/mozilla2/linux/ux/qt/mozconfig
+++ /dev/null
@@ -1,36 +0,0 @@
-ac_add_options --enable-application=browser
-ac_add_options --enable-optimize
-#ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-
-CC=/tools/gcc-4.5/bin/gcc
-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
-
-# PGO
-mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
-
-# QT Options
-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
deleted file mode 100644
--- a/mozilla2/linux64/comm-beta/release/l10n-mozconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-ac_add_options --with-l10n-base=`pwd`/../../mozilla-beta
-ac_add_options --enable-application=mail
-ac_add_options --enable-official-branding
-ac_add_options --enable-update-channel=beta
-ac_add_options --enable-update-packaging
-ac_add_options --enable-stdcxx-compat
-ac_add_options --enable-calendar
-
-CC=/tools/gcc-4.5-0moz3/bin/gcc
-CXX=/tools/gcc-4.5-0moz3/bin/g++
-
-# Run client.py
-mk_add_options CLIENT_PY_ARGS="--hg-options='--time' --skip-chatzilla --skip-comm --skip-inspector --skip-venkman --tinderbox-print --comm-rev=${COMM_REV} --mozilla-rev=${MOZILLA_REV}"
-mk_add_options ALWAYS_RUN_CLIENT_PY=1
-deleted file mode 100644
--- a/mozilla2/linux64/comm-beta/release/mozconfig
+++ /dev/null
@@ -1,32 +0,0 @@
-ac_add_options --enable-application=mail
-ac_add_options --enable-optimize
-ac_add_options --enable-update-channel=beta
-ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-ac_add_options --enable-official-branding
-ac_add_options --enable-calendar
-
-CC=/tools/gcc-4.5/bin/gcc
-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"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-# Enable parallel compiling
-CONCURRENCY=$(( `grep processor /proc/cpuinfo | wc -l` + 2 ))
-mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"
-
-# Run client.py
-# don't use hgtool here, as the source tarball builders don't clone the scripts repo.
-mk_add_options CLIENT_PY_ARGS="--hg-options='--time' --hgtool=../tools/buildfarm/utils/hgtool.py --skip-chatzilla --skip-comm --skip-inspector --skip-venkman --tinderbox-print --comm-rev=${COMM_REV} --mozilla-rev=${MOZILLA_REV}"
-mk_add_options ALWAYS_RUN_CLIENT_PY=1deleted file mode 100644
--- a/mozilla2/linux64/comm-esr10/release/l10n-mozconfig
+++ /dev/null
@@ -1,14 +0,0 @@
-ac_add_options --with-l10n-base=`pwd`/../../mozilla-release
-ac_add_options --enable-application=mail
-ac_add_options --enable-official-branding
-ac_add_options --enable-update-channel=esr
-ac_add_options --enable-update-packaging
-ac_add_options --enable-stdcxx-compat
-
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-
-# Run client.py
-mk_add_options CLIENT_PY_ARGS="--hg-options='--time' --skip-chatzilla --skip-comm --skip-inspector --skip-venkman --tinderbox-print --comm-rev=${COMM_REV} --mozilla-rev=${MOZILLA_REV}"
-mk_add_options ALWAYS_RUN_CLIENT_PY=1
-deleted file mode 100644
--- a/mozilla2/linux64/comm-esr10/release/mozconfig
+++ /dev/null
@@ -1,31 +0,0 @@
-ac_add_options --enable-application=mail
-ac_add_options --enable-optimize
-ac_add_options --enable-update-channel=esr
-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
-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"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-# Enable parallel compiling
-CONCURRENCY=$(( `grep processor /proc/cpuinfo | wc -l` + 2 ))
-mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"
-
-# Run client.py
-# don't use hgtool here, as the source tarball builders don't clone the scripts repo.
-mk_add_options CLIENT_PY_ARGS="--hg-options='--time' --hgtool=../tools/buildfarm/utils/hgtool.py --skip-chatzilla --skip-comm --skip-inspector --skip-venkman --tinderbox-print --comm-rev=${COMM_REV} --mozilla-rev=${MOZILLA_REV}"
-mk_add_options ALWAYS_RUN_CLIENT_PY=1deleted file mode 100644
--- a/mozilla2/linux64/comm-release/release/l10n-mozconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-ac_add_options --with-l10n-base=`pwd`/../../mozilla-release
-ac_add_options --enable-application=mail
-ac_add_options --enable-official-branding
-ac_add_options --enable-update-channel=release
-ac_add_options --enable-update-packaging
-ac_add_options --enable-stdcxx-compat
-ac_add_options --enable-calendar
-
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-
-# Run client.py
-mk_add_options CLIENT_PY_ARGS="--hg-options='--time' --skip-chatzilla --skip-comm --skip-inspector --skip-venkman --tinderbox-print --comm-rev=${COMM_REV} --mozilla-rev=${MOZILLA_REV}"
-mk_add_options ALWAYS_RUN_CLIENT_PY=1
-deleted file mode 100644
--- a/mozilla2/linux64/comm-release/release/mozconfig
+++ /dev/null
@@ -1,32 +0,0 @@
-ac_add_options --enable-application=mail
-ac_add_options --enable-optimize
-ac_add_options --enable-update-channel=release
-ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-ac_add_options --enable-official-branding
-ac_add_options --enable-calendar
-
-CC=/tools/gcc-4.5-0moz3/bin/gcc
-CXX=/tools/gcc-4.5-0moz3/bin/g++
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
-export CFLAGS="-gdwarf-2"
-export CXXFLAGS="-gdwarf-2"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-# Enable parallel compiling
-CONCURRENCY=$(( `grep processor /proc/cpuinfo | wc -l` + 2 ))
-mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"
-
-# Run client.py
-# don't use hgtool here, as the source tarball builders don't clone the scripts repo.
-mk_add_options CLIENT_PY_ARGS="--hg-options='--time' --hgtool=../tools/buildfarm/utils/hgtool.py --skip-chatzilla --skip-comm --skip-inspector --skip-venkman --tinderbox-print --comm-rev=${COMM_REV} --mozilla-rev=${MOZILLA_REV}"
-mk_add_options ALWAYS_RUN_CLIENT_PY=1deleted file mode 100644
--- a/mozilla2/linux64/generic/debug/mozconfig
+++ /dev/null
@@ -1,32 +0,0 @@
-ac_add_options --enable-application=browser
-
-ac_add_options --disable-optimize
-ac_add_options --enable-debug
-
-ac_add_options --enable-tests
-ac_add_options --enable-trace-malloc
-
-CC=/tools/gcc-4.5/bin/gcc
-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
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-
-if [ -f $topsrcdir/mozconfig-extra ] ; then
- . $topsrcdir/mozconfig-extra
-fi
-if [ -f $topsrcdir/mozconfig-extra-linux64 ] ; then
- . $topsrcdir/mozconfig-extra-linux64
-fi
deleted file mode 100644
--- a/mozilla2/linux64/generic/nightly/mozconfig
+++ /dev/null
@@ -1,37 +0,0 @@
-ac_add_options --enable-application=browser
-ac_add_options --enable-optimize
-ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-
-CC=/tools/gcc-4.5/bin/gcc
-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
-
-# PGO
-mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-
-if [ -f $topsrcdir/mozconfig-extra ] ; then
- . $topsrcdir/mozconfig-extra
-fi
-if [ -f $topsrcdir/mozconfig-extra-linux64 ] ; then
- . $topsrcdir/mozconfig-extra-linux64
-fi
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
deleted file mode 100644
--- a/mozilla2/linux64/mozilla-aurora/codecoverage/mozconfig
+++ /dev/null
@@ -1,21 +0,0 @@
-export CFLAGS="-fprofile-arcs -ftest-coverage"
-export CXXFLAGS="-fprofile-arcs -ftest-coverage"
-export LDFLAGS="-lgcov -static-libgcc"
-export EXTRA_DSO_LDFLAGS="-lgcov -static-libgcc"
-
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
-ac_add_options --enable-application=browser
-
-ac_add_options --enable-debug
-ac_add_options --enable-tests
-ac_add_options --disable-optimize
-ac_add_options --enable-chrome-format=flat
-
-mk_add_options MOZ_MAKE_FLAGS="-j3"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
deleted file mode 100644
--- a/mozilla2/linux64/mozilla-aurora/debug/mozconfig
+++ /dev/null
@@ -1,25 +0,0 @@
-ac_add_options --enable-application=browser
-
-ac_add_options --disable-optimize
-ac_add_options --enable-debug
-
-ac_add_options --enable-tests
-ac_add_options --enable-trace-malloc
-
-CC=/tools/gcc-4.5/bin/gcc
-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
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
deleted file mode 100644
--- a/mozilla2/linux64/mozilla-aurora/nightly-rpm/mozconfig
+++ /dev/null
@@ -1,40 +0,0 @@
-ac_add_options --enable-application=browser
-ac_add_options --enable-optimize
-ac_add_options --enable-update-channel=aurora
-ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-
-# Options for rpm versions of mozconfigs
-PREFIX=/usr
-LIBDIR=${PREFIX}/lib64
-ac_add_options --with-app-name=mozilla-aurora
-ac_add_options --disable-updater
-ac_add_options --prefix=$PREFIX
-ac_add_options --libdir=$LIBDIR
-
-CC=/tools/gcc-4.5/bin/gcc
-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
-
-export MOZ_TELEMETRY_REPORTING=1
-
-# PGO
-mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccachedeleted file mode 100644
--- a/mozilla2/linux64/mozilla-aurora/nightly/mozconfig
+++ /dev/null
@@ -1,32 +0,0 @@
-ac_add_options --enable-application=browser
-ac_add_options --enable-optimize
-ac_add_options --enable-update-channel=aurora
-ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-
-CC=/tools/gcc-4.5/bin/gcc
-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
-
-export MOZ_TELEMETRY_REPORTING=1
-
-# PGO
-mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
deleted file mode 100644
--- a/mozilla2/linux64/mozilla-aurora/release/l10n-mozconfig
+++ /dev/null
@@ -1,8 +0,0 @@
-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=beta
-ac_add_options --enable-update-packaging
-
-CC=/tools/gcc/bin/gcc
-CXX=/tools/gcc/bin/g++
deleted file mode 100644
--- a/mozilla2/linux64/mozilla-aurora/release/mozconfig
+++ /dev/null
@@ -1,28 +0,0 @@
-ac_add_options --enable-application=browser
-ac_add_options --enable-optimize
-ac_add_options --enable-update-channel=beta
-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
-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'
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-export MOZ_TELEMETRY_REPORTING=1
deleted file mode 100644
--- a/mozilla2/linux64/mozilla-aurora/xulrunner/mozconfig
+++ /dev/null
@@ -1,19 +0,0 @@
-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
-
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
deleted file mode 100644
--- a/mozilla2/linux64/mozilla-beta/codecoverage/mozconfig
+++ /dev/null
@@ -1,21 +0,0 @@
-export CFLAGS="-fprofile-arcs -ftest-coverage"
-export CXXFLAGS="-fprofile-arcs -ftest-coverage"
-export LDFLAGS="-lgcov -static-libgcc"
-export EXTRA_DSO_LDFLAGS="-lgcov -static-libgcc"
-
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
-ac_add_options --enable-application=browser
-
-ac_add_options --enable-debug
-ac_add_options --enable-tests
-ac_add_options --disable-optimize
-ac_add_options --enable-chrome-format=flat
-
-mk_add_options MOZ_MAKE_FLAGS="-j3"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
deleted file mode 100644
--- a/mozilla2/linux64/mozilla-beta/debug/mozconfig
+++ /dev/null
@@ -1,25 +0,0 @@
-ac_add_options --enable-application=browser
-
-ac_add_options --disable-optimize
-ac_add_options --enable-debug
-
-ac_add_options --enable-tests
-ac_add_options --enable-trace-malloc
-
-CC=/tools/gcc-4.5/bin/gcc
-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
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
deleted file mode 100644
--- a/mozilla2/linux64/mozilla-beta/nightly-rpm/mozconfig
+++ /dev/null
@@ -1,41 +0,0 @@
-ac_add_options --enable-application=browser
-ac_add_options --enable-optimize
-ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-
-# Options for rpm versions of mozconfigs
-PREFIX=/usr
-LIBDIR=${PREFIX}/lib64
-ac_add_options --with-app-name=minefield
-ac_add_options --disable-updater
-ac_add_options --prefix=$PREFIX
-ac_add_options --libdir=$LIBDIR
-
-CC=/tools/gcc-4.5/bin/gcc
-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
-
-export MOZ_TELEMETRY_REPORTING=1
-
-# PGO
-
-mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccachedeleted file mode 100644
--- a/mozilla2/linux64/mozilla-beta/nightly/mozconfig
+++ /dev/null
@@ -1,32 +0,0 @@
-ac_add_options --enable-application=browser
-ac_add_options --enable-optimize
-ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-
-CC=/tools/gcc-4.5/bin/gcc
-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
-
-export MOZ_TELEMETRY_REPORTING=1
-
-# PGO
-mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
deleted file mode 100644
--- a/mozilla2/linux64/mozilla-beta/release/l10n-mozconfig
+++ /dev/null
@@ -1,9 +0,0 @@
-ac_add_options --with-l10n-base=..
-ac_add_options --enable-application=browser
-ac_add_options --enable-official-branding
-ac_add_options --enable-update-channel=beta
-ac_add_options --enable-update-packaging
-ac_add_options --enable-stdcxx-compat
-
-CC=/tools/gcc-4.5-0moz3/bin/gcc
-CXX=/tools/gcc-4.5-0moz3/bin/g++
deleted file mode 100644
--- a/mozilla2/linux64/mozilla-beta/release/mozconfig
+++ /dev/null
@@ -1,28 +0,0 @@
-ac_add_options --enable-application=browser
-ac_add_options --enable-optimize
-ac_add_options --enable-update-channel=beta
-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
-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'
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-export MOZ_TELEMETRY_REPORTING=1
deleted file mode 100644
--- a/mozilla2/linux64/mozilla-beta/xulrunner/mozconfig
+++ /dev/null
@@ -1,19 +0,0 @@
-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
-
-CC=/tools/gcc-4.5-0moz3/bin/gcc
-CXX=/tools/gcc-4.5-0moz3/bin/g++
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
deleted file mode 100644
--- a/mozilla2/linux64/mozilla-central/codecoverage/mozconfig
+++ /dev/null
@@ -1,21 +0,0 @@
-export CFLAGS="-fprofile-arcs -ftest-coverage"
-export CXXFLAGS="-fprofile-arcs -ftest-coverage"
-export LDFLAGS="-lgcov -static-libgcc"
-export EXTRA_DSO_LDFLAGS="-lgcov -static-libgcc"
-
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
-ac_add_options --enable-application=browser
-
-ac_add_options --enable-debug
-ac_add_options --enable-tests
-ac_add_options --disable-optimize
-ac_add_options --enable-chrome-format=flat
-
-mk_add_options MOZ_MAKE_FLAGS="-j3"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
deleted file mode 100644
--- a/mozilla2/linux64/mozilla-central/debug/mozconfig
+++ /dev/null
@@ -1,25 +0,0 @@
-ac_add_options --enable-application=browser
-
-ac_add_options --disable-optimize
-ac_add_options --enable-debug
-
-ac_add_options --enable-tests
-ac_add_options --enable-trace-malloc
-
-CC=/tools/gcc-4.5/bin/gcc
-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
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
deleted file mode 100644
--- a/mozilla2/linux64/mozilla-central/nightly-rpm/mozconfig
+++ /dev/null
@@ -1,38 +0,0 @@
-ac_add_options --enable-application=browser
-ac_add_options --enable-optimize
-ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-
-# Options for rpm versions of mozconfigs
-PREFIX=/usr
-LIBDIR=${PREFIX}/lib64
-ac_add_options --with-app-name=mozilla-nightly
-ac_add_options --disable-updater
-ac_add_options --prefix=$PREFIX
-ac_add_options --libdir=$LIBDIR
-
-CC=/tools/gcc-4.5/bin/gcc
-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
-
-export MOZ_TELEMETRY_REPORTING=1
-mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccachedeleted file mode 100644
--- a/mozilla2/linux64/mozilla-central/nightly/mozconfig
+++ /dev/null
@@ -1,35 +0,0 @@
-ac_add_options --enable-application=browser
-ac_add_options --enable-optimize
-ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-
-# Mozilla-Central nightlies only since this has a cost in performance
-ac_add_options --enable-js-diagnostics
-
-CC=/tools/gcc-4.5/bin/gcc
-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
-
-export MOZ_TELEMETRY_REPORTING=1
-
-# PGO
-mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
deleted file mode 100644
--- a/mozilla2/linux64/mozilla-central/release/l10n-mozconfig
+++ /dev/null
@@ -1,8 +0,0 @@
-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=beta
-ac_add_options --enable-update-packaging
-
-CC=/tools/gcc/bin/gcc
-CXX=/tools/gcc/bin/g++
deleted file mode 100644
--- a/mozilla2/linux64/mozilla-central/release/mozconfig
+++ /dev/null
@@ -1,28 +0,0 @@
-ac_add_options --enable-application=browser
-ac_add_options --enable-optimize
-ac_add_options --enable-update-channel=beta
-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
-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'
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-export MOZ_TELEMETRY_REPORTING=1
deleted file mode 100644
--- a/mozilla2/linux64/mozilla-central/xulrunner/mozconfig
+++ /dev/null
@@ -1,19 +0,0 @@
-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
-
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
deleted file mode 100644
--- a/mozilla2/linux64/mozilla-esr10/release/l10n-mozconfig
+++ /dev/null
@@ -1,9 +0,0 @@
-ac_add_options --with-l10n-base=../../mozilla-release
-ac_add_options --enable-application=browser
-ac_add_options --enable-official-branding
-ac_add_options --enable-update-channel=esr
-ac_add_options --enable-update-packaging
-ac_add_options --enable-stdcxx-compat
-
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
deleted file mode 100644
--- a/mozilla2/linux64/mozilla-esr10/xulrunner/mozconfig
+++ /dev/null
@@ -1,19 +0,0 @@
-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
-
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
deleted file mode 100644
--- a/mozilla2/linux64/mozilla-release/codecoverage/mozconfig
+++ /dev/null
@@ -1,21 +0,0 @@
-export CFLAGS="-fprofile-arcs -ftest-coverage"
-export CXXFLAGS="-fprofile-arcs -ftest-coverage"
-export LDFLAGS="-lgcov -static-libgcc"
-export EXTRA_DSO_LDFLAGS="-lgcov -static-libgcc"
-
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
-ac_add_options --enable-application=browser
-
-ac_add_options --enable-debug
-ac_add_options --enable-tests
-ac_add_options --disable-optimize
-ac_add_options --enable-chrome-format=flat
-
-mk_add_options MOZ_MAKE_FLAGS="-j3"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
deleted file mode 100644
--- a/mozilla2/linux64/mozilla-release/debug/mozconfig
+++ /dev/null
@@ -1,25 +0,0 @@
-ac_add_options --enable-application=browser
-
-ac_add_options --disable-optimize
-ac_add_options --enable-debug
-
-ac_add_options --enable-tests
-ac_add_options --enable-trace-malloc
-
-CC=/tools/gcc-4.5/bin/gcc
-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
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
deleted file mode 100644
--- a/mozilla2/linux64/mozilla-release/nightly-rpm/mozconfig
+++ /dev/null
@@ -1,41 +0,0 @@
-ac_add_options --enable-application=browser
-ac_add_options --enable-optimize
-ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-
-# Options for rpm versions of mozconfigs
-PREFIX=/usr
-LIBDIR=${PREFIX}/lib64
-ac_add_options --with-app-name=minefield
-ac_add_options --disable-updater
-ac_add_options --prefix=$PREFIX
-ac_add_options --libdir=$LIBDIR
-
-CC=/tools/gcc-4.5/bin/gcc
-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
-
-export MOZ_TELEMETRY_REPORTING=1
-
-# PGO
-
-mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccachedeleted file mode 100644
--- a/mozilla2/linux64/mozilla-release/release/l10n-mozconfig
+++ /dev/null
@@ -1,9 +0,0 @@
-ac_add_options --with-l10n-base=..
-ac_add_options --enable-application=browser
-ac_add_options --enable-official-branding
-ac_add_options --enable-update-channel=release
-ac_add_options --enable-update-packaging
-ac_add_options --enable-stdcxx-compat
-
-CC=/tools/gcc-4.5-0moz3/bin/gcc
-CXX=/tools/gcc-4.5-0moz3/bin/g++
deleted file mode 100644
--- a/mozilla2/linux64/mozilla-release/xulrunner/mozconfig
+++ /dev/null
@@ -1,19 +0,0 @@
-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
-
-CC=/tools/gcc-4.5-0moz3/bin/gcc
-CXX=/tools/gcc-4.5-0moz3/bin/g++
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
deleted file mode 100644
--- a/mozilla2/linux64/try/debug/mozconfig
+++ /dev/null
@@ -1,32 +0,0 @@
-ac_add_options --enable-application=browser
-
-ac_add_options --disable-optimize
-ac_add_options --enable-debug
-
-ac_add_options --enable-tests
-ac_add_options --enable-trace-malloc
-
-CC=/tools/gcc-4.5/bin/gcc
-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
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-
-if [ -f $topsrcdir/mozconfig-extra ] ; then
- . $topsrcdir/mozconfig-extra
-fi
-if [ -f $topsrcdir/mozconfig-extra-linux64 ] ; then
- . $topsrcdir/mozconfig-extra-linux64
-fi
deleted file mode 100644
--- a/mozilla2/linux64/try/nightly/mozconfig
+++ /dev/null
@@ -1,38 +0,0 @@
-ac_add_options --enable-application=browser
-ac_add_options --enable-optimize
-ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-ac_add_options --disable-auto-deps
-
-CC=/tools/gcc-4.5/bin/gcc
-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 PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-
-if [ -f $topsrcdir/mozconfig-extra ] ; then
- . $topsrcdir/mozconfig-extra
-fi
-if [ -f $topsrcdir/mozconfig-extra-linux64 ] ; then
- . $topsrcdir/mozconfig-extra-linux64
-fi
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
deleted file mode 100644
--- a/mozilla2/linux64/ux/debug/mozconfig
+++ /dev/null
@@ -1,25 +0,0 @@
-ac_add_options --enable-application=browser
-
-ac_add_options --disable-optimize
-ac_add_options --enable-debug
-
-ac_add_options --enable-tests
-ac_add_options --enable-trace-malloc
-
-CC=/tools/gcc-4.5/bin/gcc
-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
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
deleted file mode 100644
--- a/mozilla2/linux64/ux/nightly-rpm/mozconfig
+++ /dev/null
@@ -1,38 +0,0 @@
-ac_add_options --enable-application=browser
-ac_add_options --enable-optimize
-ac_add_options --enable-update-channel=nightly-ux
-ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-
-# Options for rpm versions of mozconfigs
-PREFIX=/usr
-LIBDIR=${PREFIX}/lib64
-ac_add_options --with-app-name=mozilla-nightly
-ac_add_options --disable-updater
-ac_add_options --prefix=$PREFIX
-ac_add_options --libdir=$LIBDIR
-
-CC=/tools/gcc-4.5/bin/gcc
-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
-
-# PGO
-mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccachedeleted file mode 100644
--- a/mozilla2/linux64/ux/nightly/mozconfig
+++ /dev/null
@@ -1,30 +0,0 @@
-ac_add_options --enable-application=browser
-ac_add_options --enable-optimize
-ac_add_options --enable-update-channel=nightly-ux
-ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-
-CC=/tools/gcc-4.5/bin/gcc
-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
-
-# PGO
-mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
deleted file mode 100644
--- a/mozilla2/macosx64/comm-beta/release/l10n-mozconfig
+++ /dev/null
@@ -1,14 +0,0 @@
-ac_add_options --with-l10n-base=`pwd`/../../mozilla-beta
-ac_add_options --enable-application=mail
-ac_add_options --enable-official-branding
-ac_add_options --enable-update-channel=beta
-ac_add_options --enable-update-packaging
-ac_add_options --enable-calendar
-
-# Make sure Lightning is also unified
-mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/lightning/build/universal.mk
-
-# Run client.py
-mk_add_options CLIENT_PY_ARGS="--hg-options='--time' --skip-chatzilla --skip-comm --skip-inspector --skip-venkman --tinderbox-print --comm-rev=${COMM_REV} --mozilla-rev=${MOZILLA_REV}"
-mk_add_options ALWAYS_RUN_CLIENT_PY=1
-deleted file mode 100644
--- a/mozilla2/macosx64/comm-beta/release/mozconfig
+++ /dev/null
@@ -1,26 +0,0 @@
-. $topsrcdir/build/macosx/universal/mozconfig
-
-ac_add_options --enable-application=mail
-ac_add_options --enable-update-channel=beta
-ac_add_options --enable-update-packaging
-ac_add_options --enable-tests
-ac_add_options --enable-official-branding
-ac_add_options --enable-calendar
-
-# Make sure Lightning is also unified
-mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/lightning/build/universal.mk
-
-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
-
-# Run client.py
-# don't use hgtool here, as the source tarball builders don't clone the scripts repo.
-mk_add_options CLIENT_PY_ARGS="--hg-options='--time' --hgtool=../tools/buildfarm/utils/hgtool.py --skip-chatzilla --skip-comm --skip-inspector --skip-venkman --tinderbox-print --comm-rev=${COMM_REV} --mozilla-rev=${MOZILLA_REV}"
-mk_add_options ALWAYS_RUN_CLIENT_PY=1deleted file mode 100644
--- a/mozilla2/macosx64/comm-esr10/release/l10n-mozconfig
+++ /dev/null
@@ -1,10 +0,0 @@
-ac_add_options --with-l10n-base=`pwd`/../../mozilla-release
-ac_add_options --enable-application=mail
-ac_add_options --enable-official-branding
-ac_add_options --enable-update-channel=esr
-ac_add_options --enable-update-packaging
-
-# Run client.py
-mk_add_options CLIENT_PY_ARGS="--hg-options='--time' --skip-chatzilla --skip-comm --skip-inspector --skip-venkman --tinderbox-print --comm-rev=${COMM_REV} --mozilla-rev=${MOZILLA_REV}"
-mk_add_options ALWAYS_RUN_CLIENT_PY=1
-deleted file mode 100644
--- a/mozilla2/macosx64/comm-esr10/release/mozconfig
+++ /dev/null
@@ -1,22 +0,0 @@
-. $topsrcdir/build/macosx/universal/mozconfig
-
-ac_add_options --enable-application=mail
-ac_add_options --enable-update-channel=esr
-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
-
-# Run client.py
-# don't use hgtool here, as the source tarball builders don't clone the scripts repo.
-mk_add_options CLIENT_PY_ARGS="--hg-options='--time' --hgtool=../tools/buildfarm/utils/hgtool.py --skip-chatzilla --skip-comm --skip-inspector --skip-venkman --tinderbox-print --comm-rev=${COMM_REV} --mozilla-rev=${MOZILLA_REV}"
-mk_add_options ALWAYS_RUN_CLIENT_PY=1deleted file mode 100644
--- a/mozilla2/macosx64/comm-release/release/l10n-mozconfig
+++ /dev/null
@@ -1,14 +0,0 @@
-ac_add_options --with-l10n-base=`pwd`/../../mozilla-release
-ac_add_options --enable-application=mail
-ac_add_options --enable-official-branding
-ac_add_options --enable-update-channel=release
-ac_add_options --enable-update-packaging
-ac_add_options --enable-calendar
-
-# Make sure Lightning is also unified
-mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/lightning/build/universal.mk
-
-# Run client.py
-mk_add_options CLIENT_PY_ARGS="--hg-options='--time' --skip-chatzilla --skip-comm --skip-inspector --skip-venkman --tinderbox-print --comm-rev=${COMM_REV} --mozilla-rev=${MOZILLA_REV}"
-mk_add_options ALWAYS_RUN_CLIENT_PY=1
-deleted file mode 100644
--- a/mozilla2/macosx64/comm-release/release/mozconfig
+++ /dev/null
@@ -1,26 +0,0 @@
-. $topsrcdir/build/macosx/universal/mozconfig
-
-ac_add_options --enable-application=mail
-ac_add_options --enable-update-channel=release
-ac_add_options --enable-update-packaging
-ac_add_options --enable-tests
-ac_add_options --enable-official-branding
-ac_add_options --enable-calendar
-
-# Make sure Lightning is also unified
-mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/lightning/build/universal.mk
-
-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
-
-# Run client.py
-# don't use hgtool here, as the source tarball builders don't clone the scripts repo.
-mk_add_options CLIENT_PY_ARGS="--hg-options='--time' --hgtool=../tools/buildfarm/utils/hgtool.py --skip-chatzilla --skip-comm --skip-inspector --skip-venkman --tinderbox-print --comm-rev=${COMM_REV} --mozilla-rev=${MOZILLA_REV}"
-mk_add_options ALWAYS_RUN_CLIENT_PY=1deleted file mode 100644
--- a/mozilla2/macosx64/generic/debug/mozconfig
+++ /dev/null
@@ -1,25 +0,0 @@
-ac_add_options --disable-optimize
-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"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-
-if [ -f $topsrcdir/mozconfig-extra ] ; then
- . $topsrcdir/mozconfig-extra
-fi
-if [ -f $topsrcdir/mozconfig-extra-macosx64 ] ; then
- . $topsrcdir/mozconfig-extra-macosx64
-fi
deleted file mode 100644
--- a/mozilla2/macosx64/generic/nightly/mozconfig
+++ /dev/null
@@ -1,26 +0,0 @@
-. $topsrcdir/build/macosx/universal/mozconfig
-
-ac_add_options --enable-application=browser
-ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --enable-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
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-if [ -f $topsrcdir/mozconfig-extra ] ; then
- . $topsrcdir/mozconfig-extra
-fi
-if [ -f $topsrcdir/mozconfig-extra-macosx64 ] ; then
- . $topsrcdir/mozconfig-extra-macosx64
-fi
deleted file mode 100644
--- a/mozilla2/macosx64/mozilla-2.0/debug/mozconfig
+++ /dev/null
@@ -1,18 +0,0 @@
-ac_add_options --disable-optimize
-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"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/mozilla2/macosx64/mozilla-2.0/nightly/mozconfig
+++ /dev/null
@@ -1,20 +0,0 @@
-. $topsrcdir/build/macosx/universal/mozconfig
-
-ac_add_options --enable-application=browser
-ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --enable-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
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
deleted file mode 100644
--- a/mozilla2/macosx64/mozilla-2.0/release/l10n-mozconfig
+++ /dev/null
@@ -1,5 +0,0 @@
-ac_add_options --with-l10n-base=../../l10n-mozilla-2.0
-ac_add_options --enable-application=browser
-ac_add_options --enable-official-branding
-ac_add_options --enable-update-channel=release
-ac_add_options --enable-update-packaging
deleted file mode 100644
--- a/mozilla2/macosx64/mozilla-2.0/release/mozconfig
+++ /dev/null
@@ -1,17 +0,0 @@
-. $topsrcdir/build/macosx/universal/mozconfig
-
-ac_add_options --enable-application=browser
-ac_add_options --enable-update-channel=release
-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
deleted file mode 100644
--- a/mozilla2/macosx64/mozilla-2.0/xulrunner/mozconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-. $topsrcdir/build/macosx/universal/mozconfig
-
-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
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
deleted file mode 100644
--- a/mozilla2/macosx64/mozilla-aurora/debug/mozconfig
+++ /dev/null
@@ -1,18 +0,0 @@
-ac_add_options --disable-optimize
-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"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/mozilla2/macosx64/mozilla-aurora/nightly/mozconfig
+++ /dev/null
@@ -1,22 +0,0 @@
-. $topsrcdir/build/macosx/universal/mozconfig
-
-ac_add_options --enable-application=browser
-ac_add_options --enable-update-channel=aurora
-ac_add_options --enable-update-packaging
-ac_add_options --enable-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
-
-export MOZ_TELEMETRY_REPORTING=1
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
deleted file mode 100644
--- a/mozilla2/macosx64/mozilla-aurora/release/l10n-mozconfig
+++ /dev/null
@@ -1,5 +0,0 @@
-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=beta
-ac_add_options --enable-update-packaging
deleted file mode 100644
--- a/mozilla2/macosx64/mozilla-aurora/release/mozconfig
+++ /dev/null
@@ -1,19 +0,0 @@
-. $topsrcdir/build/macosx/universal/mozconfig
-
-ac_add_options --enable-application=browser
-ac_add_options --enable-update-channel=beta
-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
-
-export MOZ_TELEMETRY_REPORTING=1
deleted file mode 100644
--- a/mozilla2/macosx64/mozilla-aurora/xulrunner/mozconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-. $topsrcdir/build/macosx/universal/mozconfig
-
-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
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
deleted file mode 100644
--- a/mozilla2/macosx64/mozilla-beta/debug/mozconfig
+++ /dev/null
@@ -1,18 +0,0 @@
-ac_add_options --disable-optimize
-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"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/mozilla2/macosx64/mozilla-beta/nightly/mozconfig
+++ /dev/null
@@ -1,22 +0,0 @@
-. $topsrcdir/build/macosx/universal/mozconfig
-
-ac_add_options --enable-application=browser
-ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --enable-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
-
-export MOZ_TELEMETRY_REPORTING=1
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
deleted file mode 100644
--- a/mozilla2/macosx64/mozilla-beta/release/l10n-mozconfig
+++ /dev/null
@@ -1,7 +0,0 @@
-. "$topsrcdir/build/macosx/mozconfig.common"
-
-ac_add_options --with-l10n-base=..
-ac_add_options --enable-application=browser
-ac_add_options --enable-official-branding
-ac_add_options --enable-update-channel=beta
-ac_add_options --enable-update-packaging
deleted file mode 100644
--- a/mozilla2/macosx64/mozilla-beta/release/mozconfig
+++ /dev/null
@@ -1,19 +0,0 @@
-. $topsrcdir/build/macosx/universal/mozconfig
-
-ac_add_options --enable-application=browser
-ac_add_options --enable-update-channel=beta
-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
-
-export MOZ_TELEMETRY_REPORTING=1
deleted file mode 100644
--- a/mozilla2/macosx64/mozilla-beta/xulrunner/mozconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-. $topsrcdir/build/macosx/universal/mozconfig
-
-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
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
deleted file mode 100644
--- a/mozilla2/macosx64/mozilla-central/debug/mozconfig
+++ /dev/null
@@ -1,18 +0,0 @@
-ac_add_options --disable-optimize
-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"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/mozilla2/macosx64/mozilla-central/nightly/mozconfig
+++ /dev/null
@@ -1,25 +0,0 @@
-. $topsrcdir/build/macosx/universal/mozconfig
-
-ac_add_options --enable-application=browser
-ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --enable-tests
-ac_add_options --disable-install-strip
-
-# Mozilla-Central 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
-
-export MOZ_TELEMETRY_REPORTING=1
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
deleted file mode 100644
--- a/mozilla2/macosx64/mozilla-central/release/l10n-mozconfig
+++ /dev/null
@@ -1,5 +0,0 @@
-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=beta
-ac_add_options --enable-update-packaging
deleted file mode 100644
--- a/mozilla2/macosx64/mozilla-central/release/mozconfig
+++ /dev/null
@@ -1,19 +0,0 @@
-. $topsrcdir/build/macosx/universal/mozconfig
-
-ac_add_options --enable-application=browser
-ac_add_options --enable-update-channel=beta
-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
-
-export MOZ_TELEMETRY_REPORTING=1
deleted file mode 100644
--- a/mozilla2/macosx64/mozilla-central/xulrunner/mozconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-. $topsrcdir/build/macosx/universal/mozconfig
-
-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
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
deleted file mode 100644
--- a/mozilla2/macosx64/mozilla-esr10/release/l10n-mozconfig
+++ /dev/null
@@ -1,5 +0,0 @@
-ac_add_options --with-l10n-base=../../mozilla-release
-ac_add_options --enable-application=browser
-ac_add_options --enable-official-branding
-ac_add_options --enable-update-channel=esr
-ac_add_options --enable-update-packaging
deleted file mode 100644
--- a/mozilla2/macosx64/mozilla-esr10/xulrunner/mozconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-. $topsrcdir/build/macosx/universal/mozconfig
-
-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
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
deleted file mode 100644
--- a/mozilla2/macosx64/mozilla-release/debug/mozconfig
+++ /dev/null
@@ -1,18 +0,0 @@
-ac_add_options --disable-optimize
-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"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/mozilla2/macosx64/mozilla-release/release/l10n-mozconfig
+++ /dev/null
@@ -1,7 +0,0 @@
-. "$topsrcdir/build/macosx/mozconfig.common"
-
-ac_add_options --with-l10n-base=..
-ac_add_options --enable-application=browser
-ac_add_options --enable-official-branding
-ac_add_options --enable-update-channel=release
-ac_add_options --enable-update-packaging
deleted file mode 100644
--- a/mozilla2/macosx64/mozilla-release/xulrunner/mozconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-. $topsrcdir/build/macosx/universal/mozconfig
-
-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
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
deleted file mode 100644
--- a/mozilla2/macosx64/try/debug/mozconfig
+++ /dev/null
@@ -1,25 +0,0 @@
-ac_add_options --disable-optimize
-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"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-
-if [ -f $topsrcdir/mozconfig-extra ] ; then
- . $topsrcdir/mozconfig-extra
-fi
-if [ -f $topsrcdir/mozconfig-extra-macosx64 ] ; then
- . $topsrcdir/mozconfig-extra-macosx64
-fi
deleted file mode 100644
--- a/mozilla2/macosx64/try/nightly/mozconfig
+++ /dev/null
@@ -1,27 +0,0 @@
-. $topsrcdir/build/macosx/universal/mozconfig
-
-ac_add_options --enable-application=browser
-ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --enable-tests
-ac_add_options --disable-install-strip
-ac_add_options --disable-auto-deps
-
-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
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-if [ -f $topsrcdir/mozconfig-extra ] ; then
- . $topsrcdir/mozconfig-extra
-fi
-if [ -f $topsrcdir/mozconfig-extra-macosx64 ] ; then
- . $topsrcdir/mozconfig-extra-macosx64
-fi
deleted file mode 100644
--- a/mozilla2/macosx64/ux/debug/mozconfig
+++ /dev/null
@@ -1,17 +0,0 @@
-ac_add_options --disable-optimize
-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"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/mozilla2/macosx64/ux/nightly/mozconfig
+++ /dev/null
@@ -1,20 +0,0 @@
-. $topsrcdir/build/macosx/universal/mozconfig
-
-ac_add_options --enable-application=browser
-ac_add_options --enable-update-channel=nightly-ux
-ac_add_options --enable-update-packaging
-ac_add_options --enable-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
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
deleted file mode 100644
--- a/mozilla2/public_html/buildbot.css
+++ /dev/null
@@ -1,64 +0,0 @@
-body {
- background: url("http://www.mozilla.org/images/mozilla-banner.gif")
- no-repeat top left;
- font-family: Verdana, Courier, sans-sarif;
- font-size: 80%;
- padding-top: 80px;
-}
-
-a:link, a:visited {
- color: #000;
-}
-
-td.Event, td.BuildStep, td.Activity, td.Change, td.Time, td.Builder, td.LastBuild {
- border: 1px solid #777;
-}
-
-td.Event, td.Change, td.Time, td.Builder {
- background-color: #F3F3F3;
-}
-
-td.green {
- background-color: #72ff75;
-}
-
-.table {
- /* border-spacing: 2px; */
- border-spacing: 0px;
- width: 1%;
- border-collapse: seperate;
-}
-
-td {
- padding: 0.5ex 1ex;
- text-align: center;
- border: 1px solid #DDD;
-}
-
-/* Activity states */
-.idle {
- background-color: #F3F3F3;
-}
-
-/* LastBuild, BuildStep states */
-.success {
- background-color: #72ff75;
-}
-.failure {
- background-color: red;
-}
-.warnings {
- background-color: orange;
-}
-.exception {
- background-color: #c000c0;
-}
-.start,.running {
- background-color: yellow;
-}
-
-/* color trunk/branch builder links differently */
-
-.Builder a[href*="trunk"] {
- color: #05e;
-}deleted file mode 100644
--- a/mozilla2/win32/comm-beta/release/l10n-mozconfig
+++ /dev/null
@@ -1,11 +0,0 @@
-ac_add_options --enable-application=mail
-ac_add_options --enable-update-channel=beta
-ac_add_options --enable-update-packaging
-ac_add_options --enable-official-branding
-ac_add_options --with-l10n-base=`pwd`/../../mozilla-beta
-ac_add_options --enable-calendar
-
-# Run client.py
-mk_add_options CLIENT_PY_ARGS="--hg-options='--time' --skip-chatzilla --skip-comm --skip-inspector --skip-venkman --tinderbox-print --comm-rev=${COMM_REV} --mozilla-rev=${MOZILLA_REV}"
-mk_add_options ALWAYS_RUN_CLIENT_PY=1
-deleted file mode 100644
--- a/mozilla2/win32/comm-beta/release/mozconfig
+++ /dev/null
@@ -1,18 +0,0 @@
-ac_add_options --enable-application=mail
-ac_add_options --enable-update-channel=beta
-ac_add_options --enable-update-packaging
-ac_add_options --enable-jemalloc
-ac_add_options --enable-tests
-ac_add_options --enable-official-branding
-ac_add_options --enable-calendar
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# Run client.py
-# don't use hgtool here, as the source tarball builders don't clone the scripts repo.
-mk_add_options CLIENT_PY_ARGS="--hg-options='--time' --hgtool=../tools/buildfarm/utils/hgtool.py --skip-chatzilla --skip-comm --skip-inspector --skip-venkman --tinderbox-print --comm-rev=${COMM_REV} --mozilla-rev=${MOZILLA_REV}"
-mk_add_options ALWAYS_RUN_CLIENT_PY=1deleted file mode 100644
--- a/mozilla2/win32/comm-esr10/release/l10n-mozconfig
+++ /dev/null
@@ -1,10 +0,0 @@
-ac_add_options --enable-application=mail
-ac_add_options --enable-update-channel=esr
-ac_add_options --enable-update-packaging
-ac_add_options --enable-official-branding
-ac_add_options --with-l10n-base=`pwd`/../../mozilla-release
-
-# Run client.py
-mk_add_options CLIENT_PY_ARGS="--hg-options='--time' --skip-chatzilla --skip-comm --skip-inspector --skip-venkman --tinderbox-print --comm-rev=${COMM_REV} --mozilla-rev=${MOZILLA_REV}"
-mk_add_options ALWAYS_RUN_CLIENT_PY=1
-deleted file mode 100644
--- a/mozilla2/win32/comm-esr10/release/mozconfig
+++ /dev/null
@@ -1,17 +0,0 @@
-ac_add_options --enable-application=mail
-ac_add_options --enable-update-channel=esr
-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
-
-# Run client.py
-# don't use hgtool here, as the source tarball builders don't clone the scripts repo.
-mk_add_options CLIENT_PY_ARGS="--hg-options='--time' --hgtool=../tools/buildfarm/utils/hgtool.py --skip-chatzilla --skip-comm --skip-inspector --skip-venkman --tinderbox-print --comm-rev=${COMM_REV} --mozilla-rev=${MOZILLA_REV}"
-mk_add_options ALWAYS_RUN_CLIENT_PY=1deleted file mode 100644
--- a/mozilla2/win32/comm-release/release/l10n-mozconfig
+++ /dev/null
@@ -1,11 +0,0 @@
-ac_add_options --enable-application=mail
-ac_add_options --enable-update-channel=release
-ac_add_options --enable-update-packaging
-ac_add_options --enable-official-branding
-ac_add_options --with-l10n-base=`pwd`/../../mozilla-release
-ac_add_options --enable-calendar
-
-# Run client.py
-mk_add_options CLIENT_PY_ARGS="--hg-options='--time' --skip-chatzilla --skip-comm --skip-inspector --skip-venkman --tinderbox-print --comm-rev=${COMM_REV} --mozilla-rev=${MOZILLA_REV}"
-mk_add_options ALWAYS_RUN_CLIENT_PY=1
-deleted file mode 100644
--- a/mozilla2/win32/comm-release/release/mozconfig
+++ /dev/null
@@ -1,18 +0,0 @@
-ac_add_options --enable-application=mail
-ac_add_options --enable-update-channel=release
-ac_add_options --enable-update-packaging
-ac_add_options --enable-jemalloc
-ac_add_options --enable-tests
-ac_add_options --enable-official-branding
-ac_add_options --enable-calendar
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# Run client.py
-# don't use hgtool here, as the source tarball builders don't clone the scripts repo.
-mk_add_options CLIENT_PY_ARGS="--hg-options='--time' --hgtool=../tools/buildfarm/utils/hgtool.py --skip-chatzilla --skip-comm --skip-inspector --skip-venkman --tinderbox-print --comm-rev=${COMM_REV} --mozilla-rev=${MOZILLA_REV}"
-mk_add_options ALWAYS_RUN_CLIENT_PY=1deleted file mode 100644
--- a/mozilla2/win32/generic/debug/mozconfig
+++ /dev/null
@@ -1,21 +0,0 @@
-ac_add_options --enable-application=browser
-ac_add_options --enable-jemalloc
-ac_add_options --disable-optimize
-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
-
-mk_add_options MOZ_MAKE_FLAGS=-j1
-if [ -f $topsrcdir/mozconfig-extra ] ; then
- . $topsrcdir/mozconfig-extra
-fi
-if [ -f $topsrcdir/mozconfig-extra-win32 ] ; then
- . $topsrcdir/mozconfig-extra-win32
-fi
deleted file mode 100644
--- a/mozilla2/win32/generic/nightly/mozconfig
+++ /dev/null
@@ -1,22 +0,0 @@
-# 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=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --enable-jemalloc
-ac_add_options --enable-tests
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-mk_add_options MOZ_MAKE_FLAGS=-j1
-if [ -f $topsrcdir/mozconfig-extra ] ; then
- . $topsrcdir/mozconfig-extra
-fi
-if [ -f $topsrcdir/mozconfig-extra-win32 ] ; then
- . $topsrcdir/mozconfig-extra-win32
-fi
deleted file mode 100644
--- a/mozilla2/win32/include/vista-sdk-mozconfig
+++ /dev/null
@@ -1,11 +0,0 @@
-# Use the Windows Vista SDK
-export INCLUDE="c:/Program Files/Microsoft SDKs/Windows/v6.0A/include;c:/Program Files/Microsoft SDKs/Windows/v6.0A/include/atl;d:/msvs8/VC/ATLMFC/INCLUDE;d:/msvs8/VC/INCLUDE;d:/msvs8/VC/PlatformSDK/include;"
-export LIB="c:/Program Files/Microsoft SDKs/Windows/v6.0A/lib;d:/msvs8/VC/ATLMFC/LIB;d:/msvs8/VC/LIB;d:/msvs8/VC/PlatformSDK/lib;d:/msvs8/SDK/v2.0/lib;;d:/mozilla-build/atlthunk_compat"
-export PATH="/c/Program Files/Microsoft SDKs/Windows/v6.0A/bin:$PATH"
-export SDKDIR="c:/Program Files/Microsoft SDKs/Windows/v6.0A"
-echo "Using the Windows Vista SDK, real INCLUDE, LIB, PATH and SDKDIR are below"
-echo "INCLUDE: $INCLUDE"
-echo "LIB: $LIB"
-echo "PATH: $PATH"
-echo "SDKDIR: $SDKDIR"
-
deleted file mode 100644
--- a/mozilla2/win32/mozilla-aurora/debug/mozconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-ac_add_options --enable-application=browser
-ac_add_options --enable-jemalloc
-ac_add_options --disable-optimize
-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
-
-mk_add_options MOZ_MAKE_FLAGS=-j1
deleted file mode 100644
--- a/mozilla2/win32/mozilla-aurora/nightly/mozconfig
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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=aurora
-ac_add_options --enable-update-packaging
-ac_add_options --enable-jemalloc
-ac_add_options --enable-tests
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-export MOZ_TELEMETRY_REPORTING=1
-
-mk_add_options MOZ_MAKE_FLAGS=-j1
deleted file mode 100644
--- a/mozilla2/win32/mozilla-aurora/release/l10n-mozconfig
+++ /dev/null
@@ -1,5 +0,0 @@
-ac_add_options --enable-application=browser
-ac_add_options --enable-update-channel=beta
-ac_add_options --enable-update-packaging
-ac_add_options --enable-official-branding
-ac_add_options --with-l10n-base=../../l10n-central
deleted file mode 100644
--- a/mozilla2/win32/mozilla-aurora/release/mozconfig
+++ /dev/null
@@ -1,18 +0,0 @@
-# for pgo
-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=beta
-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
-
-export MOZ_TELEMETRY_REPORTING=1
deleted file mode 100644
--- a/mozilla2/win32/mozilla-aurora/xulrunner/mozconfig
+++ /dev/null
@@ -1,10 +0,0 @@
-export MOZILLA_OFFICIAL=1
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-
-ac_add_options --enable-application=xulrunner
-ac_add_options --enable-jemalloc
-ac_add_options --disable-tests
-
-mk_add_options MOZ_MAKE_FLAGS=-j1
deleted file mode 100644
--- a/mozilla2/win32/mozilla-beta/debug/mozconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-ac_add_options --enable-application=browser
-ac_add_options --enable-jemalloc
-ac_add_options --disable-optimize
-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
-
-mk_add_options MOZ_MAKE_FLAGS=-j1
deleted file mode 100644
--- a/mozilla2/win32/mozilla-beta/nightly/mozconfig
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --enable-jemalloc
-ac_add_options --enable-tests
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-export MOZ_TELEMETRY_REPORTING=1
-
-mk_add_options MOZ_MAKE_FLAGS=-j1
deleted file mode 100644
--- a/mozilla2/win32/mozilla-beta/release/l10n-mozconfig
+++ /dev/null
@@ -1,16 +0,0 @@
-. "$topsrcdir/browser/config/mozconfigs/common"
-
-ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-update-packaging
-ac_add_options --with-l10n-base=..
-ac_add_options --with-windows-version=601
-
-export MOZILLA_OFFICIAL=1
-
-if test "$PROCESSOR_ARCHITECTURE" = "AMD64" -o "$PROCESSOR_ARCHITEW6432" = "AMD64"; then
- . $topsrcdir/build/win32/mozconfig.vs2010-win64
-else
- . $topsrcdir/build/win32/mozconfig.vs2010
-fi
-
-. "$topsrcdir/build/mozconfig.common.override"deleted file mode 100644
--- a/mozilla2/win32/mozilla-beta/release/mozconfig
+++ /dev/null
@@ -1,18 +0,0 @@
-# for pgo
-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=beta
-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
-
-export MOZ_TELEMETRY_REPORTING=1
deleted file mode 100644
--- a/mozilla2/win32/mozilla-beta/xulrunner/mozconfig
+++ /dev/null
@@ -1,10 +0,0 @@
-export MOZILLA_OFFICIAL=1
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-
-ac_add_options --enable-application=xulrunner
-ac_add_options --enable-jemalloc
-ac_add_options --disable-tests
-
-mk_add_options MOZ_MAKE_FLAGS=-j1
deleted file mode 100644
--- a/mozilla2/win32/mozilla-central/debug/mozconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-ac_add_options --enable-application=browser
-ac_add_options --enable-jemalloc
-ac_add_options --disable-optimize
-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
-
-mk_add_options MOZ_MAKE_FLAGS=-j1
deleted file mode 100644
--- a/mozilla2/win32/mozilla-central/nightly/mozconfig
+++ /dev/null
@@ -1,21 +0,0 @@
-# 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=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --enable-jemalloc
-ac_add_options --enable-tests
-
-# Mozilla-Central 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
-
-export MOZ_TELEMETRY_REPORTING=1
-
-mk_add_options MOZ_MAKE_FLAGS=-j1
deleted file mode 100644
--- a/mozilla2/win32/mozilla-central/release/l10n-mozconfig
+++ /dev/null
@@ -1,5 +0,0 @@
-ac_add_options --enable-application=browser
-ac_add_options --enable-update-channel=beta
-ac_add_options --enable-update-packaging
-ac_add_options --enable-official-branding
-ac_add_options --with-l10n-base=../../l10n-central
deleted file mode 100644
--- a/mozilla2/win32/mozilla-central/release/mozconfig
+++ /dev/null
@@ -1,18 +0,0 @@
-# for pgo
-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=beta
-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
-
-export MOZ_TELEMETRY_REPORTING=1
deleted file mode 100644
--- a/mozilla2/win32/mozilla-central/xulrunner/mozconfig
+++ /dev/null
@@ -1,10 +0,0 @@
-export MOZILLA_OFFICIAL=1
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-
-ac_add_options --enable-application=xulrunner
-ac_add_options --enable-jemalloc
-ac_add_options --disable-tests
-
-mk_add_options MOZ_MAKE_FLAGS=-j1
deleted file mode 100644
--- a/mozilla2/win32/mozilla-esr10/release/l10n-mozconfig
+++ /dev/null
@@ -1,5 +0,0 @@
-ac_add_options --with-l10n-base=../../mozilla-release
-ac_add_options --enable-application=browser
-ac_add_options --enable-update-channel=esr
-ac_add_options --enable-update-packaging
-ac_add_options --enable-official-branding
deleted file mode 100644
--- a/mozilla2/win32/mozilla-esr10/xulrunner/mozconfig
+++ /dev/null
@@ -1,10 +0,0 @@
-export MOZILLA_OFFICIAL=1
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-
-ac_add_options --enable-application=xulrunner
-ac_add_options --enable-jemalloc
-ac_add_options --disable-tests
-
-mk_add_options MOZ_MAKE_FLAGS=-j1
deleted file mode 100644
--- a/mozilla2/win32/mozilla-release/debug/mozconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-ac_add_options --enable-application=browser
-ac_add_options --enable-jemalloc
-ac_add_options --disable-optimize
-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
-
-mk_add_options MOZ_MAKE_FLAGS=-j1
deleted file mode 100644
--- a/mozilla2/win32/mozilla-release/release/l10n-mozconfig
+++ /dev/null
@@ -1,5 +0,0 @@
-ac_add_options --with-l10n-base=..
-ac_add_options --enable-application=browser
-ac_add_options --enable-update-channel=release
-ac_add_options --enable-update-packaging
-ac_add_options --enable-official-branding
deleted file mode 100644
--- a/mozilla2/win32/mozilla-release/xulrunner/mozconfig
+++ /dev/null
@@ -1,10 +0,0 @@
-export MOZILLA_OFFICIAL=1
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-
-ac_add_options --enable-application=xulrunner
-ac_add_options --enable-jemalloc
-ac_add_options --disable-tests
-
-mk_add_options MOZ_MAKE_FLAGS=-j1
deleted file mode 100644
--- a/mozilla2/win32/try/debug/mozconfig
+++ /dev/null
@@ -1,21 +0,0 @@
-ac_add_options --enable-application=browser
-ac_add_options --enable-jemalloc
-ac_add_options --disable-optimize
-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
-
-mk_add_options MOZ_MAKE_FLAGS=-j1
-if [ -f $topsrcdir/mozconfig-extra ] ; then
- . $topsrcdir/mozconfig-extra
-fi
-if [ -f $topsrcdir/mozconfig-extra-win32 ] ; then
- . $topsrcdir/mozconfig-extra-win32
-fi
deleted file mode 100644
--- a/mozilla2/win32/try/nightly/mozconfig
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --enable-jemalloc
-ac_add_options --enable-tests
-ac_add_options --disable-auto-deps
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-mk_add_options MOZ_MAKE_FLAGS=-j1
-if [ -f $topsrcdir/mozconfig-extra ] ; then
- . $topsrcdir/mozconfig-extra
-fi
-if [ -f $topsrcdir/mozconfig-extra-win32 ] ; then
- . $topsrcdir/mozconfig-extra-win32
-fi
deleted file mode 100644
--- a/mozilla2/win32/ux/debug/mozconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-ac_add_options --enable-application=browser
-ac_add_options --enable-jemalloc
-ac_add_options --disable-optimize
-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
-
-mk_add_options MOZ_MAKE_FLAGS=-j1
deleted file mode 100644
--- a/mozilla2/win32/ux/nightly/mozconfig
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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=nightly-ux
-ac_add_options --enable-update-packaging
-ac_add_options --enable-jemalloc
-ac_add_options --enable-tests
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-mk_add_options MOZ_MAKE_FLAGS=-j1
deleted file mode 100644
--- a/mozilla2/win64/generic/debug/mozconfig
+++ /dev/null
@@ -1,14 +0,0 @@
-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 --disable-optimize
-ac_add_options --enable-debug
-ac_add_options --enable-libxul
-ac_add_options --enable-trace-malloc
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-mk_add_options MOZ_MAKE_FLAGS=-j1
deleted file mode 100644
--- a/mozilla2/win64/generic/nightly/mozconfig
+++ /dev/null
@@ -1,16 +0,0 @@
-ac_add_options --target=x86_64-pc-mingw32
-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=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --enable-jemalloc
-ac_add_options --enable-debug-symbols
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-mk_add_options MOZ_MAKE_FLAGS=-j1
deleted file mode 100644
--- a/mozilla2/win64/generic/xulrunner/mozconfig
+++ /dev/null
@@ -1,11 +0,0 @@
-ac_add_options --target=x86_64-pc-mingw32
-ac_add_options --host=x86_64-pc-mingw32
-
-export MOZILLA_OFFICIAL=1
-
-ac_add_options --enable-application=xulrunner
-ac_add_options --enable-jemalloc
-ac_add_options --disable-tests
-ac_add_options --enable-debug-symbols
-
-mk_add_options MOZ_MAKE_FLAGS=-j1
deleted file mode 100644
--- a/mozilla2/win64/mozilla-2.0/debug/mozconfig
+++ /dev/null
@@ -1,14 +0,0 @@
-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 --disable-optimize
-ac_add_options --enable-debug
-ac_add_options --enable-libxul
-ac_add_options --enable-trace-malloc
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-mk_add_options MOZ_MAKE_FLAGS=-j1
deleted file mode 100644
--- a/mozilla2/win64/mozilla-2.0/nightly/mozconfig
+++ /dev/null
@@ -1,16 +0,0 @@
-ac_add_options --target=x86_64-pc-mingw32
-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=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --enable-jemalloc
-ac_add_options --enable-debug-symbols
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-mk_add_options MOZ_MAKE_FLAGS=-j1
deleted file mode 100644
--- a/mozilla2/win64/mozilla-2.0/xulrunner/mozconfig
+++ /dev/null
@@ -1,12 +0,0 @@
-ac_add_options --target=x86_64-pc-mingw32
-ac_add_options --host=x86_64-pc-mingw32
-
-export MOZILLA_OFFICIAL=1
-
-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
deleted file mode 100644
--- a/mozilla2/win64/mozilla-aurora/debug/mozconfig
+++ /dev/null
@@ -1,14 +0,0 @@
-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 --disable-optimize
-ac_add_options --enable-debug
-ac_add_options --enable-libxul
-ac_add_options --enable-trace-malloc
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-mk_add_options MOZ_MAKE_FLAGS=-j1
deleted file mode 100644
--- a/mozilla2/win64/mozilla-aurora/nightly/mozconfig
+++ /dev/null
@@ -1,18 +0,0 @@
-ac_add_options --target=x86_64-pc-mingw32
-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=aurora
-ac_add_options --enable-update-packaging
-ac_add_options --enable-jemalloc
-ac_add_options --enable-debug-symbols
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-export MOZ_TELEMETRY_REPORTING=1
-
-mk_add_options MOZ_MAKE_FLAGS=-j1
deleted file mode 100644
--- a/mozilla2/win64/mozilla-aurora/xulrunner/mozconfig
+++ /dev/null
@@ -1,11 +0,0 @@
-ac_add_options --target=x86_64-pc-mingw32
-ac_add_options --host=x86_64-pc-mingw32
-
-export MOZILLA_OFFICIAL=1
-
-ac_add_options --enable-application=xulrunner
-ac_add_options --enable-jemalloc
-ac_add_options --disable-tests
-ac_add_options --enable-debug-symbols
-
-mk_add_options MOZ_MAKE_FLAGS=-j1
deleted file mode 100644
--- a/mozilla2/win64/mozilla-beta/debug/mozconfig
+++ /dev/null
@@ -1,14 +0,0 @@
-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 --disable-optimize
-ac_add_options --enable-debug
-ac_add_options --enable-libxul
-ac_add_options --enable-trace-malloc
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-mk_add_options MOZ_MAKE_FLAGS=-j1
deleted file mode 100644
--- a/mozilla2/win64/mozilla-beta/nightly/mozconfig
+++ /dev/null
@@ -1,18 +0,0 @@
-ac_add_options --target=x86_64-pc-mingw32
-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=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --enable-jemalloc
-ac_add_options --enable-debug-symbols
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-export MOZ_TELEMETRY_REPORTING=1
-
-mk_add_options MOZ_MAKE_FLAGS=-j1
deleted file mode 100644
--- a/mozilla2/win64/mozilla-beta/xulrunner/mozconfig
+++ /dev/null
@@ -1,11 +0,0 @@
-ac_add_options --target=x86_64-pc-mingw32
-ac_add_options --host=x86_64-pc-mingw32
-
-export MOZILLA_OFFICIAL=1
-
-ac_add_options --enable-application=xulrunner
-ac_add_options --enable-jemalloc
-ac_add_options --disable-tests
-ac_add_options --enable-debug-symbols
-
-mk_add_options MOZ_MAKE_FLAGS=-j1
deleted file mode 100644
--- a/mozilla2/win64/mozilla-central/debug/mozconfig
+++ /dev/null
@@ -1,14 +0,0 @@
-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 --disable-optimize
-ac_add_options --enable-debug
-ac_add_options --enable-libxul
-ac_add_options --enable-trace-malloc
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-mk_add_options MOZ_MAKE_FLAGS=-j1
deleted file mode 100644
--- a/mozilla2/win64/mozilla-central/nightly/mozconfig
+++ /dev/null
@@ -1,21 +0,0 @@
-ac_add_options --target=x86_64-pc-mingw32
-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=nightly
-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
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-export MOZ_TELEMETRY_REPORTING=1
-
-mk_add_options MOZ_MAKE_FLAGS=-j1
deleted file mode 100644
--- a/mozilla2/win64/mozilla-central/xulrunner/mozconfig
+++ /dev/null
@@ -1,11 +0,0 @@
-ac_add_options --target=x86_64-pc-mingw32
-ac_add_options --host=x86_64-pc-mingw32
-
-export MOZILLA_OFFICIAL=1
-
-ac_add_options --enable-application=xulrunner
-ac_add_options --enable-jemalloc
-ac_add_options --disable-tests
-ac_add_options --enable-debug-symbols
-
-mk_add_options MOZ_MAKE_FLAGS=-j1
deleted file mode 100644
--- a/mozilla2/win64/try/debug/mozconfig
+++ /dev/null
@@ -1,20 +0,0 @@
-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 --disable-optimize
-ac_add_options --enable-debug
-ac_add_options --enable-libxul
-ac_add_options --enable-trace-malloc
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-mk_add_options MOZ_MAKE_FLAGS=-j1
-if [ -f $topsrcdir/mozconfig-extra ] ; then
- . $topsrcdir/mozconfig-extra
-fi
-if [ -f $topsrcdir/mozconfig-extra-win64 ] ; then
- . $topsrcdir/mozconfig-extra-win64
-fi
deleted file mode 100644
--- a/mozilla2/win64/try/nightly/mozconfig
+++ /dev/null
@@ -1,22 +0,0 @@
-ac_add_options --target=x86_64-pc-mingw32
-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=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --enable-jemalloc
-ac_add_options --enable-debug-symbols
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-mk_add_options MOZ_MAKE_FLAGS=-j1
-if [ -f $topsrcdir/mozconfig-extra ] ; then
- . $topsrcdir/mozconfig-extra
-fi
-if [ -f $topsrcdir/mozconfig-extra-win64 ] ; then
- . $topsrcdir/mozconfig-extra-win64
-fi
deleted file mode 100644
--- a/mozilla2/win64/try/xulrunner/mozconfig
+++ /dev/null
@@ -1,17 +0,0 @@
-ac_add_options --target=x86_64-pc-mingw32
-ac_add_options --host=x86_64-pc-mingw32
-
-export MOZILLA_OFFICIAL=1
-
-ac_add_options --enable-application=xulrunner
-ac_add_options --enable-jemalloc
-ac_add_options --disable-tests
-ac_add_options --enable-debug-symbols
-
-mk_add_options MOZ_MAKE_FLAGS=-j1
-if [ -f $topsrcdir/mozconfig-extra ] ; then
- . $topsrcdir/mozconfig-extra
-fi
-if [ -f $topsrcdir/mozconfig-extra-win64 ] ; then
- . $topsrcdir/mozconfig-extra-win64
-fi
deleted file mode 100644
--- a/mozilla2/win64/ux/debug/mozconfig
+++ /dev/null
@@ -1,14 +0,0 @@
-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 --disable-optimize
-ac_add_options --enable-debug
-ac_add_options --enable-libxul
-ac_add_options --enable-trace-malloc
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-mk_add_options MOZ_MAKE_FLAGS=-j1
deleted file mode 100644
--- a/mozilla2/win64/ux/nightly/mozconfig
+++ /dev/null
@@ -1,16 +0,0 @@
-ac_add_options --target=x86_64-pc-mingw32
-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=nightly-ux
-ac_add_options --enable-update-packaging
-ac_add_options --enable-jemalloc
-ac_add_options --enable-debug-symbols
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-mk_add_options MOZ_MAKE_FLAGS=-j1
