"Automated configuration bump, release for firefox 3.0.19build1"

git-svn-id: svn://10.0.0.236/branches/release@259954 18797224-902f-48f8-a5cc-f745e15eee43
"Automated configuration bump, release for firefox 3.0.18build1"
2010-03-13 02:02:11 +00:00 · 2010-02-03 03:05:03 +00:00 · 2009-12-22 12:05:55 +00:00 · 2009-12-22 11:53:54 +00:00 · 2009-12-22 11:47:31 +00:00 · 2009-12-21 23:38:05 +00:00
27 changed files with 2519 additions and 615 deletions
--- a/mozilla/security/tinderlight/config.sh
+++ b/mozilla/security/tinderlight/config.sh
@@ -1,29 +0,0 @@
-#! /bin/bash
-
-#### LOCAL MACHINE SETTINGS ####
-PORT_64_DBG=8543
-PORT_64_OPT=8544
-PORT_32_DBG=8545
-PORT_32_OPT=8546
-if [ "${NSS_TESTS}" = "memtest" ]; then
-    PORT_64_DBG=8547
-    PORT_64_OPT=8548
-    PORT_32_DBG=8549
-    PORT_32_OPT=8550
-fi
-JAVA_HOME_64=/usr/lib/jvm/java-1.6.0-openjdk.x86_64
-JAVA_HOME_32=/usr/lib/jvm/java-1.6.0-openjdk
-
-# example configuration
-case ${HOST} in
-host1) 
-    JAVA_HOME_64=/opt/jdk/1.6.0_01/SunOS64
-    JAVA_HOME_32=/opt/jdk/1.6.0_01/SunOS
-    ;;
-host2)
-    run_bits="32"
-    export NSS_TESTS=memleak
-    NO_JSS=1
-    ;;
-esac
-
--- a/mozilla/security/tinderlight/env.sh
+++ b/mozilla/security/tinderlight/env.sh
@@ -1,72 +0,0 @@
-#! /bin/bash
-
-HOST=$(hostname | cut -d. -f1)
-ARCH=$(uname -s)
-
-ulimit -c unlimited 2> /dev/null
-
-CVSROOT=":pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot"
-
-CVS_TRUNK="mozilla/nsprpub
-mozilla/dbm
-mozilla/security/dbm
-mozilla/security/coreconf
-mozilla/security/nss
-mozilla/security/jss
-r:NSS_3_11_1_RTM:mozilla/security/nss/lib/freebl/ecl/ecl-curve.h"
-
-CVS_STABLE="-r:NSPR_4_6_BRANCH:mozilla/nsprpub
-r:NSS_3_11_BRANCH:mozilla/dbm
-r:NSS_3_11_BRANCH:mozilla/security/dbm
-r:NSS_3_11_BRANCH:mozilla/security/coreconf
-r:NSS_3_11_BRANCH:mozilla/security/nss
-r:JSS_4_2_BRANCH:mozilla/security/jss
-r:NSS_3_11_1_RTM:mozilla/security/nss/lib/freebl/ecl/ecl-curve.h"
-
-export NSS_ENABLE_ECC=1
-export NSS_ECC_MORE_THAN_SUITE_B=1
-export NSPR_LOG_MODULES="pkix:1"
-
-NSS_BUILD_TARGET="clean nss_build_all"
-JSS_BUILD_TARGET="clean all"
-
-CVS=cvs
-MAKE=gmake
-AWK=awk
-PATCH=patch
-
-if [ "${ARCH}" = "SunOS" ]; then
-    AWK=nawk
-    PATCH=gpatch
-    ARCH=SunOS/$(uname -p)
-fi
-
-if [ "${ARCH}" = "Linux" -a -f /etc/system-release ]; then
-   VERSION=`sed -e 's; release ;;' -e 's; (.*)$;;' -e 's;Red Hat Enterprise Linux Server;RHEL;' /etc/system-release`
-   ARCH=Linux/${VERSION}
-   echo ${ARCH}
-fi
-
-MAIL=mail
-TB_SERVER=tinderbox-daemon@tinderbox.mozilla.org
-
-CYCLE_MAX=5
-CYCLE_TIME=60
-
-PORT_32_DBG=8111
-PORT_32_OPT=8222
-PORT_64_DBG=8333
-PORT_64_OPT=8444
-
-#### SOME DEFAULTS, CAN CHANGE LATER ####
-
-run_bits="32 64"
-run_opt="DBG OPT"
-BRANCH="trunk"
-
-### CONFIG.SH CONTAINS CONFIGURATIONS OF ALL MACHINES ###
-
-. config.sh
-
-RUN_BITS="${RUN_BITS:-$run_bits}"
-RUN_OPT="${RUN_OPT:-$run_opt}"
--- a/mozilla/security/tinderlight/tinder.sh
+++ b/mozilla/security/tinderlight/tinder.sh
@@ -1,514 +0,0 @@
-#! /bin/bash
-
-proc_args()
-{
-    while [ -n "$1" ]; do
-        OPT=$(echo $1 | cut -d= -f1)
-        VAL=$(echo $1 | cut -d= -f2)
-
-        case $OPT in
-            "--bits")
-                RUN_BITS="${VAL}"
-                ;;
-            "--opt")
-                RUN_OPT="${VAL}"
-                ;;
-            "--once")
-                RUN_ONCE=1
-                ;;
-            "--cycles")
-                RUN_CYCLES=1
-                ;;
-            "--nomail")
-                NO_MAIL=1
-                ;;
-            "--nocvs")
-                NO_CVS=1
-                ;;
-            "--nobuild")
-                NO_BUILD=1
-                ;;
-            "--notest")
-                NO_TEST=1
-                ;;
-            "--nomove")
-                NO_MOVE=1
-                ;;
-            "--nojss")
-                NO_JSS=1
-                ;;
-	    "--pidfile")
-		echo " $$" >>  ${VAL}
-		;;
-            "--memtest")
-                NSS_TESTS="memtest"
-                ;;
-            "--nojsssign")
-                NO_JSS_SIGN=1
-                ;;
-            *)
-                echo "Usage: $0 [--bits=BITS] [--opt=OPT] [--once] ..."
-                echo "    --bits      - bits mode (32 or 64)"
-                echo "    --opt       - debug/opt mode (DBG or OPT)"
-                echo "    --once      - run only once"
-                echo "    --cycles    - run cycles (pkix, shared db,..) in separate runs"
-                echo "    --memtest   - run the memory leak tests"
-                echo "    --nomail    - don't send e-mail"
-                echo "    --nocvs     - skip CVS checkout (work with old data)"
-                echo "    --nobuild   - skip build"
-                echo "    --notest    - skip testing"
-                echo "    --nomove    - don't move old data directory after testing"
-                echo "    --nojss     - don't build/test JSS (NSS only)"
-                echo "    --nojsssign - try to sign jss"
-                exit 0
-                ;;
-        esac 
-
-        shift
-    done
-}
-
-set_env()
-{
-    TESTDIR=$(pwd)
-    TESTSET=standard
-    MEM_LEAK=
-    if [ "${NSS_TESTS}" = "memleak" ]; then
-	TESTSET=memleak
-	MEM_LEAK="_MEMLEAK"
-    fi
-    DATADIR=$(pwd)$(echo "/data/${HOST}_${RUN_BITS}_${RUN_OPT}${MEM_LEAK}" | sed "s/ /_/g")
-    LOG_ALL="${DATADIR}/all.log"
-    LOG_TMP="${DATADIR}/tmp.log"
-
-    if [ "${BRANCH}" = "stable" ]; then 
-        CVS_LIST="${CVS_STABLE}"
-        TB_TREE="NSS-Stable-Branch"
-    else
-        CVS_LIST="${CVS_TRUNK}"
-        TB_TREE="NSS"
-    fi
-}
-
-print_log()
-{
-    DATE=$(date "+TB [%Y-%m-%d %H:%M:%S]")
-    echo "${DATE} $*"
-    echo "${DATE} $*" >> ${LOG_ALL}
-}
-
-print_result()
-{
-    TESTNAME=$1
-    RET=$2
-    EXP=$3
-
-    if [ ${RET} -eq ${EXP} ]; then
-        print_log "${TESTNAME} PASSED"
-    else
-        print_log "${TESTNAME} FAILED"
-    fi
-}
-
-print_env()
-{
-    print_log "######## Environment variables ########"
-
-    uname -a | tee -a ${LOG_ALL}
-    if [ -e "/etc/redhat-release" ]; then
-        cat "/etc/redhat-release" | tee -a ${LOG_ALL}
-    fi
-    env | tee -a ${LOG_ALL}
-}
-
-print_mail_header()
-{
-    TREE=$1
-    BUILD_DATE=$2
-    STATUS=$3
-    BUILD=$4
-
-    echo
-    echo "tinderbox: tree: ${TREE}"
-    echo "tinderbox: builddate: ${BUILD_DATE}"
-    echo "tinderbox: status: ${STATUS}"
-    echo "tinderbox: build: ${BUILD}"
-    echo "tinderbox: errorparser: unix"
-    echo "tinderbox: buildfamily: unix"
-    echo "tinderbox: END"
-    echo
-}
-
-mail_start()
-{
-    print_mail_header "${TB_TREE}" "${BUILD_DATE}" building "${BRANCH} ${TESTSET} ${HOST} ${ARCH} ${RUN_BITS}bit ${RUN_OPT}" > ${LOG_TMP}
-    ${MAIL} ${TB_SERVER} < ${LOG_TMP}
-}
-
-mail_finish()
-{
-    STATUS=$1
-
-    print_mail_header "${TB_TREE}" "${BUILD_DATE}" "${STATUS}" "${BRANCH} ${TESTSET} ${HOST} ${ARCH} ${RUN_BITS}bit ${RUN_OPT}" > ${LOG_TMP}
-    cat ${LOG_ALL} >> ${LOG_TMP}
-    ${MAIL} ${TB_SERVER} < ${LOG_TMP}
-}
-
-cvs_checkout()
-{
-    print_log "######## CVS checkout ########"
-
-    print_log "$ cd ${DATADIR}"
-    cd ${DATADIR}
-
-    for CVS_FILE in ${CVS_LIST}; do
-        CVS_FILE=$(echo ${CVS_FILE} | sed "s/:/ /g")
-
-        print_log "$ ${CVS} -d ${CVSROOT} co -A ${CVS_FILE}"
-        ${CVS} -d ${CVSROOT} co -A ${CVS_FILE} >> ${LOG_ALL} 2>&1
-        RET=$?
-        print_result "CVS checkout ${CVS_FILE}" ${RET} 0
-        [ ${RET} -eq 0 ] || return ${RET}
-    done
-
-    print_log "$ ${CVS} -d ${CVSROOT} stat mozilla" 
-    ${CVS} -d ${CVSROOT} stat mozilla > ${LOG_TMP} 2>&1
-    RET=$?
-    print_result "CVS stat mozilla" ${RET} 0
-    [ ${RET} -eq 0 ] || return ${RET}
-
-    if [ -f ${DATADIR}.cvs ]; then
-        diff -U4 ${DATADIR}.cvs ${LOG_TMP} | grep -i "Repository revision:" >> ${LOG_ALL}
-        if [ $? -eq 0 ]; then 
-            print_log "CVS change detected" 
-            echo "TinderboxPrint:CVS change" >> ${LOG_ALL}
-        fi
-    fi
-
-    mv ${LOG_TMP} ${DATADIR}.cvs
-
-    return 0
-}
-
-apply_patches()
-{
-    [ -z "${NSS_PATCH}" ] && return 0
-
-    print_log "######## Applying patches ########"
-    echo "TinderboxPrint:Using patches" >> ${LOG_ALL}
-
-    for PDATA in ${NSS_PATCH}; do
-        PDIR=$(echo ${PDATA} | cut -d: -f1)
-        PFILE=$(echo ${PDATA} | cut -d: -f2)
-       
-        cd ${DATADIR}/${PDIR} 
-        ${PATCH} -p0 < ${PFILE} >> ${LOG_ALL} 2>&1
-        RET=$?
-        print_result "Applying patch ${PFILE}" ${RET} 0
-        [ ${RET} -eq 0 ] || return ${RET}
-    done
-
-    return 0
-}
-
-set_cycle()
-{
-    BITS=$1
-    OPT=$2
-    CYCLE_CNT=$3
-
-    if [ "${BITS}" = "64" ]; then
-        USE_64=1
-        JAVA_HOME=${JAVA_HOME_64} 
-        PORT_DBG=${PORT_64_DBG}
-        PORT_OPT=${PORT_64_OPT}
-    else
-        USE_64=
-        JAVA_HOME=${JAVA_HOME_32} 
-        PORT_DBG=${PORT_32_DBG}
-        PORT_OPT=${PORT_32_OPT}
-    fi
-    export USE_64
-    export JAVA_HOME
-
-    BUILD_OPT=
-    if [ "${OPT}" = "OPT" ]; then
-        BUILD_OPT=1
-        XPCLASS=xpclass.jar
-        PORT=${PORT_OPT}
-    else
-        BUILD_OPT=
-        XPCLASS=xpclass_dbg.jar
-        PORT=${PORT_DBG}
-    fi
-    export BUILD_OPT
-
-    PORT_JSS_SERVER=$(expr ${PORT} + 20)
-    PORT_JSSE_SERVER=$(expr ${PORT} + 40)
-
-    export PORT
-    export PORT_JSS_SERVER
-    export PORT_JSSE_SERVER
-
-    [ -z ${RUN_CYCLES} ] && return 0
-
-    CYCLE_ID=$(expr ${CYCLE_CNT} % 4)
-    case ${CYCLE_ID} in
-        0)
-            export NSS_CYCLES=standard
-            CYCLE_TEXT="Standard"
-            ;;
-        1)
-            export NSS_CYCLES=pkix
-            CYCLE_TEXT="PKIX"
-            ;;
-        2)
-            export NSS_CYCLES=upgradedb
-            CYCLE_TEXT="Upgrade DB"
-            ;;
-        3)
-            export NSS_CYCLES=sharedb
-            CYCLE_TEXT="Shared DB"
-            ;;
-    esac
-}
-
-build_nss()
-{
-    print_log "######## NSS - build - ${BITS} bits - ${OPT} ########"
-
-    print_log "$ cd ${DATADIR}/mozilla/security/nss"
-    cd ${DATADIR}/mozilla/security/nss
-
-    print_log "$ ${MAKE} ${NSS_BUILD_TARGET}"
-    ${MAKE} ${NSS_BUILD_TARGET} >> ${LOG_ALL} 2>&1
-    RET=$?
-    print_result "NSS - build - ${BITS} bits - ${OPT}" ${RET} 0
-    [ ${RET} -eq 0 ] || return ${RET}
-
-    return 0
-}
-
-build_jss()
-{
-    print_log "######## JSS - build - ${BITS} bits - ${OPT} ########"
-
-    print_log "$ cd ${DATADIR}/mozilla/security/jss"
-    cd ${DATADIR}/mozilla/security/jss
-
-    print_log "$ ${MAKE} ${JSS_BUILD_TARGET}"
-    ${MAKE} ${JSS_BUILD_TARGET} >> ${LOG_ALL} 2>&1
-    RET=$?
-    print_result "JSS build - ${BITS} bits - ${OPT}" ${RET} 0
-    [ ${RET} -eq 0 ] || return ${RET}
-
-    print_log "$ cd ${DATADIR}/mozilla/dist"
-    cd ${DATADIR}/mozilla/dist
-
-    if [ -z "${NO_JSS_SIGN}" ]; then
-	print_log "cat ${TESTDIR}/keystore.pw | ${JAVA_HOME}/bin/jarsigner -keystore ${TESTDIR}/keystore -internalsf ${XPCLASS} jssdsa"
-	cat ${TESTDIR}/keystore.pw | ${JAVA_HOME}/bin/jarsigner -keystore ${TESTDIR}/keystore -internalsf ${XPCLASS} jssdsa >> ${LOG_ALL} 2>&1
-	RET=$?
-	print_result "JSS - sign JAR files - ${BITS} bits - ${OPT}" ${RET} 0
-	[ ${RET} -eq 0 ] || return ${RET}
-    fi
-    print_log "${JAVA_HOME}/bin/jarsigner -verify -certs ${XPCLASS}"
-    ${JAVA_HOME}/bin/jarsigner -verify -certs ${XPCLASS} >> ${LOG_ALL} 2>&1
-    RET=$?
-    print_result "JSS - verify JAR files - ${BITS} bits - ${OPT}" ${RET} 0
-    [ ${RET} -eq 0 ] || return ${RET}
-
-    return 0
-}
-
-test_nss()
-{
-    print_log "######## NSS - tests - ${BITS} bits - ${OPT} ########"
-
-    [ -n ${RUN_CYCLES} ] && echo "TinderboxPrint:${CYCLE_TEXT}" >> ${LOG_ALL}
-
-    print_log "$ cd ${DATADIR}/mozilla/security/nss/tests"
-    cd ${DATADIR}/mozilla/security/nss/tests
-
-    print_log "$ ./all.sh"
-    ./all.sh > ${LOG_TMP} 2>&1 
-    cat ${LOG_TMP} >> ${LOG_ALL}
-
-    tail -2 ${DATADIR}/mozilla/tests_results/security/${HOST}.1/results.html | grep END_OF_TEST >> ${LOG_ALL}
-    RET=$?
-
-    grep FAIL ${LOG_TMP}
-    [ $? -eq 1 ] || RET=1
-
-    print_result "NSS - tests - ${BITS} bits - ${OPT}" ${RET} 0
-    return ${RET}
-}
-
-test_jss()
-{
-    print_log "######## JSS - tests - ${BITS} bits - ${OPT} ########"
-
-    print_log "$ cd ${DATADIR}/mozilla/security/jss"
-    cd ${DATADIR}/mozilla/security/jss
-
-    print_log "$ ${MAKE} platform"
-    PLATFORM=$(${MAKE} platform)
-    print_log "PLATFORM=${PLATFORM}"
-
-    print_log "$ cd ${DATADIR}/mozilla/security/jss/org/mozilla/jss/tests"
-    cd ${DATADIR}/mozilla/security/jss/org/mozilla/jss/tests
-
-    print_log "$ perl all.pl dist ${DATADIR}/mozilla/dist/${PLATFORM}"
-    perl all.pl dist ${DATADIR}/mozilla/dist/${PLATFORM} > ${LOG_TMP} 2>&1
-    cat ${LOG_TMP} >> ${LOG_ALL}
-
-    tail -2 ${LOG_TMP} | grep JSSTEST_RATE > /dev/null
-    RET=$?
-
-    grep FAIL ${LOG_TMP} 
-    [ $? -eq 1 ] || RET=1
-
-    print_result "JSS - tests - ${BITS} bits - ${OPT}" ${RET} 0
-    return ${RET}
-}
-
-build_and_test()
-{
-    if [ -z "${NO_BUILD}" ]; then
-        build_nss
-        [ $? -eq 0 ] || return 1
-    fi
-
-    if [ -z "${NO_TEST}" ]; then
-        test_nss
-        [ $? -eq 0 ] || return 2
-    fi
-
-    if [ -z "${NO_JSS}" -a -z "${NO_BUILD}" ]; then
-        build_jss
-        [ $? -eq 0 ] || return 1
-    fi
-
-    if [ -z "${NO_JSS}" -a -z "${NO_TEST}" ]; then
-        test_jss
-        [ $? -eq 0 ] || return 2
-    fi
-
-    return 0
-}
-
-run_cycle()
-{
-    if [ -z "${NO_MAIL}" ]; then
-        BUILD_DATE=$(${AWK} 'BEGIN{ srand(); print srand(); }')
-        mail_start
-    fi
-
-    print_env
-    STATUS=success
-
-    if [ -z "${NO_CVS}" ]; then
-        cvs_checkout
-        [ $? -ne 0 ] && STATUS=busted
-    fi
-        
-    if [ ${STATUS} = "success" -a -z "${NO_CVS}" ]; then
-        apply_patches
-        [ $? -ne 0 ] && STATUS=busted
-    fi
-
-    if [ ${STATUS} = "success" ]; then
-        build_and_test
-        RET=$?
-        [ ${RET} -eq 1 ] && STATUS=busted
-        [ ${RET} -eq 2 ] && STATUS=testfailed
-    fi
-
-    grep ^TinderboxPrint ${LOG_ALL}
-
-    if [ -z "${NO_MAIL}" ]; then
-        mail_finish ${STATUS}
-    fi
-}
-
-run_all()
-{
-    if [ ${SLEEP_TIME} -gt 0 ]; then
-        echo "Waiting ${SLEEP_TIME} minutes"
-        SLEEP_TIME=$(expr ${SLEEP_TIME} \* 60)
-        sleep ${SLEEP_TIME}
-        [ $? -eq 0 ] || return 1
-    fi
-
-    START_TIME=$(${AWK} 'BEGIN{ srand(); print srand(); }')
-
-    [ -z "${NO_CVS}" ] && rm -rf ${DATADIR}
-    [ -f "${LOG_ALL}" ] && rm ${LOG_ALL}
- 
-    mkdir -p ${DATADIR}
-
-    set_cycle ${BITS} ${OPT} ${CYCLE_CNT}
-    run_cycle
-
-    CYCLE_ID=$(expr ${CYCLE_CNT} % ${CYCLE_MAX} + 1)
-
-    cd ${TESTDIR}
-    rm -rf ${DATADIR}.last.${CYCLE_ID}
-
-    if [ -z "${NO_MOVE}" ]; then
-        mv ${DATADIR} ${DATADIR}.last.${CYCLE_ID}
-    else
-        cp -r ${DATADIR} ${DATADIR}.last.${CYCLE_ID}
-    fi 
-
-    CYCLE_CNT=$(expr ${CYCLE_CNT} + 1)
-
-    FINISH_TIME=$(${AWK} 'BEGIN{ srand(); print srand(); }')
-    TESTING_TIME=$(expr ${FINISH_TIME} - ${START_TIME})
-    TESTING_TIME=$(expr ${TESTING_TIME} / 60)
-    if [ ${TESTING_TIME} -ge ${CYCLE_TIME} ]; then
-        SLEEP_TIME=0
-    else
-        SLEEP_TIME=$(expr ${CYCLE_TIME} - ${TESTING_TIME})
-    fi
-
-    [ -n "${RUN_ONCE}" ] && RUN=0
-}
-
-main()
-{
-    CYCLE_CNT=0
-    SLEEP_TIME=0
-    RUN=1
-    VALID=0
- 
-    while [ ${RUN} -eq 1 ]; do 
-        for BITS in 32 64; do
-            echo ${RUN_BITS} | grep ${BITS} > /dev/null
-            [ $? -eq 0 ] || continue
-            for OPT in DBG OPT; do
-                echo ${RUN_OPT} | grep ${OPT} > /dev/null
-                [ $? -eq 0 ] || continue
-
-                if [ ${RUN} -eq 1 ]; then
-                    VALID=1 
-                    run_all 
-                fi
-            done
-        done
-
-        if [ ${VALID} -ne 1 ]; then
-            echo "Need to set valid bits/opt values."
-            RUN=0
-        fi
-    done
-
-    return 0
-}
-
-echo "tinderbox args: $0 $@"
-. env.sh
-proc_args "$@"
-set_env
-main
-
--- a/mozilla/tools/tinderbox-configs/firefox/linux/mozconfig
+++ b/mozilla/tools/tinderbox-configs/firefox/linux/mozconfig
@@ -0,0 +1,26 @@
+#
+## hostname: fx-linux-tbox
+## uname: Linux fx-linux-tbox.build.mozilla.org 2.6.18-8.el5 #1 SMP Thu Mar 15 19:57:35 EDT 2007 i686 i686 i386 GNU/Linux
+#
+
+export CFLAGS="-gstabs+"
+export CXXFLAGS="-gstabs+"
+
+mk_add_options MOZ_CO_PROJECT=browser
+mk_add_options PROFILE_GEN_SCRIPT=@TOPSRCDIR@/build/profile_pageloader.pl
+mk_add_options MOZ_CO_MODULE="mozilla/tools/update-packaging"
+mk_add_options MOZ_MAKE_FLAGS="-j1"
+
+ac_add_options --enable-application=browser
+ac_add_options --enable-update-channel=release
+ac_add_options --enable-update-packaging
+
+# Don't add explicit optimize flags here, set them in configure.in, see bug 407794.
+ac_add_options --enable-optimize
+ac_add_options --disable-debug
+ac_add_options --disable-tests
+
+ac_add_options --enable-official-branding
+
+CC=/tools/gcc/bin/gcc
+CXX=/tools/gcc/bin/g++
--- a/mozilla/tools/tinderbox-configs/firefox/linux/tinder-config.pl
+++ b/mozilla/tools/tinderbox-configs/firefox/linux/tinder-config.pl
@@ -0,0 +1,268 @@
+#
+## hostname: fx-linux-tbox
+## uname: Linux fx-linux-tbox.build.mozilla.org 2.6.18-8.el5 #1 SMP Thu Mar 15 19:57:35 EDT 2007 i686 i686 i386 GNU/Linux
+#
+
+#- tinder-config.pl - Tinderbox configuration file.
+#-    Uncomment the variables you need to set.
+#-    The default values are the same as the commented variables.
+
+$ENV{CVS_RSH} = "ssh";
+$ENV{MOZ_CRASHREPORTER_NO_REPORT} = '1';
+
+# To ensure Talkback client builds properly on some Linux boxen where LANG
+# is set to "en_US.UTF-8" by default, override that setting here by setting
+# it to "en_US.iso885915" (the setting on ocean).  Proper fix is to update
+# where xrestool is called in the build system so that 'LANG=C' in its
+# environment, according to bryner.
+$ENV{LANG} = "en_US.iso885915";
+
+# $ENV{MOZ_PACKAGE_MSI}
+#-----------------------------------------------------------------------------
+#  Default: 0
+#   Values: 0 | 1
+#  Purpose: Controls whether a MSI package is made.
+# Requires: Windows and a local MakeMSI installation.
+#$ENV{MOZ_PACKAGE_MSI} = 0;
+
+# $ENV{MOZ_SYMBOLS_TRANSFER_TYPE}
+#-----------------------------------------------------------------------------
+#  Default: scp
+#   Values: scp | rsync
+#  Purpose: Use scp or rsync to transfer symbols to the Talkback server.
+# Requires: The selected type requires the command be available both locally
+#           and on the Talkback server.
+#$ENV{MOZ_SYMBOLS_TRANSFER_TYPE} = "scp";
+
+#- PLEASE FILL THIS IN WITH YOUR PROPER EMAIL ADDRESS
+$BuildAdministrator = 'build@mozilla.org';
+#$BuildAdministrator = "$ENV{USER}\@$ENV{HOST}";
+#$BuildAdministrator = ($ENV{USER} || "cltbld") . "\@" . ($ENV{HOST} || "dhcp");
+
+#- You'll need to change these to suit your machine's needs
+$DisplayServer = ':0.0';
+
+#- Default values of command-line opts
+#-
+#$BuildDepend       = 1;      # Depend or Clobber
+#$BuildDebug        = 0;      # Debug or Opt (Darwin)
+#$ReportStatus      = 1;      # Send results to server, or not
+#$ReportFinalStatus = 1;      # Finer control over $ReportStatus.
+$UseTimeStamp      = 0;      # Use the CVS 'pull-by-timestamp' option, or not
+#$BuildOnce         = 0;      # Build once, don't send results to server
+#$TestOnly          = 0;      # Only run tests, don't pull/build
+#$BuildEmbed        = 0;      # After building seamonkey, go build embed app.
+#$SkipMozilla       = 0;      # Use to debug post-mozilla.pl scripts.
+#$BuildLocales      = 0;      # Do l10n packaging?
+
+# Tests
+$CleanProfile             = 1;
+#$ResetHomeDirForTests     = 1;
+$ProductName              = "Firefox";
+$VendorName               = 'Mozilla';
+
+$RunMozillaTests          = 1;  # Allow turning off of all tests if needed.
+$RegxpcomTest             = 1;
+$AliveTest                = 1;
+#$JavaTest                 = 0;
+#$ViewerTest               = 0;
+#$BloatTest                = 0;  # warren memory bloat test
+#$BloatTest2               = 0;  # dbaron memory bloat test, require tracemalloc
+#$DomToTextConversionTest  = 0;  
+#$XpcomGlueTest            = 0;
+$CodesizeTest             = 0;  # Z,  require mozilla/tools/codesighs
+$EmbedCodesizeTest        = 0;  # mZ, require mozilla/tools/codesigns
+#$MailBloatTest            = 0;
+#$EmbedTest                = 0;  # Assumes you wanted $BuildEmbed=1
+$LayoutPerformanceTest    = 0;  # Tp
+$DHTMLPerformanceTest     = 0;  # Tdhtml
+#$QATest                   = 0;  
+#$XULWindowOpenTest        = 0;  # Txul
+$StartupPerformanceTest   = 0;  # Ts
+
+$TestsPhoneHome           = 0;  # Should test report back to server?
+$GraphNameOverride        = 'fx-linux-tbox';
+
+# $results_server
+#----------------------------------------------------------------------------
+# Server on which test results will be accessible.  This was originally tegu,
+# then became axolotl.  Once we moved services from axolotl, it was time
+# to give this service its own hostname to make future transitions easier.
+# - cmp@mozilla.org
+#$results_server           = "build-graphs.mozilla.org";
+
+#$pageload_server          = "spider";  # localhost
+$pageload_server      = "pageload.build.mozilla.org";
+
+
+#
+# Timeouts, values are in seconds.
+#
+#$CVSCheckoutTimeout               = 3600;
+#$CreateProfileTimeout             = 45;
+#$RegxpcomTestTimeout              = 120;
+
+#$AliveTestTimeout                 = 45;
+#$ViewerTestTimeout                = 45;
+#$EmbedTestTimeout                 = 45;
+#$BloatTestTimeout                 = 120;   # seconds
+#$MailBloatTestTimeout             = 120;   # seconds
+#$JavaTestTimeout                  = 45;
+#$DomTestTimeout	                  = 45;    # seconds
+#$XpcomGlueTestTimeout             = 15;
+#$CodesizeTestTimeout              = 900;     # seconds
+#$CodesizeTestType                 = "auto";  # {"auto"|"base"}
+#$LayoutPerformanceTestTimeout     = 1200;  # entire test, seconds
+#$DHTMLPerformanceTestTimeout      = 1200;  # entire test, seconds
+#$QATestTimeout                    = 1200;   # entire test, seconds
+#$LayoutPerformanceTestPageTimeout = 30000; # each page, ms
+#$StartupPerformanceTestTimeout    = 15;    # seconds
+#$XULWindowOpenTestTimeout	      = 150;   # seconds
+
+
+#$MozConfigFileName = 'mozconfig';
+
+#$UseMozillaProfile = 1;
+#$MozProfileName = 'default';
+
+#- Set these to what makes sense for your system
+#$Make          = 'gmake';       # Must be GNU make
+#$MakeOverrides = '';
+#$mail          = '/bin/mail';
+#$CVS           = 'cvs -q';
+#$CVSCO         = 'checkout -P';
+
+# win32 usually doesn't have /bin/mail
+#$blat           = 'c:/nstools/bin/blat';
+#$use_blat       = 0;
+
+# Set moz_cvsroot to something like:
+# :pserver:$ENV{USER}%netscape.com\@cvs.mozilla.org:/cvsroot
+# :pserver:anonymous\@cvs-mirror.mozilla.org:/cvsroot
+#
+# Note that win32 may not need \@, depends on ' or ".
+# :pserver:$ENV{USER}%netscape.com@cvs.mozilla.org:/cvsroot
+
+#$moz_cvsroot   = $ENV{CVSROOT};
+# CONFIG: $moz_cvsroot   = '%mozillaCvsroot%';
+$moz_cvsroot   = 'cltbld@cvs.mozilla.org:/cvsroot';
+
+#- Set these proper values for your tinderbox server
+#$Tinderbox_server = 'tinderbox-daemon@tinderbox.mozilla.org';
+
+# Allow for non-client builds, e.g. camino.
+#$moz_client_mk = 'client.mk';
+
+#- Set if you want to build in a separate object tree
+$ObjDir = 'obj-fx-trunk';
+
+# Extra build name, if needed.
+$BuildNameExtra = 'Release';
+
+# User comment, eg. ip address for dhcp builds.
+# ex: $UserComment = "ip = 208.12.36.108";
+#$UserComment = 0;
+
+#-
+#- The rest should not need to be changed
+#-
+
+#- Minimum wait period from start of build to start of next build in minutes.
+#$BuildSleep = 10;
+
+#- Until you get the script working. When it works,
+#- change to the tree you're actually building
+# CONFIG: $BuildTree  = '%buildTree%';
+$BuildTree  = 'MozillaRelease';
+
+#$BuildName = '';
+# CONFIG: $BuildTag = '%productTag%_RELEASE';
+$BuildTag = 'FIREFOX_3_0_19_RELEASE';
+#$BuildConfigDir = 'mozilla/config';
+#$Topsrcdir = 'mozilla';
+
+$BinaryName = 'firefox-bin';
+
+#
+# For embedding app, use:
+#$EmbedBinaryName = 'TestGtkEmbed';
+#$EmbedDistDir    = 'dist/bin'
+
+
+#$ShellOverride = ''; # Only used if the default shell is too stupid
+#$ConfigureArgs = '';
+#$ConfigureEnvArgs = '';
+#$Compiler = 'gcc';
+#$NSPRArgs = '';
+#$ShellOverride = '';
+
+# Release build options
+$ReleaseBuild  = 1;
+$shiptalkback  = 0;
+$ReleaseToLatest = 0; # Push the release to latest-<milestone>?
+$ReleaseToDated = 1; # Push the release to YYYY-MM-DD-HH-<milestone>?
+$build_hour    = 4;
+$package_creation_path = "/browser/installer";
+# needs setting for mac + talkback: $mac_bundle_path = "/browser/app";
+$ssh_version   = "2";
+# CONFIG: $ssh_user      = "%sshUser%";
+$ssh_user      = "cltbld";
+# CONFIG: $ssh_server    = "%sshServer%";
+$ssh_server    = "stage-old.mozilla.org";
+$ftp_path      = "/home/ftp/pub/firefox/nightly";
+$url_path      = "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly";
+$tbox_ftp_path = "/home/ftp/pub/firefox/tinderbox-builds";
+$tbox_url_path = "http://ftp.mozilla.org/pub/mozilla.org/firefox/tinderbox-builds";
+# CONFIG: $milestone     = "firefox%version%";
+$milestone     = "firefox3.0.19";
+$notify_list   = 'build-announce@mozilla.org';
+$stub_installer = 0;
+$sea_installer = 0;
+$archive       = 1;
+$push_raw_xpis = 0;
+$update_pushinfo = 0;
+$update_package = 1;
+$update_product = "Firefox";
+$update_version = "trunk";
+$update_platform = "Linux_x86-gcc3";
+$update_hash = "sha1";
+$update_filehost = 'ftp.mozilla.org';
+$update_ver_file = 'browser/config/version.txt';
+$crashreporter_buildsymbols = 1;
+$crashreporter_pushsymbols = 1;
+# CONFIG: $ENV{'SYMBOL_SERVER_HOST'}    = '%symbolServer%';
+$ENV{'SYMBOL_SERVER_HOST'}    = 'dm-symbolpush01.mozilla.org';
+# CONFIG: $ENV{'SYMBOL_SERVER_USER'}    = '%symbolServerUser%';
+$ENV{'SYMBOL_SERVER_USER'}    = 'ffxbld';
+# CONFIG: $ENV{'SYMBOL_SERVER_PATH'}    = '%symbolServerPath%';
+$ENV{'SYMBOL_SERVER_PATH'}    = '/mnt/netapp/breakpad/symbols_ffx';
+# CONFIG: $ENV{'SYMBOL_SERVER_SSH_KEY'} = '%symbolServerKey%';
+$ENV{'SYMBOL_SERVER_SSH_KEY'} = '/home/cltbld/.ssh/ffxbld_dsa';
+
+# Reboot the OS at the end of build-and-test cycle. This is primarily
+# intended for Win9x, which can't last more than a few cycles before
+# locking up (and testing would be suspect even after a couple of cycles).
+# Right now, there is only code to force the reboot for Win9x, so even
+# setting this to 1, will not have an effect on other platforms. Setting
+# up win9x to automatically logon and begin running tinderbox is left 
+# as an exercise to the reader. 
+#$RebootSystem = 0;
+
+# LogCompression specifies the type of compression used on the log file.
+# Valid options are 'gzip', and 'bzip2'. Please make sure the binaries
+# for 'gzip' or 'bzip2' are in the user's path before setting this
+# option.
+#$LogCompression = '';
+
+# LogEncoding specifies the encoding format used for the logs. Valid
+# options are 'base64', and 'uuencode'. If $LogCompression is set above,
+# this needs to be set to 'base64' or 'uuencode' to ensure that the
+# binary data is transferred properly.
+#$LogEncoding = '';
+
+# Prevent Extension Manager from spawning child processes during tests
+# - processes that tbox scripts cannot kill. 
+#$ENV{NO_EM_RESTART} = '1';
+
+# Do not build XForms
+$BuildXForms = 0;
--- a/mozilla/tools/tinderbox-configs/firefox/macosx/mozconfig
+++ b/mozilla/tools/tinderbox-configs/firefox/macosx/mozconfig
@@ -0,0 +1,26 @@
+#
+## hostname: bm-xserve08.build.mozilla.org
+## uname: Darwin bm-xserve08.build.mozilla.org 8.8.4 Darwin Kernel Version 8.8.4: Sun Oct 29 15:26:54 PST 2006; root:xnu-792.16.4.obj~1/RELEASE_I386 i386 i386
+#
+
+# symbols for breakpad
+export CFLAGS="-g -gfull"
+export CXXFLAGS="-g -gfull"
+
+. $topsrcdir/build/macosx/universal/mozconfig
+
+mk_add_options MOZ_MAKE_FLAGS="-j1"
+mk_add_options MOZ_CO_MODULE="mozilla/tools/update-packaging"
+mk_add_options MOZ_CO_PROJECT="browser"
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../build/universal
+
+ac_add_options --enable-application=browser
+ac_add_options --enable-update-channel=release
+# Don't add explicit optimize flags here, set them in configure.in, see bug 407794.
+ac_add_options --enable-optimize
+ac_add_options --disable-debug
+ac_add_options --disable-tests
+ac_add_options --enable-update-packaging
+
+ac_add_options --enable-official-branding
+ac_add_app_options ppc --enable-prebinding
--- a/mozilla/tools/tinderbox-configs/firefox/macosx/tinder-config.pl
+++ b/mozilla/tools/tinderbox-configs/firefox/macosx/tinder-config.pl
@@ -0,0 +1,267 @@
+#
+## hostname: bm-xserve08.build.mozilla.org
+## uname: Darwin bm-xserve08.build.mozilla.org 8.8.4 Darwin Kernel Version 8.8.4: Sun Oct 29 15:26:54 PST 2006; root:xnu-792.16.4.obj~1/RELEASE_I386 i386 i386
+#
+
+#- tinder-config.pl - Tinderbox configuration file.
+#-    Uncomment the variables you need to set.
+#-    The default values are the same as the commented variables.
+
+$ENV{NO_EM_RESTART} = "1";
+$ENV{DYLD_NO_FIX_PREBINDING} = "1";
+$ENV{LD_PREBIND_ALLOW_OVERLAP} = "1";
+$ENV{CVS_RSH} = "ssh";
+
+$MacUniversalBinary = 1;
+
+# $ENV{MOZ_PACKAGE_MSI}
+#-----------------------------------------------------------------------------
+#  Default: 0
+#   Values: 0 | 1
+#  Purpose: Controls whether a MSI package is made.
+# Requires: Windows and a local MakeMSI installation.
+#$ENV{MOZ_PACKAGE_MSI} = 0;
+
+# $ENV{MOZ_SYMBOLS_TRANSFER_TYPE}
+#-----------------------------------------------------------------------------
+#  Default: scp
+#   Values: scp | rsync
+#  Purpose: Use scp or rsync to transfer symbols to the Talkback server.
+# Requires: The selected type requires the command be available both locally
+#           and on the Talkback server.
+#$ENV{MOZ_SYMBOLS_TRANSFER_TYPE} = "scp";
+
+#- PLEASE FILL THIS IN WITH YOUR PROPER EMAIL ADDRESS
+$BuildAdministrator = 'build@mozilla.org';
+#$BuildAdministrator = "$ENV{USER}\@$ENV{HOST}";
+#$BuildAdministrator = ($ENV{USER} || "cltbld") . "\@" . ($ENV{HOST} || "dhcp");
+
+#- You'll need to change these to suit your machine's needs
+#$DisplayServer = ':0.0';
+
+#- Default values of command-line opts
+#-
+#$BuildDepend       = 1;      # Depend or Clobber
+#$BuildDebug        = 0;      # Debug or Opt (Darwin)
+#$ReportStatus      = 1;      # Send results to server, or not
+#$ReportFinalStatus = 1;      # Finer control over $ReportStatus.
+$UseTimeStamp      = 0;      # Use the CVS 'pull-by-timestamp' option, or not
+#$BuildOnce         = 0;      # Build once, don't send results to server
+#$TestOnly          = 0;      # Only run tests, don't pull/build
+#$BuildEmbed        = 0;      # After building seamonkey, go build embed app.
+#$SkipMozilla       = 0;      # Use to debug post-mozilla.pl scripts.
+#$BuildLocales      = 0;      # Do l10n packaging?
+
+# Tests
+$CleanProfile             = 1;
+#$ResetHomeDirForTests     = 1;
+$ProductName              = 'Firefox';
+$VendorName               = "Mozilla";
+
+$RunMozillaTests          = 1;  # Allow turning off of all tests if needed.
+$RegxpcomTest             = 1;
+$AliveTest                = 1;
+#$JavaTest                 = 0;
+#$ViewerTest               = 0;
+#$BloatTest                = 0;  # warren memory bloat test
+#$BloatTest2               = 0;  # dbaron memory bloat test, require tracemalloc
+#$DomToTextConversionTest  = 0;  
+#$XpcomGlueTest            = 0;
+$CodesizeTest             = 0;  # Z,  require mozilla/tools/codesighs
+$EmbedCodesizeTest        = 0;  # mZ, require mozilla/tools/codesigns
+#$MailBloatTest            = 0;
+#$EmbedTest                = 0;  # Assumes you wanted $BuildEmbed=1
+$LayoutPerformanceTest    = 0;  # Tp
+$LayoutPerformanceLocalTest   = 0;  # Tp2
+$DHTMLPerformanceTest     = 0;  # Tdhtml
+#$QATest                   = 0;  
+$XULWindowOpenTest        = 0;  # Txul
+$StartupPerformanceTest   = 0;  # Ts
+
+$TestsPhoneHome           = 0;  # Should test report back to server?
+
+$GraphNameOverride        = 'xserve08.build.mozilla.org_Fx-Trunk';
+
+# $results_server
+#----------------------------------------------------------------------------
+# Server on which test results will be accessible.  This was originally tegu,
+# then became axolotl.  Once we moved services from axolotl, it was time
+# to give this service its own hostname to make future transitions easier.
+# - cmp@mozilla.org
+#$results_server           = "build-graphs.mozilla.org";
+
+#$pageload_server          = "spider";  # localhost
+$pageload_server          = "pageload.build.mozilla.org";  # localhost
+
+#
+# Timeouts, values are in seconds.
+#
+#$CVSCheckoutTimeout               = 3600;
+#$CreateProfileTimeout             = 45;
+#$RegxpcomTestTimeout              = 120;
+
+$AliveTestTimeout                 = 10;
+#$ViewerTestTimeout                = 45;
+#$EmbedTestTimeout                 = 45;
+#$BloatTestTimeout                 = 120;   # seconds
+#$MailBloatTestTimeout             = 120;   # seconds
+#$JavaTestTimeout                  = 45;
+#$DomTestTimeout	                  = 45;    # seconds
+#$XpcomGlueTestTimeout             = 15;
+#$CodesizeTestTimeout              = 900;     # seconds
+#$CodesizeTestType                 = "auto";  # {"auto"|"base"}
+$LayoutPerformanceTestTimeout     = 300;  # entire test, seconds
+$LayoutPerformanceLocalTestTimeout     = 180;  # entire test, seconds
+$DHTMLPerformanceTestTimeout      = 180;  # entire test, seconds
+#$QATestTimeout                    = 1200;   # entire test, seconds
+#$LayoutPerformanceTestPageTimeout = 30000; # each page, ms
+#$StartupPerformanceTestTimeout    = 15;    # seconds
+#$XULWindowOpenTestTimeout	      = 150;   # seconds
+
+
+#$MozConfigFileName = 'mozconfig';
+
+#$UseMozillaProfile = 1;
+#$MozProfileName = 'default';
+
+#- Set these to what makes sense for your system
+#$Make          = 'gmake';       # Must be GNU make
+#$MakeOverrides = '';
+#$mail          = '/bin/mail';
+#$CVS           = 'cvs -q';
+#$CVSCO         = 'checkout -P';
+
+# win32 usually doesn't have /bin/mail
+#$blat           = 'c:/nstools/bin/blat';
+#$use_blat       = 0;
+
+# Set moz_cvsroot to something like:
+# :pserver:$ENV{USER}%netscape.com\@cvs.mozilla.org:/cvsroot
+# :pserver:anonymous\@cvs-mirror.mozilla.org:/cvsroot
+#
+# Note that win32 may not need \@, depends on ' or ".
+# :pserver:$ENV{USER}%netscape.com@cvs.mozilla.org:/cvsroot
+
+# CONFIG: $moz_cvsroot   = '%mozillaCvsroot%';
+$moz_cvsroot   = 'cltbld@cvs.mozilla.org:/cvsroot';
+
+#- Set these proper values for your tinderbox server
+#$Tinderbox_server = 'tinderbox-daemon@tinderbox.mozilla.org';
+
+# Allow for non-client builds, e.g. camino.
+#$moz_client_mk = 'client.mk';
+
+#- Set if you want to build in a separate object tree
+$ObjDir = '../build/universal';
+
+# Extra build name, if needed.
+$BuildNameExtra = 'Release';
+
+# User comment, eg. ip address for dhcp builds.
+# ex: $UserComment = "ip = 208.12.36.108";
+#$UserComment = 0;
+
+#-
+#- The rest should not need to be changed
+#-
+
+#- Minimum wait period from start of build to start of next build in minutes.
+#$BuildSleep = 10;
+
+#- Until you get the script working. When it works,
+#- change to the tree you're actually building
+# CONFIG: $BuildTree  = '%buildTree%';
+$BuildTree  = 'MozillaRelease';
+
+#$BuildName = '';
+# CONFIG: $BuildTag = '%productTag%_RELEASE';
+$BuildTag = 'FIREFOX_3_0_19_RELEASE';
+#$BuildConfigDir = 'mozilla/config';
+#$Topsrcdir = 'mozilla';
+
+$BinaryName = 'firefox-bin';
+
+#
+# For embedding app, use:
+#$EmbedBinaryName = 'TestGtkEmbed';
+#$EmbedDistDir    = 'dist/bin'
+
+
+#$ShellOverride = ''; # Only used if the default shell is too stupid
+#$ConfigureArgs = '';
+#$ConfigureEnvArgs = '';
+#$Compiler = 'gcc';
+#$NSPRArgs = '';
+#$ShellOverride = '';
+
+# Release build options
+$ReleaseBuild  = 1;
+$shiptalkback  = 0;
+$ReleaseToLatest = 0; # Push the release to latest-<milestone>?
+$ReleaseToDated = 1; # Push the release to YYYY-MM-DD-HH-<milestone>?
+$build_hour    = "4";
+$package_creation_path = "/browser/installer";
+# needs setting for mac + talkback: $mac_bundle_path = "/browser/app";
+$mac_bundle_path = "/browser/app";
+$ssh_version   = "2";
+# CONFIG: $ssh_user      = "%sshUser%";
+$ssh_user      = "cltbld";
+# CONFIG: $ssh_server    = "%sshServer%";
+$ssh_server    = "stage-old.mozilla.org";
+$ftp_path      = "/home/ftp/pub/firefox/nightly";
+$url_path      = "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly";
+$tbox_ftp_path = "/home/ftp/pub/firefox/tinderbox-builds";
+$tbox_url_path = "http://ftp.mozilla.org/pub/mozilla.org/firefox/tinderbox-builds";
+# CONFIG: $milestone     = 'firefox%version%';
+$milestone     = 'firefox3.0.19';
+$notify_list   = "build-announce\@mozilla.org";
+$stub_installer = 0;
+$sea_installer = 0;
+$archive       = 1;
+$push_raw_xpis = 0;
+$update_package = 1;
+$update_product = "Firefox";
+$update_version = "trunk";
+$update_platform = "Darwin_Universal-gcc3";
+$update_hash = "sha1";
+$update_filehost = "ftp.mozilla.org";
+$update_ver_file = 'browser/config/version.txt';
+$update_pushinfo = 0;
+$crashreporter_buildsymbols = 1;
+$crashreporter_pushsymbols = 1;
+# CONFIG: $ENV{'SYMBOL_SERVER_HOST'}    = '%symbolServer%';
+$ENV{'SYMBOL_SERVER_HOST'}    = 'dm-symbolpush01.mozilla.org';
+# CONFIG: $ENV{'SYMBOL_SERVER_USER'}    = '%symbolServerUser%';
+$ENV{'SYMBOL_SERVER_USER'}    = 'ffxbld';
+# CONFIG: $ENV{'SYMBOL_SERVER_PATH'}    = '%symbolServerPath%';
+$ENV{'SYMBOL_SERVER_PATH'}    = '/mnt/netapp/breakpad/symbols_ffx';
+# CONFIG: $ENV{'SYMBOL_SERVER_SSH_KEY'} = '%symbolServerKey%';
+$ENV{'SYMBOL_SERVER_SSH_KEY'} = '/Users/cltbld/.ssh/ffxbld_dsa';
+
+# Reboot the OS at the end of build-and-test cycle. This is primarily
+# intended for Win9x, which can't last more than a few cycles before
+# locking up (and testing would be suspect even after a couple of cycles).
+# Right now, there is only code to force the reboot for Win9x, so even
+# setting this to 1, will not have an effect on other platforms. Setting
+# up win9x to automatically logon and begin running tinderbox is left 
+# as an exercise to the reader. 
+#$RebootSystem = 0;
+
+# LogCompression specifies the type of compression used on the log file.
+# Valid options are 'gzip', and 'bzip2'. Please make sure the binaries
+# for 'gzip' or 'bzip2' are in the user's path before setting this
+# option.
+#$LogCompression = '';
+
+# LogEncoding specifies the encoding format used for the logs. Valid
+# options are 'base64', and 'uuencode'. If $LogCompression is set above,
+# this needs to be set to 'base64' or 'uuencode' to ensure that the
+# binary data is transferred properly.
+#$LogEncoding = '';
+
+# Prevent Extension Manager from spawning child processes during tests
+# - processes that tbox scripts cannot kill. 
+#$ENV{NO_EM_RESTART} = '1';
+
+# Do not build XForms
+$BuildXForms = 0;
--- a/mozilla/tools/tinderbox-configs/firefox/win32/mozconfig
+++ b/mozilla/tools/tinderbox-configs/firefox/win32/mozconfig
@@ -0,0 +1,22 @@
+#
+## hostname: fx-win32-tbox
+## uname: MINGW32_NT-5.2 FX-WIN32-TBOX 1.0.11(0.46/3/2) 2007-01-12 12:05 i686 Msys
+#
+export CFLAGS="-GL -wd4624 -wd4952"
+export CXXFLAGS="-GL -wd4624 -wd4952"
+export LDFLAGS="-LTCG"
+
+mk_add_options MOZ_CO_PROJECT=browser
+mk_add_options MOZ_MAKE_FLAGS="-j1"
+mk_add_options MOZ_CO_MODULE="mozilla/tools/update-packaging"
+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=release
+ac_add_options --enable-optimize
+ac_add_options --disable-debug
+ac_add_options --disable-tests
+ac_add_options --enable-update-packaging
+ac_add_options --enable-official-branding
+ac_add_options --enable-jemalloc
+ac_add_options --with-crashreporter-enable-percent=10
--- a/mozilla/tools/tinderbox-configs/firefox/win32/tinder-config.pl
+++ b/mozilla/tools/tinderbox-configs/firefox/win32/tinder-config.pl
@@ -0,0 +1,267 @@
+#
+## hostname: fx-win32-tbox
+## uname: MINGW32_NT-5.2 FX-WIN32-TBOX 1.0.11(0.46/3/2) 2007-01-12 12:05 i686 Msys
+#
+
+#- tinder-config.pl - Tinderbox configuration file.
+#-    Uncomment the variables you need to set.
+#-    The default values are the same as the commented variables.
+
+$ENV{NO_EM_RESTART} = '1';
+$ENV{CVS_RSH} = "ssh";
+$ENV{MOZ_CRASHREPORTER_NO_REPORT} = '1';
+# Both these two variables are for source server support
+$ENV{PDBSTR_PATH} = 'C:\\Program Files\\Debugging Tools for Windows\\sdk\\srcsrv\\pdbstr.exe';
+$ENV{SRCSRV_ROOT} = ':pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot';
+
+# $ENV{MOZ_PACKAGE_MSI}
+#-----------------------------------------------------------------------------
+#  Default: 0
+#   Values: 0 | 1
+#  Purpose: Controls whether a MSI package is made.
+# Requires: Windows and a local MakeMSI installation.
+#$ENV{MOZ_PACKAGE_MSI} = 0;
+
+# $ENV{MOZ_SYMBOLS_TRANSFER_TYPE}
+#-----------------------------------------------------------------------------
+#  Default: scp
+#   Values: scp | rsync
+#  Purpose: Use scp or rsync to transfer symbols to the Talkback server.
+# Requires: The selected type requires the command be available both locally
+#           and on the Talkback server.
+#$ENV{MOZ_SYMBOLS_TRANSFER_TYPE} = "scp";
+
+#- PLEASE FILL THIS IN WITH YOUR PROPER EMAIL ADDRESS
+$BuildAdministrator = 'build@mozilla.org';
+#$BuildAdministrator = "$ENV{USER}\@$ENV{HOST}";
+#$BuildAdministrator = ($ENV{USER} || "cltbld") . "\@" . ($ENV{HOST} || "dhcp");
+
+#- You'll need to change these to suit your machine's needs
+#$DisplayServer = ':0.0';
+
+#- Default values of command-line opts
+#-
+#$BuildDepend       = 1;      # Depend or Clobber
+#$BuildDebug        = 0;      # Debug or Opt (Darwin)
+#$ReportStatus      = 1;      # Send results to server, or not
+#$ReportFinalStatus = 1;      # Finer control over $ReportStatus.
+$UseTimeStamp      = 0;      # Use the CVS 'pull-by-timestamp' option, or not
+#$BuildOnce         = 0;      # Build once, don't send results to server
+#$TestOnly          = 0;      # Only run tests, don't pull/build
+#$BuildEmbed        = 0;      # After building seamonkey, go build embed app.
+#$SkipMozilla       = 0;      # Use to debug post-mozilla.pl scripts.
+#$BuildLocales      = 0;      # Do l10n packaging?
+
+# Tests
+$CleanProfile             = 1;
+#$ResetHomeDirForTests     = 1;
+$ProductName              = "Firefox";
+$VendorName               = "Mozilla";
+
+$RunMozillaTests          = 1;  # Allow turning off of all tests if needed.
+$RegxpcomTest             = 1;
+$AliveTest                = 1;
+$JavaTest                 = 0;
+$ViewerTest               = 0;
+$BloatTest                = 0;  # warren memory bloat test
+$BloatTest2               = 0;  # dbaron memory bloat test, require tracemalloc
+$DomToTextConversionTest  = 0;  
+$XpcomGlueTest            = 0;
+$CodesizeTest             = 0;  # Z,  require mozilla/tools/codesighs
+$EmbedCodesizeTest        = 0;  # mZ, require mozilla/tools/codesigns
+$MailBloatTest            = 0;
+$EmbedTest                = 0;  # Assumes you wanted $BuildEmbed=1
+$LayoutPerformanceTest    = 0;  # Tp
+$DHTMLPerformanceTest     = 0;  # Tdhtml
+$QATest                   = 0;  
+$XULWindowOpenTest        = 0;  # Txul
+$StartupPerformanceTest   = 0;  # Ts
+$NeckoUnitTest            = 0;
+$RenderPerformanceTest    = 0;  # Tgfx
+
+$TestsPhoneHome           = 0;  # Should test report back to server?
+$GraphNameOverride        = 'fx-win32-tbox';
+
+# $results_server
+#----------------------------------------------------------------------------
+# Server on which test results will be accessible.  This was originally tegu,
+# then became axolotl.  Once we moved services from axolotl, it was time
+# to give this service its own hostname to make future transitions easier.
+# - cmp@mozilla.org
+#$results_server           = "build-graphs.mozilla.org";
+
+$pageload_server          = "pageload.build.mozilla.org";  # localhost
+
+#
+# Timeouts, values are in seconds.
+#
+#$CVSCheckoutTimeout               = 3600;
+#$CreateProfileTimeout             = 45;
+#$RegxpcomTestTimeout              = 120;
+
+#$AliveTestTimeout                 = 30;
+#$ViewerTestTimeout                = 45;
+#$EmbedTestTimeout                 = 45;
+#$BloatTestTimeout                 = 120;   # seconds
+#$MailBloatTestTimeout             = 120;   # seconds
+#$JavaTestTimeout                  = 45;
+#$DomTestTimeout	                  = 45;    # seconds
+#$XpcomGlueTestTimeout             = 15;
+#$CodesizeTestTimeout              = 900;     # seconds
+#$CodesizeTestType                 = "auto";  # {"auto"|"base"}
+$LayoutPerformanceTestTimeout     = 800;  # entire test, seconds
+#$DHTMLPerformanceTestTimeout      = 1200;  # entire test, seconds
+#$QATestTimeout                    = 1200;   # entire test, seconds
+#$LayoutPerformanceTestPageTimeout = 30000; # each page, ms
+#$StartupPerformanceTestTimeout    = 20;    # seconds
+#$XULWindowOpenTestTimeout	      = 90;   # seconds
+#$NeckoUnitTestTimeout             = 30;    # seconds
+$RenderPerformanceTestTimeout     = 1800;  # seconds
+
+#$MozConfigFileName = 'mozconfig';
+
+#$UseMozillaProfile = 1;
+#$MozProfileName = 'default';
+
+#- Set these to what makes sense for your system
+$Make          = 'make';       # Must be GNU make
+#$MakeOverrides = '';
+#$mail          = '/bin/mail';
+#$CVS           = 'cvs -q';
+#$CVSCO         = 'checkout -P';
+
+# win32 usually doesn't have /bin/mail
+$blat           = '/d/mozilla-build/blat261/full/blat';
+#$use_blat       = 1;
+
+# Set moz_cvsroot to something like:
+# :pserver:$ENV{USER}%netscape.com\@cvs.mozilla.org:/cvsroot
+# :pserver:anonymous\@cvs-mirror.mozilla.org:/cvsroot
+#
+# Note that win32 may not need \@, depends on ' or ".
+# :pserver:$ENV{USER}%netscape.com@cvs.mozilla.org:/cvsroot
+
+# CONFIG: $moz_cvsroot = '%mozillaCvsroot%';
+$moz_cvsroot = 'cltbld@cvs.mozilla.org:/cvsroot';
+
+#- Set these proper values for your tinderbox server
+#$Tinderbox_server = 'tinderbox-daemon@tinderbox.mozilla.org';
+
+# Allow for non-client builds, e.g. camino.
+#$moz_client_mk = 'client.mk';
+
+#- Set if you want to build in a separate object tree
+$ObjDir = 'obj-fx-trunk';
+
+# Extra build name, if needed.
+$BuildNameExtra = 'Release';
+
+# User comment, eg. ip address for dhcp builds.
+# ex: $UserComment = "ip = 208.12.36.108";
+#$UserComment = 0;
+
+#-
+#- The rest should not need to be changed
+#-
+
+#- Minimum wait period from start of build to start of next build in minutes.
+#$BuildSleep = 10;
+
+#- Until you get the script working. When it works,
+#- change to the tree you're actually building
+#$BuildTree  = 'MozillaTest';
+# CONFIG: $BuildTree  = '%buildTree%';
+$BuildTree  = 'MozillaRelease';
+
+#$BuildName = '';
+# CONFIG: $BuildTag = '%productTag%_RELEASE';
+$BuildTag = 'FIREFOX_3_0_19_RELEASE';
+#$BuildConfigDir = 'mozilla/config';
+#$Topsrcdir = 'mozilla';
+
+$BinaryName = 'firefox.exe';
+
+#
+# For embedding app, use:
+#$EmbedBinaryName = 'TestGtkEmbed';
+#$EmbedDistDir    = 'dist/bin'
+
+
+#$ShellOverride = ''; # Only used if the default shell is too stupid
+#$ConfigureArgs = '';
+#$ConfigureEnvArgs = '';
+#$Compiler = 'gcc';
+#$NSPRArgs = '';
+#$ShellOverride = '';
+
+$ProfiledBuild = 1;
+# Release build options
+$ReleaseBuild  = 1;
+$shiptalkback  = 0;
+$ReleaseToLatest = 0; # Push the release to latest-<milestone>?
+$ReleaseToDated = 1; # Push the release to YYYY-MM-DD-HH-<milestone>?
+$build_hour    = "4";
+$package_creation_path = "/browser/installer";
+# needs setting for mac + talkback: $mac_bundle_path = "/browser/app";
+$ssh_version   = "2";
+# CONFIG: $ssh_user      = "%sshUser%";
+$ssh_user      = "cltbld";
+# CONFIG: $ssh_server    = "%sshServer%";
+$ssh_server    = "stage-old.mozilla.org";
+$ftp_path      = "/home/ftp/pub/firefox/nightly";
+$url_path      = "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly";
+$tbox_ftp_path = "/home/ftp/pub/firefox/tinderbox-builds";
+$tbox_url_path = "http://ftp.mozilla.org/pub/mozilla.org/firefox/tinderbox-builds";
+# CONFIG: $milestone     = 'firefox%version%';
+$milestone     = 'firefox3.0.19';
+$notify_list   = 'build-announce@mozilla.org';
+$stub_installer = 0;
+$sea_installer = 1;
+$archive       = 1;
+$push_raw_xpis = 0;
+$update_package = 1;
+$update_product = "Firefox";
+$update_version = "trunk";
+$update_platform = "WINNT_x86-msvc";
+$update_hash = "sha1";
+$update_filehost = "ftp.mozilla.org";
+$update_ver_file = 'browser/config/version.txt';
+$update_pushinfo = 0;
+$crashreporter_buildsymbols = 1;
+$crashreporter_pushsymbols = 1;
+# CONFIG: $ENV{'SYMBOL_SERVER_HOST'}    = '%symbolServer%';
+$ENV{'SYMBOL_SERVER_HOST'}    = 'dm-symbolpush01.mozilla.org';
+# CONFIG: $ENV{'SYMBOL_SERVER_USER'}    = '%symbolServerUser%';
+$ENV{'SYMBOL_SERVER_USER'}    = 'ffxbld';
+# CONFIG: $ENV{'SYMBOL_SERVER_PATH'}    = '%symbolServerPath%';
+$ENV{'SYMBOL_SERVER_PATH'}    = '/mnt/netapp/breakpad/symbols_ffx';
+# CONFIG: $ENV{'SYMBOL_SERVER_SSH_KEY'} = '%symbolServerKey%';
+$ENV{'SYMBOL_SERVER_SSH_KEY'} = '/c/Documents and Settings/cltbld/.ssh/ffxbld_dsa';
+
+# Reboot the OS at the end of build-and-test cycle. This is primarily
+# intended for Win9x, which can't last more than a few cycles before
+# locking up (and testing would be suspect even after a couple of cycles).
+# Right now, there is only code to force the reboot for Win9x, so even
+# setting this to 1, will not have an effect on other platforms. Setting
+# up win9x to automatically logon and begin running tinderbox is left 
+# as an exercise to the reader. 
+#$RebootSystem = 0;
+
+# LogCompression specifies the type of compression used on the log file.
+# Valid options are 'gzip', and 'bzip2'. Please make sure the binaries
+# for 'gzip' or 'bzip2' are in the user's path before setting this
+# option.
+#$LogCompression = '';
+
+# LogEncoding specifies the encoding format used for the logs. Valid
+# options are 'base64', and 'uuencode'. If $LogCompression is set above,
+# this needs to be set to 'base64' or 'uuencode' to ensure that the
+# binary data is transferred properly.
+#$LogEncoding = '';
+
+# Prevent Extension Manager from spawning child processes during tests
+# - processes that tbox scripts cannot kill. 
+#$ENV{NO_EM_RESTART} = '1';
+
+# Do not build XForms
+$BuildXForms = 0;
--- a/mozilla/tools/tinderbox-configs/thunderbird/linux/CLOBBER
+++ b/mozilla/tools/tinderbox-configs/thunderbird/linux/CLOBBER
@@ -0,0 +1 @@
+Clobbering to force nightly due to nightly bustage from bug 428672.
--- a/mozilla/tools/tinderbox-configs/thunderbird/linux/mozconfig
+++ b/mozilla/tools/tinderbox-configs/thunderbird/linux/mozconfig
@@ -0,0 +1,25 @@
+#
+## hostname: tb-linux-tbox
+## uname: Linux tb-linux-tbox.build.mozilla.org 2.6.18-8.el5 #1 SMP Thu Mar 15 19:57:35 EDT 2007 i686 athlon i386 GNU/Linux
+#
+
+# symbols for breakpad
+export CFLAGS="-gstabs+"
+export CXXFLAGS="-gstabs+"
+
+mk_add_options MOZ_CO_PROJECT=mail
+mk_add_options MOZ_MAKE_FLAGS=-j1
+mk_add_options MOZ_CO_MODULE="mozilla/tools/update-packaging"
+
+ac_add_options --enable-application=mail
+ac_add_options --enable-update-channel=beta
+ac_add_options --disable-debug
+ac_add_options --enable-update-packaging
+# Add explicit optimize flags in configure.in, not here - see bug 407794
+ac_add_options --enable-optimize
+ac_add_options --disable-tests
+ac_add_options --disable-shared
+ac_add_options --enable-static
+
+CC=/tools/gcc-4.1.1/bin/gcc
+CXX=/tools/gcc-4.1.1/bin/g++
--- a/mozilla/tools/tinderbox-configs/thunderbird/linux/tinder-config.pl
+++ b/mozilla/tools/tinderbox-configs/thunderbird/linux/tinder-config.pl
@@ -0,0 +1,225 @@
+#
+## hostname: tb-linux-tbox
+## uname: Linux tbnewref-linux-tbox.build.mozilla.org 2.6.18-8.el5 #1 SMP Thu Mar 15 19:57:35 EDT 2007 i686 athlon i386 GNU/Linux
+#
+
+#- tinder-config.pl - Tinderbox configuration file.
+#-    Uncomment the variables you need to set.
+#-    The default values are the same as the commented variables.
+
+$ENV{CVS_RSH} = "ssh";
+$ENV{MOZ_CRASHREPORTER_NO_REPORT} = '1';
+
+#- PLEASE FILL THIS IN WITH YOUR PROPER EMAIL ADDRESS
+#$BuildAdministrator = "$ENV{USER}\@$ENV{HOST}";
+#$BuildAdministrator = ($ENV{USER} || "cltbld") . "\@" . ($ENV{HOST} || "dhcp");
+
+#- You'll need to change these to suit your machine's needs
+#$DisplayServer = ':0.0';
+
+#- Default values of command-line opts
+#-
+$BuildDepend       = 0;      # Depend or Clobber
+#$BuildDebug        = 0;      # Debug or Opt (Darwin)
+#$ReportStatus      = 1;      # Send results to server, or not
+#$ReportFinalStatus = 1;      # Finer control over $ReportStatus.
+$UseTimeStamp      = 0;      # Use the CVS 'pull-by-timestamp' option, or not
+#$BuildOnce         = 0;      # Build once, don't send results to server
+#$TestOnly          = 0;      # Only run tests, don't pull/build
+#$BuildEmbed        = 0;      # After building seamonkey, go build embed app.
+#$SkipMozilla       = 0;      # Use to debug post-mozilla.pl scripts.
+
+# Tests
+$CleanProfile             = 1;
+#$ResetHomeDirForTests     = 1;
+$ProductName              = "Thunderbird";
+#$VendorName               = "";
+
+$RunMozillaTests          = 1;  # Allow turning off of all tests if needed.
+#$RegxpcomTest             = 1;
+#$AliveTest                = 1;
+#$JavaTest                 = 0;
+#$ViewerTest               = 0;
+#$BloatTest                = 0;  # warren memory bloat test
+#$BloatTest2               = 0;  # dbaron memory bloat test, require tracemalloc
+#$DomToTextConversionTest  = 0;  
+#$XpcomGlueTest            = 0;
+$CodesizeTest             = 0;  # Z,  require mozilla/tools/codesighs
+#$EmbedCodesizeTest        = 0;  # mZ, require mozilla/tools/codesigns
+#$MailBloatTest            = 0;
+#$EmbedTest                = 0;  # Assumes you wanted $BuildEmbed=1
+#$LayoutPerformanceTest    = 0;  # Tp
+#$QATest                   = 0;  
+#$XULWindowOpenTest        = 0;  # Txul
+#$StartupPerformanceTest   = 0;  # Ts
+
+$TestsPhoneHome           = 0;  # Should test report back to server?
+#$results_server           = "axolotl.mozilla.org"; # was tegu
+#$pageload_server          = "spider";  # localhost
+
+#
+# Timeouts, values are in seconds.
+#
+#$CVSCheckoutTimeout               = 3600;
+#$CreateProfileTimeout             = 45;
+#$RegxpcomTestTimeout              = 15;
+
+#$AliveTestTimeout                 = 45;
+#$ViewerTestTimeout                = 45;
+#$EmbedTestTimeout                 = 45;
+#$BloatTestTimeout                 = 120;   # seconds
+#$MailBloatTestTimeout             = 120;   # seconds
+#$JavaTestTimeout                  = 45;
+#$DomTestTimeout	                  = 45;    # seconds
+#$XpcomGlueTestTimeout             = 15;
+#$CodesizeTestTimeout              = 900;     # seconds
+#$CodesizeTestType                 = "auto";  # {"auto"|"base"}
+#$LayoutPerformanceTestTimeout     = 1200;  # entire test, seconds
+#$QATestTimeout                    = 1200;   # entire test, seconds
+#$LayoutPerformanceTestPageTimeout = 30000; # each page, ms
+#$StartupPerformanceTestTimeout    = 60;    # seconds
+#$XULWindowOpenTestTimeout	      = 150;   # seconds
+
+
+#$MozConfigFileName = 'mozconfig';
+
+#$UseMozillaProfile = 1;
+#$MozProfileName = 'default';
+
+#- Set these to what makes sense for your system
+#$Make          = 'gmake';       # Must be GNU make
+#$MakeOverrides = '';
+#$mail          = '/bin/mail';
+#$CVS           = 'cvs -q';
+#$CVSCO         = 'checkout -P';
+
+# win32 usually doesn't have /bin/mail
+#$blat           = 'c:/nstools/bin/blat';
+#$use_blat       = 0;
+
+# Set moz_cvsroot to something like:
+# :pserver:$ENV{USER}%netscape.com\@cvs.mozilla.org:/cvsroot
+# :pserver:anonymous\@cvs-mirror.mozilla.org:/cvsroot
+#
+# Note that win32 may not need \@, depends on ' or ".
+# :pserver:$ENV{USER}%netscape.com@cvs.mozilla.org:/cvsroot
+
+# CONFIG: $moz_cvsroot   = '%mozillaCvsroot%';
+$moz_cvsroot   = 'cltbld@cvs.mozilla.org:/cvsroot';
+
+#- Set these proper values for your tinderbox server
+#$Tinderbox_server = 'tinderbox-daemon@tinderbox.mozilla.org';
+
+# Allow for non-client builds, e.g. camino.
+#$moz_client_mk = 'client.mk';
+
+#- Set if you want to build in a separate object tree
+$ObjDir = 'obj-tb-trunk';
+
+# Extra build name, if needed.
+$BuildNameExtra = 'Release';
+
+# User comment, eg. ip address for dhcp builds.
+# ex: $UserComment = "ip = 208.12.36.108";
+#$UserComment = 0;
+
+#-
+#- The rest should not need to be changed
+#-
+
+#- Minimum wait period from start of build to start of next build in minutes.
+#$BuildSleep = 10;
+
+#- Until you get the script working. When it works,
+#- change to the tree you're actually building
+# CONFIG: $BuildTree  = '%buildTree%';
+$BuildTree  = 'MozillaRelease';
+
+#$BuildName = '';
+# CONFIG: $BuildTag = '%productTag%_RELEASE';
+$BuildTag = 'THUNDERBIRD_3_0a2_RELEASE';
+#$BuildConfigDir = 'mozilla/config';
+#$Topsrcdir = 'mozilla';
+
+$BinaryName = 'thunderbird-bin';
+
+#
+# For embedding app, use:
+#$EmbedBinaryName = 'TestGtkEmbed';
+#$EmbedDistDir    = 'dist/bin'
+
+
+#$ShellOverride = ''; # Only used if the default shell is too stupid
+#$ConfigureArgs = '';
+#$ConfigureEnvArgs = '';
+#$Compiler = 'gcc';
+#$NSPRArgs = '';
+#$ShellOverride = '';
+
+# allow override of timezone value (for win32 POSIX::strftime)
+#$Timezone = '';
+
+# Release build options
+$ReleaseBuild  = 1;
+$ReleaseToLatest = 0; # Push the release to latest-<milestone>?
+$ReleaseToDated = 1; # Push the release to YYYY-MM-DD-HH-<milestone>?
+$shiptalkback  = 0;
+$build_hour    = "3";
+$package_creation_path = "/mail/installer";
+$ssh_version   = "2";
+# CONFIG: $ssh_user      = "%sshUser%";
+$ssh_user      = "cltbld";
+# CONFIG: $ssh_server    = "%sshServer%";
+$ssh_server    = "stage-old.mozilla.org";
+#$ReleaseGroup  = "thunderbird";
+$ftp_path      = "/home/ftp/pub/thunderbird/nightly";
+$url_path      = "http://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly";
+$tbox_ftp_path = "/home/ftp/pub/thunderbird/tinderbox-builds";
+$tbox_url_path = "http://ftp.mozilla.org/pub/mozilla.org/thunderbird/tinderbox-builds";
+# CONFIG: $milestone     = 'thunderbird%version%';
+$milestone     = 'thunderbird3.0a2';
+$notify_list   = "build-announce\@mozilla.org";
+$stub_installer = 0;
+$sea_installer = 0;
+$archive       = 1;
+$update_package = 1;
+$update_product = "Thunderbird";
+$update_version = "trunk";
+$update_platform = "Linux_x86-gcc3";
+$update_hash = "sha1";
+$update_filehost = "ftp.mozilla.org";
+$update_ver_file = "mail/config/version.txt";
+$update_pushinfo = 0;
+$crashreporter_buildsymbols = 1;
+$crashreporter_pushsymbols = 1;
+# CONFIG: $ENV{'SYMBOL_SERVER_HOST'}    = '%symbolServer%';
+$ENV{'SYMBOL_SERVER_HOST'}    = 'dm-symbolpush01.mozilla.org';
+# CONFIG: $ENV{'SYMBOL_SERVER_USER'}    = '%symbolServerUser%';
+$ENV{'SYMBOL_SERVER_USER'}    = 'tbirdbld';
+# CONFIG: $ENV{'SYMBOL_SERVER_PATH'}    = '%symbolServerPath%';
+$ENV{'SYMBOL_SERVER_PATH'}    = '/mnt/netapp/breakpad/symbols_tbrd';
+# CONFIG: $ENV{'SYMBOL_SERVER_SSH_KEY'} = '%symbolServerKey%';
+$ENV{'SYMBOL_SERVER_SSH_KEY'} = '/home/cltbld/.ssh/tbirdbld_dsa';
+
+# Reboot the OS at the end of build-and-test cycle. This is primarily
+# intended for Win9x, which can't last more than a few cycles before
+# locking up (and testing would be suspect even after a couple of cycles).
+# Right now, there is only code to force the reboot for Win9x, so even
+# setting this to 1, will not have an effect on other platforms. Setting
+# up win9x to automatically logon and begin running tinderbox is left 
+# as an exercise to the reader. 
+#$RebootSystem = 0;
+
+# LogCompression specifies the type of compression used on the log file.
+# Valid options are 'gzip', and 'bzip2'. Please make sure the binaries
+# for 'gzip' or 'bzip2' are in the user's path before setting this
+# option.
+#$LogCompression = 'bzip2';
+
+# LogEncoding specifies the encoding format used for the logs. Valid
+# options are 'base64', and 'uuencode'. If $LogCompression is set above,
+# this needs to be set to 'base64' or 'uuencode' to ensure that the
+# binary data is transferred properly.
+#$LogEncoding = 'base64';
+
+
--- a/mozilla/tools/tinderbox-configs/thunderbird/macosx/CLOBBER
+++ b/mozilla/tools/tinderbox-configs/thunderbird/macosx/CLOBBER
@@ -0,0 +1 @@
+Clobbering to force nightly due to nightly bustage from bug 428672.
--- a/mozilla/tools/tinderbox-configs/thunderbird/macosx/mozconfig
+++ b/mozilla/tools/tinderbox-configs/thunderbird/macosx/mozconfig
@@ -0,0 +1,28 @@
+#
+## hostname: bm-xserve07.build.mozilla.org
+## uname: Darwin bm-xserve07.build.mozilla.org 8.8.4 Darwin Kernel Version 8.8.4: Sun Oct 29 15:26:54 PST 2006; root:xnu-792.16.4.obj~1/RELEASE_I386 i386 i386
+#
+
+# symbols for breakpad
+export CFLAGS="-g -gfull"
+export CXXFLAGS="-g -gfull"
+
+. $topsrcdir/build/macosx/universal/mozconfig
+
+# Make flags
+mk_add_options MOZ_CO_PROJECT=mail
+mk_add_options MOZ_MAKE_FLAGS="-j1"
+mk_add_options MOZ_CO_MODULE="mozilla/tools/update-packaging"
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../build/universal
+
+# Configure flags
+ac_add_options --enable-application=mail
+ac_add_options --enable-update-channel=beta
+# Add explicit optimize flags in configure.in, not here - see bug 407794
+ac_add_options --enable-optimize
+ac_add_options --disable-debug
+ac_add_options --disable-tests
+ac_add_options --enable-static
+ac_add_options --disable-shared
+
+ac_add_options --enable-update-packaging
--- a/mozilla/tools/tinderbox-configs/thunderbird/macosx/tinder-config.pl
+++ b/mozilla/tools/tinderbox-configs/thunderbird/macosx/tinder-config.pl
@@ -0,0 +1,262 @@
+#
+## hostname: bm-xserve07.build.mozilla.org
+## uname: Darwin bm-xserve07.build.mozilla.org 8.8.4 Darwin Kernel Version 8.8.4: Sun Oct 29 15:26:54 PST 2006; root:xnu-792.16.4.obj~1/RELEASE_I386 i386 i386
+#
+
+#- tinder-config.pl - Tinderbox configuration file.
+#-    Uncomment the variables you need to set.
+#-    The default values are the same as the commented variables.
+
+# $ENV{NO_EM_RESTART} = "1";
+# $ENV{DYLD_NO_FIX_PREBINDING} = "1";
+# $ENV{LD_PREBIND_ALLOW_OVERLAP} = "1";
+$ENV{MOZ_CRASHREPORTER_NO_REPORT} = '1';
+
+$MacUniversalBinary = 1;
+
+# $ENV{MOZ_PACKAGE_MSI}
+#-----------------------------------------------------------------------------
+#  Default: 0
+#   Values: 0 | 1
+#  Purpose: Controls whether a MSI package is made.
+# Requires: Windows and a local MakeMSI installation.
+#$ENV{MOZ_PACKAGE_MSI} = 0;
+
+# $ENV{MOZ_SYMBOLS_TRANSFER_TYPE}
+#-----------------------------------------------------------------------------
+#  Default: scp
+#   Values: scp | rsync
+#  Purpose: Use scp or rsync to transfer symbols to the Talkback server.
+# Requires: The selected type requires the command be available both locally
+#           and on the Talkback server.
+#$ENV{MOZ_SYMBOLS_TRANSFER_TYPE} = "scp";
+
+#- PLEASE FILL THIS IN WITH YOUR PROPER EMAIL ADDRESS
+$BuildAdministrator = 'build@mozilla.org';
+#$BuildAdministrator = "$ENV{USER}\@$ENV{HOST}";
+#$BuildAdministrator = ($ENV{USER} || "cltbld") . "\@" . ($ENV{HOST} || "dhcp");
+
+#- You'll need to change these to suit your machine's needs
+#$DisplayServer = ':0.0';
+
+#- Default values of command-line opts
+#-
+#$BuildDepend       = 1;      # Depend or Clobber
+#$BuildDebug        = 0;      # Debug or Opt (Darwin)
+#$ReportStatus      = 1;      # Send results to server, or not
+#$ReportFinalStatus = 1;      # Finer control over $ReportStatus.
+$UseTimeStamp      = 0;      # Use the CVS 'pull-by-timestamp' option, or not
+#$BuildOnce         = 0;      # Build once, don't send results to server
+#$TestOnly          = 0;      # Only run tests, don't pull/build
+#$BuildEmbed        = 0;      # After building seamonkey, go build embed app.
+#$SkipMozilla       = 0;      # Use to debug post-mozilla.pl scripts.
+#$BuildLocales      = 0;      # Do l10n packaging?
+
+# Tests
+$CleanProfile             = 1;
+#$ResetHomeDirForTests     = 1;
+$ProductName              = "Thunderbird";
+#$VendorName               = 'Mozilla';
+
+$RunMozillaTests          = 1;  # Allow turning off of all tests if needed.
+$RegxpcomTest             = 1;
+$AliveTest                = 1;
+#$JavaTest                 = 0;
+#$ViewerTest               = 0;
+#$BloatTest                = 0;  # warren memory bloat test
+#$BloatTest2               = 0;  # dbaron memory bloat test, require tracemalloc
+#$DomToTextConversionTest  = 0;  
+#$XpcomGlueTest            = 0;
+$CodesizeTest             = 0;  # Z,  require mozilla/tools/codesighs
+$EmbedCodesizeTest        = 0;  # mZ, require mozilla/tools/codesigns
+#$MailBloatTest            = 0;
+#$EmbedTest                = 0;  # Assumes you wanted $BuildEmbed=1
+#$LayoutPerformanceTest    = 0;  # Tp
+#$DHTMLPerformanceTest     = 0;  # Tdhtml
+#$QATest                   = 0;  
+#$XULWindowOpenTest        = 0;  # Txul
+#$StartupPerformanceTest   = 0;  # Ts
+
+$TestsPhoneHome           = 0;  # Should test report back to server?
+
+# $results_server
+#----------------------------------------------------------------------------
+# Server on which test results will be accessible.  This was originally tegu,
+# then became axolotl.  Once we moved services from axolotl, it was time
+# to give this service its own hostname to make future transitions easier.
+# - cmp@mozilla.org
+#$results_server           = "build-graphs.mozilla.org";
+
+#$pageload_server          = "spider";  # localhost
+
+#
+# Timeouts, values are in seconds.
+#
+#$CVSCheckoutTimeout               = 3600;
+#$CreateProfileTimeout             = 45;
+#$RegxpcomTestTimeout              = 120;
+
+#$AliveTestTimeout                 = 45;
+#$ViewerTestTimeout                = 45;
+#$EmbedTestTimeout                 = 45;
+#$BloatTestTimeout                 = 120;   # seconds
+#$MailBloatTestTimeout             = 120;   # seconds
+#$JavaTestTimeout                  = 45;
+#$DomTestTimeout	                  = 45;    # seconds
+#$XpcomGlueTestTimeout             = 15;
+#$CodesizeTestTimeout              = 900;     # seconds
+#$CodesizeTestType                 = "auto";  # {"auto"|"base"}
+#$LayoutPerformanceTestTimeout     = 1200;  # entire test, seconds
+#$DHTMLPerformanceTestTimeout      = 1200;  # entire test, seconds
+#$QATestTimeout                    = 1200;   # entire test, seconds
+#$LayoutPerformanceTestPageTimeout = 30000; # each page, ms
+#$StartupPerformanceTestTimeout    = 15;    # seconds
+#$XULWindowOpenTestTimeout	      = 150;   # seconds
+
+
+#$MozConfigFileName = 'mozconfig';
+
+#$UseMozillaProfile = 1;
+#$MozProfileName = 'default';
+
+#- Set these to what makes sense for your system
+#$Make          = 'gmake';       # Must be GNU make
+#$MakeOverrides = '';
+#$mail          = '/bin/mail';
+#$CVS           = 'cvs -q';
+#$CVSCO         = 'checkout -P';
+
+# win32 usually doesn't have /bin/mail
+#$blat           = 'c:/nstools/bin/blat';
+#$use_blat       = 0;
+
+# Set moz_cvsroot to something like:
+# :pserver:$ENV{USER}%netscape.com\@cvs.mozilla.org:/cvsroot
+# :pserver:anonymous\@cvs-mirror.mozilla.org:/cvsroot
+#
+# Note that win32 may not need \@, depends on ' or ".
+# :pserver:$ENV{USER}%netscape.com@cvs.mozilla.org:/cvsroot
+
+#$moz_cvsroot   = $ENV{CVSROOT};
+# CONFIG: $moz_cvsroot   = '%mozillaCvsroot%';
+$moz_cvsroot   = 'cltbld@cvs.mozilla.org:/cvsroot';
+
+#- Set these proper values for your tinderbox server
+#$Tinderbox_server = 'tinderbox-daemon@tinderbox.mozilla.org';
+
+# Allow for non-client builds, e.g. camino.
+#$moz_client_mk = 'client.mk';
+
+#- Set if you want to build in a separate object tree
+$ObjDir = '../build/universal';
+
+# Extra build name, if needed.
+$BuildNameExtra = 'Release';
+
+# User comment, eg. ip address for dhcp builds.
+# ex: $UserComment = "ip = 208.12.36.108";
+#$UserComment = 0;
+
+#-
+#- The rest should not need to be changed
+#-
+
+#- Minimum wait period from start of build to start of next build in minutes.
+#$BuildSleep = 10;
+
+#- Until you get the script working. When it works,
+#- change to the tree you're actually building
+#$BuildTree  = 'MozillaTest';
+# CONFIG: $BuildTree  = '%buildTree%';
+$BuildTree  = 'MozillaRelease';
+
+#$BuildName = '';
+# CONFIG: $BuildTag = '%productTag%_RELEASE';
+$BuildTag = 'THUNDERBIRD_3_0a2_RELEASE';
+#$BuildConfigDir = 'mozilla/config';
+#$Topsrcdir = 'mozilla';
+
+$BinaryName = 'thunderbird-bin';
+
+#
+# For embedding app, use:
+#$EmbedBinaryName = 'TestGtkEmbed';
+#$EmbedDistDir    = 'dist/bin'
+
+
+#$ShellOverride = ''; # Only used if the default shell is too stupid
+#$ConfigureArgs = '';
+#$ConfigureEnvArgs = '';
+#$Compiler = 'gcc';
+#$NSPRArgs = '';
+#$ShellOverride = '';
+
+# Release build options
+$ReleaseBuild  = 1;
+$shiptalkback  = 0;
+$ReleaseToLatest = 0; # Push the release to latest-<milestone>?
+$ReleaseToDated = 1; # Push the release to YYYY-MM-DD-HH-<milestone>?
+$build_hour    = "3";
+$package_creation_path = "/mail/installer";
+# needs setting for mac + talkback: $mac_bundle_path = "/browser/app";
+$mac_bundle_path = "/mail/app";
+$ssh_version   = "2";
+# CONFIG: $ssh_user      = "%sshUser%";
+$ssh_user      = "cltbld";
+# CONFIG: $ssh_server    = "%sshServer%";
+$ssh_server    = "stage-old.mozilla.org";
+#$ReleaseGroup  = "thunderbird";
+$ftp_path      = "/home/ftp/pub/thunderbird/nightly";
+$url_path      = "http://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly";
+$tbox_ftp_path = "/home/ftp/pub/thunderbird/tinderbox-builds";
+$tbox_url_path = "http://ftp.mozilla.org/pub/mozilla.org/thunderbird/tinderbox-builds";
+# CONFIG: $milestone     = 'thunderbird%version%';
+$milestone     = 'thunderbird3.0a2';
+$notify_list   = "build-announce\@mozilla.org";
+$stub_installer = 0;
+$sea_installer = 0;
+$archive       = 1;
+$push_raw_xpis = 0;
+$update_package = 1;
+$update_product = "Thunderbird";
+$update_version = "trunk";
+$update_platform = "Darwin_Universal-gcc3";
+$update_hash = "sha1";
+$update_filehost = "ftp.mozilla.org";
+$update_ver_file = "mail/config/version.txt";
+$update_pushinfo = 0;
+$crashreporter_buildsymbols = 1;
+$crashreporter_pushsymbols = 1;
+# CONFIG: $ENV{'SYMBOL_SERVER_HOST'}    = '%symbolServer%';
+$ENV{'SYMBOL_SERVER_HOST'}    = 'dm-symbolpush01.mozilla.org';
+# CONFIG: $ENV{'SYMBOL_SERVER_USER'}    = '%symbolServerUser%';
+$ENV{'SYMBOL_SERVER_USER'}    = 'tbirdbld';
+# CONFIG: $ENV{'SYMBOL_SERVER_PATH'}    = '%symbolServerPath%';
+$ENV{'SYMBOL_SERVER_PATH'}    = '/mnt/netapp/breakpad/symbols_tbrd';
+# CONFIG: $ENV{'SYMBOL_SERVER_SSH_KEY'} = '%symbolServerKey%';
+$ENV{'SYMBOL_SERVER_SSH_KEY'} = '/Users/cltbld/.ssh/tbirdbld_dsa';
+
+# Reboot the OS at the end of build-and-test cycle. This is primarily
+# intended for Win9x, which can't last more than a few cycles before
+# locking up (and testing would be suspect even after a couple of cycles).
+# Right now, there is only code to force the reboot for Win9x, so even
+# setting this to 1, will not have an effect on other platforms. Setting
+# up win9x to automatically logon and begin running tinderbox is left 
+# as an exercise to the reader. 
+#$RebootSystem = 0;
+
+# LogCompression specifies the type of compression used on the log file.
+# Valid options are 'gzip', and 'bzip2'. Please make sure the binaries
+# for 'gzip' or 'bzip2' are in the user's path before setting this
+# option.
+#$LogCompression = '';
+
+# LogEncoding specifies the encoding format used for the logs. Valid
+# options are 'base64', and 'uuencode'. If $LogCompression is set above,
+# this needs to be set to 'base64' or 'uuencode' to ensure that the
+# binary data is transferred properly.
+#$LogEncoding = '';
+
+# Prevent Extension Manager from spawning child processes during tests
+# - processes that tbox scripts cannot kill. 
+#$ENV{NO_EM_RESTART} = '1';
--- a/mozilla/tools/tinderbox-configs/thunderbird/win32/CLOBBER
+++ b/mozilla/tools/tinderbox-configs/thunderbird/win32/CLOBBER
@@ -0,0 +1 @@
+Clobbering to force nightly due to nightly bustage from bug 428672.
--- a/mozilla/tools/tinderbox-configs/thunderbird/win32/mozconfig
+++ b/mozilla/tools/tinderbox-configs/thunderbird/win32/mozconfig
@@ -0,0 +1,22 @@
+#
+## hostname: tbnewref-win32-tbox
+## MINGW32_NT-5.2 TBNEWREF-WIN32- 1.0.11(0.46/3/2) 2007-01-12 12:05 i686 Msys
+#
+
+mk_add_options MOZ_CO_PROJECT=mail
+mk_add_options MOZ_DEBUG_SYMBOLS=1
+mk_add_options MOZ_MAKE_FLAGS=-j1
+mk_add_options MOZ_CO_MODULE="mozilla/tools/update-packaging"
+
+ac_add_options --enable-application=mail
+ac_add_options --enable-update-channel=beta
+ac_add_options --disable-debug
+# Add explicit optimize flags in configure.in, not here - see bug 407794
+ac_add_options --enable-optimize
+ac_add_options --disable-tests
+ac_add_options --disable-shared
+ac_add_options --enable-static
+ac_add_options --enable-update-packaging
+
+export WIN32_REDIST_DIR="/d/msvs8/VC/redist/x86/Microsoft.VC80.CRT"
+
--- a/mozilla/tools/tinderbox-configs/thunderbird/win32/tinder-config.pl
+++ b/mozilla/tools/tinderbox-configs/thunderbird/win32/tinder-config.pl
@@ -0,0 +1,235 @@
+#
+## hostname: tbnewref-win32-tbox
+## MINGW32_NT-5.2 TBNEWREF-WIN32- 1.0.11(0.46/3/2) 2007-01-12 12:05 i686 Msys
+#
+
+#- tinder-config.pl - Tinderbox configuration file.
+#-    Uncomment the variables you need to set.
+#-    The default values are the same as the commented variables.
+
+$ENV{CVSROOT}=":ext:tbirdbld\@cvs.mozilla.org:/cvsroot";
+$ENV{MOZ_INSTALLER_USE_7ZIP}="1";
+$ENV{MOZ_PACKAGE_MSI} = 0;
+$ENV{MOZ_CRASHREPORTER_NO_REPORT} = '1';
+# Both these two variables are for source server support
+$ENV{PDBSTR_PATH} = 'C:\\Program Files\\Debugging Tools for Windows\\sdk\\srcsrv\\pdbstr.exe';
+$ENV{SRCSRV_ROOT} = ':pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot';
+
+#- PLEASE FILL THIS IN WITH YOUR PROPER EMAIL ADDRESS
+#$BuildAdministrator = "$ENV{USER}\@$ENV{HOST}";
+#$BuildAdministrator = ($ENV{USER} || "cltbld") . "\@" . ($ENV{HOST} || "dhcp");
+
+#- You'll need to change these to suit your machine's needs
+#$DisplayServer = ':0.0';
+
+#- Default values of command-line opts
+#-
+$BuildDepend       = 0;      # Depend or Clobber
+#$BuildDebug        = 0;      # Debug or Opt (Darwin)
+#$ReportStatus      = 1;      # Send results to server, or not
+#$ReportFinalStatus = 1;      # Finer control over $ReportStatus.
+$UseTimeStamp      = 0;      # Use the CVS 'pull-by-timestamp' option, or not
+#$BuildOnce         = 0;      # Build once, don't send results to server
+#$TestOnly          = 0;      # Only run tests, don't pull/build
+#$BuildEmbed        = 0;      # After building seamonkey, go build embed app.
+#$SkipMozilla       = 0;      # Use to debug post-mozilla.pl scripts.
+#$BuildLocales      = 0;      # Do l10n packaging?
+
+# Tests
+$CleanProfile             = 1;
+#$ResetHomeDirForTests     = 1;
+$ProductName              = "Thunderbird";
+#$VendorName               = '';
+
+$RunMozillaTests          = 1;  # Allow turning off of all tests if needed.
+#$RegxpcomTest             = 1;
+#$AliveTest                = 1;
+#$JavaTest                 = 0;
+#$ViewerTest               = 0;
+#$BloatTest                = 0;  # warren memory bloat test
+#$BloatTest2               = 0;  # dbaron memory bloat test, require tracemalloc
+#$DomToTextConversionTest  = 0;  
+#$XpcomGlueTest            = 0;
+#$CodesizeTest             = 0;  # Z,  require mozilla/tools/codesighs
+#$EmbedCodesizeTest        = 0;  # mZ, require mozilla/tools/codesigns
+#$MailBloatTest            = 0;
+#$EmbedTest                = 0;  # Assumes you wanted $BuildEmbed=1
+#$LayoutPerformanceTest    = 0;  # Tp
+#$DHTMLPerformanceTest     = 0;  # Tdhtml
+#$QATest                   = 0;  
+#$XULWindowOpenTest        = 0;  # Txul
+#$StartupPerformanceTest   = 0;  # Ts
+
+$TestsPhoneHome           = 0;  # Should test report back to server?
+#$results_server           = "axolotl.mozilla.org"; # was tegu
+#$pageload_server          = "spider";  # localhost
+
+#
+# Timeouts, values are in seconds.
+#
+#$CVSCheckoutTimeout               = 3600;
+#$CreateProfileTimeout             = 45;
+#$RegxpcomTestTimeout              = 120;
+
+#$AliveTestTimeout                 = 45;
+#$ViewerTestTimeout                = 45;
+#$EmbedTestTimeout                 = 45;
+#$BloatTestTimeout                 = 120;   # seconds
+#$MailBloatTestTimeout             = 120;   # seconds
+#$JavaTestTimeout                  = 45;
+#$DomTestTimeout	                  = 45;    # seconds
+#$XpcomGlueTestTimeout             = 15;
+#$CodesizeTestTimeout              = 900;     # seconds
+#$CodesizeTestType                 = "auto";  # {"auto"|"base"}
+#$LayoutPerformanceTestTimeout     = 1200;  # entire test, seconds
+#$DHTMLPerformanceTestTimeout      = 1200;  # entire test, seconds
+#$QATestTimeout                    = 1200;   # entire test, seconds
+#$LayoutPerformanceTestPageTimeout = 30000; # each page, ms
+#$StartupPerformanceTestTimeout    = 15;    # seconds
+#$XULWindowOpenTestTimeout	      = 150;   # seconds
+
+
+#$MozConfigFileName = 'mozconfig';
+
+#$UseMozillaProfile = 1;
+#$MozProfileName = 'default';
+
+#- Set these to what makes sense for your system
+$Make          = 'make';       # Must be GNU make
+#$MakeOverrides = '';
+#$mail          = '/bin/mail';
+#$CVS           = 'cvs -q';
+#$CVSCO         = 'checkout -P';
+
+# win32 usually doesn't have /bin/mail
+$blat           = '/d/mozilla-build/blat261/full/blat';
+$use_blat       = 0;
+
+# Set moz_cvsroot to something like:
+# :pserver:$ENV{USER}%netscape.com\@cvs.mozilla.org:/cvsroot
+# :pserver:anonymous\@cvs-mirror.mozilla.org:/cvsroot
+#
+# Note that win32 may not need \@, depends on ' or ".
+# :pserver:$ENV{USER}%netscape.com@cvs.mozilla.org:/cvsroot
+
+# CONFIG: $moz_cvsroot = '%mozillaCvsroot%';
+$moz_cvsroot = 'cltbld@cvs.mozilla.org:/cvsroot';
+
+#- Set these proper values for your tinderbox server
+#$Tinderbox_server = 'tinderbox-daemon@tinderbox.mozilla.org';
+
+# Allow for non-client builds, e.g. camino.
+#$moz_client_mk = 'client.mk';
+
+#- Set if you want to build in a separate object tree
+$ObjDir = 'obj-tb-trunk';
+
+# Extra build name, if needed.
+$BuildNameExtra = 'Release';
+
+# User comment, eg. ip address for dhcp builds.
+# ex: $UserComment = "ip = 208.12.36.108";
+#$UserComment = 0;
+
+#-
+#- The rest should not need to be changed
+#-
+
+#- Minimum wait period from start of build to start of next build in minutes.
+#$BuildSleep = 10;
+
+#- Until you get the script working. When it works,
+#- change to the tree you're actually building
+# CONFIG: $BuildTree  = '%buildTree%';
+$BuildTree  = 'MozillaRelease';
+
+#$BuildName = '';
+# CONFIG: $BuildTag = '%productTag%_RELEASE';
+$BuildTag = 'THUNDERBIRD_3_0a2_RELEASE';
+#$BuildConfigDir = 'mozilla/config';
+#$Topsrcdir = 'mozilla';
+
+$BinaryName = 'thunderbird.exe';
+
+#
+# For embedding app, use:
+#$EmbedBinaryName = 'TestGtkEmbed';
+#$EmbedDistDir    = 'dist/bin'
+
+
+#$ShellOverride = ''; # Only used if the default shell is too stupid
+#$ConfigureArgs = '';
+#$ConfigureEnvArgs = '';
+#$Compiler = 'gcc';
+#$NSPRArgs = '';
+#$ShellOverride = '';
+
+# Release build options
+$ReleaseBuild  = 1;
+$shiptalkback  = 0;
+$ReleaseToLatest = 0;
+$ReleaseToDated = 1;
+$build_hour    = "3";
+$package_creation_path = "/mail/installer";
+# needs setting for mac + talkback: $mac_bundle_path = "/browser/app";
+$ssh_version   = "2";
+# CONFIG: $ssh_user      = "%sshUser%";
+$ssh_user      = "cltbld";
+# CONFIG: $ssh_server    = "%sshServer%";
+$ssh_server    = "stage-old.mozilla.org";
+#$ReleaseGroup  = "thunderbird";
+$ftp_path      = "/home/ftp/pub/thunderbird/nightly";
+$url_path      = "http://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly";
+$tbox_ftp_path      = "/home/ftp/pub/thunderbird/tinderbox-builds";
+$tbox_url_path      = "http://ftp.mozilla.org/pub/mozilla.org/thunderbird/tinderbox-builds";
+# CONFIG: $milestone     = 'thunderbird%version%';
+$milestone     = 'thunderbird3.0a2';
+$notify_list   = "build-announce\@mozilla.org";
+$stub_installer = 0;
+$sea_installer = 1;
+$archive       = 1;
+$push_raw_xpis = 1;
+
+$update_package = 1;
+$update_product = "Thunderbird";
+$update_version = "trunk";
+$update_ver_file = "mail/config/version.txt";
+$update_platform = "WINNT_x86-msvc";
+$update_hash = "sha1";
+$update_filehost = "ftp.mozilla.org";
+$update_pushinfo = 0;
+$crashreporter_buildsymbols = 1;
+$crashreporter_pushsymbols = 1;
+# CONFIG: $ENV{'SYMBOL_SERVER_HOST'}    = '%symbolServer%';
+$ENV{'SYMBOL_SERVER_HOST'}    = 'dm-symbolpush01.mozilla.org';
+# CONFIG: $ENV{'SYMBOL_SERVER_USER'}    = '%symbolServerUser%';
+$ENV{'SYMBOL_SERVER_USER'}    = 'tbirdbld';
+# CONFIG: $ENV{'SYMBOL_SERVER_PATH'}    = '%symbolServerPath%';
+$ENV{'SYMBOL_SERVER_PATH'}    = '/mnt/netapp/breakpad/symbols_tbrd';
+# CONFIG: $ENV{'SYMBOL_SERVER_SSH_KEY'} = '%symbolServerKey%';
+$ENV{'SYMBOL_SERVER_SSH_KEY'} = '/c/Documents and Settings/cltbld/.ssh/tbirdbld_dsa';
+
+# Reboot the OS at the end of build-and-test cycle. This is primarily
+# intended for Win9x, which can't last more than a few cycles before
+# locking up (and testing would be suspect even after a couple of cycles).
+# Right now, there is only code to force the reboot for Win9x, so even
+# setting this to 1, will not have an effect on other platforms. Setting
+# up win9x to automatically logon and begin running tinderbox is left 
+# as an exercise to the reader. 
+#$RebootSystem = 0;
+
+# LogCompression specifies the type of compression used on the log file.
+# Valid options are 'gzip', and 'bzip2'. Please make sure the binaries
+# for 'gzip' or 'bzip2' are in the user's path before setting this
+# option.
+#$LogCompression = '';
+
+# LogEncoding specifies the encoding format used for the logs. Valid
+# options are 'base64', and 'uuencode'. If $LogCompression is set above,
+# this needs to be set to 'base64' or 'uuencode' to ensure that the
+# binary data is transferred properly.
+#$LogEncoding = '';
+
+# Prevent Extension Manager from spawning child processes during tests
+# - processes that tbox scripts cannot kill. 
+#$ENV{NO_EM_RESTART} = '1';
--- a/mozilla/tools/tinderbox-configs/xulrunner/linux/CLOBBER
+++ b/mozilla/tools/tinderbox-configs/xulrunner/linux/CLOBBER
@@ -0,0 +1 @@
+Clobbering to fix up checkout issues
--- a/mozilla/tools/tinderbox-configs/xulrunner/linux/mozconfig
+++ b/mozilla/tools/tinderbox-configs/xulrunner/linux/mozconfig
@@ -0,0 +1,17 @@
+#
+## hostname: xr-linux-tbox
+## uname: Linux xr-linux-tbox.build.mozilla.org 2.6.18-8.el5 #1 SMP Thu Mar 15 19:57:35 EDT 2007 i686 i686 i386 GNU/Linux
+#
+
+export MOZILLA_OFFICIAL=1
+export JAVA_HOME=/tools/jdk
+mk_add_options MOZILLA_OFFICIAL=1
+
+mk_add_options MOZ_CO_PROJECT=xulrunner
+mk_add_options MOZ_MAKE_FLAGS="-j3"
+
+ac_add_options --enable-application=xulrunner
+ac_add_options --disable-tests
+
+CC=/tools/gcc-4.1.1/bin/gcc
+CXX=/tools/gcc-4.1.1/bin/g++
--- a/mozilla/tools/tinderbox-configs/xulrunner/linux/tinder-config.pl
+++ b/mozilla/tools/tinderbox-configs/xulrunner/linux/tinder-config.pl
@@ -0,0 +1,262 @@
+#
+## hostname: xr-linux-tbox
+## uname: Linux xr-linux-tbox.build.mozilla.org 2.6.18-8.el5 #1 SMP Thu Mar 15 19:57:35 EDT 2007 i686 i686 i386 GNU/Linux
+#
+
+#- tinder-config.pl - Tinderbox configuration file.
+#-    Uncomment the variables you need to set.
+#-    The default values are the same as the commented variables.
+
+$ENV{MOZ_CRASHREPORTER_NO_REPORT} = '1';
+
+# $ENV{MOZ_PACKAGE_MSI}
+#-----------------------------------------------------------------------------
+#  Default: 0
+#   Values: 0 | 1
+#  Purpose: Controls whether a MSI package is made.
+# Requires: Windows and a local MakeMSI installation.
+#$ENV{MOZ_PACKAGE_MSI} = 0;
+
+# $ENV{MOZ_SYMBOLS_TRANSFER_TYPE}
+#-----------------------------------------------------------------------------
+#  Default: scp
+#   Values: scp | rsync
+#  Purpose: Use scp or rsync to transfer symbols to the Talkback server.
+# Requires: The selected type requires the command be available both locally
+#           and on the Talkback server.
+#$ENV{MOZ_SYMBOLS_TRANSFER_TYPE} = "scp";
+
+#- PLEASE FILL THIS IN WITH YOUR PROPER EMAIL ADDRESS
+#$BuildAdministrator = "$ENV{USER}\@$ENV{HOST}";
+#$BuildAdministrator = ($ENV{USER} || "cltbld") . "\@" . ($ENV{HOST} || "dhcp");
+$BuildAdministrator = "build\@mozilla.org";
+
+#- You'll need to change these to suit your machine's needs
+#$DisplayServer = ':0.0';
+
+#- Default values of command-line opts
+#-
+#$BuildDepend       = 1;      # Depend or Clobber
+#$BuildDebug        = 0;      # Debug or Opt (Darwin)
+#$ReportStatus      = 1;      # Send results to server, or not
+#$ReportFinalStatus = 1;      # Finer control over $ReportStatus.
+$UseTimeStamp      = 0;      # Use the CVS 'pull-by-timestamp' option, or not
+#$BuildOnce         = 0;      # Build once, don't send results to server
+#$ConfigureOnly     = 0;      # Configure, but do not build.
+#$TestOnly          = 0;      # Only run tests, don't pull/build
+#$BuildEmbed        = 0;      # After building seamonkey, go build embed app.
+#$SkipMozilla       = 0;      # Use to debug post-mozilla.pl scripts.
+#$BuildLocales      = 0;      # Do l10n packaging?
+$BuildSDK           = 1;      # Build the SDK
+
+# Only used when $BuildLocales = 1
+%WGetFiles         = ();  # Pull files from the web, URL => Location
+#$WGetTimeout       = 360; # Wget timeout, in seconds
+#$BuildLocalesArgs  = "";  # Extra attributes to add to the makefile command
+                          # which builds the "installers-<locale>" target.
+                          # Typically used to set ZIP_IN and WIN32_INSTALLER_IN
+
+# Tests
+$CleanProfile             = 1;
+#$ResetHomeDirForTests     = 1;
+$ProductName              = "XULRunner";
+$VendorName               = 'Mozilla';
+
+$RunMozillaTests          = 0;  # Allow turning off of all tests if needed.
+#$RegxpcomTest             = 1;
+#$AliveTest                = 1;
+#$JavaTest                 = 0;
+#$ViewerTest               = 0;
+#$BloatTest                = 0;  # warren memory bloat test
+#$BloatTest2               = 0;  # dbaron memory bloat test, require tracemalloc
+#$DomToTextConversionTest  = 0;  
+#$XpcomGlueTest            = 0;
+#$CodesizeTest             = 0;  # Z,  require mozilla/tools/codesighs
+#$EmbedCodesizeTest        = 0;  # mZ, require mozilla/tools/codesigns
+#$MailBloatTest            = 0;
+#$EmbedTest                = 0;  # Assumes you wanted $BuildEmbed=1
+#$LayoutPerformanceTest    = 0;  # Tp
+#$DHTMLPerformanceTest     = 0;  # Tdhtml
+#$QATest                   = 0;  
+#$XULWindowOpenTest        = 0;  # Txul
+#$StartupPerformanceTest   = 0;  # Ts
+#@CompareLocaleDirs        = (); # Run compare-locales test on these directories
+# ("network","dom","toolkit","security/manager");
+#$CompareLocalesAviary     = 0;  # Should the compare-locales commands use the
+                                # aviary directory structure?
+
+#$TestsPhoneHome           = 0;  # Should test report back to server?
+
+# $results_server
+#----------------------------------------------------------------------------
+# Server on which test results will be accessible.  This was originally tegu,
+# then became axolotl.  Once we moved services from axolotl, it was time
+# to give this service its own hostname to make future transitions easier.
+# - cmp@mozilla.org
+#$results_server           = "build-graphs.mozilla.org";
+
+#$pageload_server          = "spider";  # localhost
+
+#
+# Timeouts, values are in seconds.
+#
+#$CVSCheckoutTimeout               = 3600;
+#$CreateProfileTimeout             = 45;
+#$RegxpcomTestTimeout              = 120;
+
+#$AliveTestTimeout                 = 45;
+#$ViewerTestTimeout                = 45;
+#$EmbedTestTimeout                 = 45;
+#$BloatTestTimeout                 = 120;   # seconds
+#$MailBloatTestTimeout             = 120;   # seconds
+#$JavaTestTimeout                  = 45;
+#$DomTestTimeout	                  = 45;    # seconds
+#$XpcomGlueTestTimeout             = 15;
+#$CodesizeTestTimeout              = 900;     # seconds
+#$CodesizeTestType                 = "auto";  # {"auto"|"base"}
+#$LayoutPerformanceTestTimeout     = 1200;  # entire test, seconds
+#$DHTMLPerformanceTestTimeout      = 1200;  # entire test, seconds
+#$QATestTimeout                    = 1200;   # entire test, seconds
+#$LayoutPerformanceTestPageTimeout = 30000; # each page, ms
+#$StartupPerformanceTestTimeout    = 15;    # seconds
+#$XULWindowOpenTestTimeout	      = 150;   # seconds
+
+
+#$MozConfigFileName = 'mozconfig';
+
+#$UseMozillaProfile = 1;
+#$MozProfileName = 'default';
+
+#- Set these to what makes sense for your system
+#$Make          = 'gmake';       # Must be GNU make
+#$MakeOverrides = '';
+#$mail          = '/bin/mail';
+#$CVS           = 'cvs -q';
+#$CVSCO         = 'checkout -P';
+
+# win32 usually doesn't have /bin/mail
+#$blat           = 'c:/nstools/bin/blat';
+#$use_blat       = 0;
+
+# Set moz_cvsroot to something like:
+# :pserver:$ENV{USER}%netscape.com\@cvs.mozilla.org:/cvsroot
+# :pserver:anonymous\@cvs-mirror.mozilla.org:/cvsroot
+#
+# Note that win32 may not need \@, depends on ' or ".
+# :pserver:$ENV{USER}%netscape.com@cvs.mozilla.org:/cvsroot
+
+#$moz_cvsroot   = $ENV{CVSROOT};
+# CONFIG: $moz_cvsroot   = '%mozillaCvsroot%';
+$moz_cvsroot   = 'cltbld@cvs.mozilla.org:/cvsroot';
+
+#- Set these proper values for your tinderbox server
+#$Tinderbox_server = 'tinderbox-daemon@tinderbox.mozilla.org';
+
+# Allow for non-client builds, e.g. camino.
+#$moz_client_mk = 'client.mk';
+
+#- Set if you want to build in a separate object tree
+$ObjDir = 'obj-xulrunner';
+
+# Extra build name, if needed.
+$BuildNameExtra = 'Release';
+
+# User comment, eg. ip address for dhcp builds.
+# ex: $UserComment = "ip = 208.12.36.108";
+#$UserComment = 0;
+
+#-
+#- The rest should not need to be changed
+#-
+
+#- Minimum wait period from start of build to start of next build in minutes.
+#$BuildSleep = 10;
+
+#- Until you get the script working. When it works,
+#- change to the tree you're actually building
+# CONFIG: $BuildTree  = '%buildTree%';
+$BuildTree  = 'MozillaRelease';
+
+#$BuildName = '';
+# CONFIG: $BuildTag = '%productTag%_RELEASE';
+$BuildTag = 'FIREFOX_3_0_17_RELEASE';
+#$BuildConfigDir = 'mozilla/config';
+#$Topsrcdir = 'mozilla';
+
+$BinaryName = 'xulrunner-bin';
+
+#
+# For embedding app, use:
+#$EmbedBinaryName = 'TestGtkEmbed';
+#$EmbedDistDir    = 'dist/bin'
+
+
+#$ShellOverride = ''; # Only used if the default shell is too stupid
+#$ConfigureArgs = '';
+#$ConfigureEnvArgs = '';
+#$Compiler = 'gcc';
+#$NSPRArgs = '';
+#$ShellOverride = '';
+
+# Release build options
+$ReleaseBuild  = 1;
+#$LocaleProduct = "browser";
+$shiptalkback  = 0;
+$ReleaseToLatest = 0; # Push the release to latest-<milestone>?
+$ReleaseToDated = 1; # Push the release to YYYY-MM-DD-HH-<milestone>?
+#$build_hour    = "8";
+$package_creation_path = "/xulrunner/installer";
+# needs setting for mac + talkback: $mac_bundle_path = "/browser/app";
+$ssh_version   = "2";
+# CONFIG: $ssh_user      = "%sshUser%";
+$ssh_user      = "cltbld";
+#$ssh_key       = "$ENV{HOME}/.ssh/xrbld_dsa";
+# CONFIG: $ssh_server    = "%sshServer%";
+$ssh_server    = "stage-old.mozilla.org";
+$ReleaseGroup  = "xulrunner";
+$ftp_path      = "/home/ftp/pub/xulrunner/nightly";
+$url_path      = "http://ftp.mozilla.org/pub/mozilla.org/xulrunner/nightly";
+$tbox_ftp_path = "/home/ftp/pub/xulrunner/tinderbox-builds";
+$tbox_url_path = "http://ftp.mozilla.org/pub/mozilla.org/xulrunner/tinderbox-builds";
+# CONFIG: $milestone     = "xulrunner%version%";
+$milestone     = "xulrunner1.9.0.17";
+$notify_list   = "build-announce\@mozilla.org";
+$stub_installer = 0;
+$sea_installer = 0;
+$archive       = 1;
+$push_raw_xpis = 0;
+$crashreporter_buildsymbols = 0;
+$crashreporter_pushsymbols = 0;
+# CONFIG: $ENV{'SYMBOL_SERVER_HOST'}    = '%symbolServer%';
+$ENV{'SYMBOL_SERVER_HOST'}    = 'stage-old.mozilla.org';
+# CONFIG: $ENV{'SYMBOL_SERVER_USER'}    = '%symbolServerUser%';
+$ENV{'SYMBOL_SERVER_USER'}    = 'xrbld';
+# CONFIG: $ENV{'SYMBOL_SERVER_PATH'}    = '%symbolServerPath%';
+$ENV{'SYMBOL_SERVER_PATH'}    = '/mnt/netapp/breakpad/symbols_xr';
+# CONFIG: $ENV{'SYMBOL_SERVER_SSH_KEY'} = '%symbolServerKey%';
+$ENV{'SYMBOL_SERVER_SSH_KEY'} = '/home/cltbld/.ssh/xrbld_dsa';
+
+# Reboot the OS at the end of build-and-test cycle. This is primarily
+# intended for Win9x, which can't last more than a few cycles before
+# locking up (and testing would be suspect even after a couple of cycles).
+# Right now, there is only code to force the reboot for Win9x, so even
+# setting this to 1, will not have an effect on other platforms. Setting
+# up win9x to automatically logon and begin running tinderbox is left 
+# as an exercise to the reader. 
+#$RebootSystem = 0;
+
+# LogCompression specifies the type of compression used on the log file.
+# Valid options are 'gzip', and 'bzip2'. Please make sure the binaries
+# for 'gzip' or 'bzip2' are in the user's path before setting this
+# option.
+#$LogCompression = '';
+
+# LogEncoding specifies the encoding format used for the logs. Valid
+# options are 'base64', and 'uuencode'. If $LogCompression is set above,
+# this needs to be set to 'base64' or 'uuencode' to ensure that the
+# binary data is transferred properly.
+#$LogEncoding = '';
+
+# Prevent Extension Manager from spawning child processes during tests
+# - processes that tbox scripts cannot kill. 
+#$ENV{NO_EM_RESTART} = '1';
--- a/mozilla/tools/tinderbox-configs/xulrunner/macosx/CLOBBER
+++ b/mozilla/tools/tinderbox-configs/xulrunner/macosx/CLOBBER
@@ -0,0 +1 @@
+CLOBBERing to disable zipwriter from bug 379633
--- a/mozilla/tools/tinderbox-configs/xulrunner/macosx/mozconfig
+++ b/mozilla/tools/tinderbox-configs/xulrunner/macosx/mozconfig
@@ -0,0 +1,20 @@
+#
+## hostname: bm-xserve09.build.mozilla.org
+## uname: Darwin bm-xserve09.build.mozilla.org 8.8.4 Darwin Kernel Version 8.8.4: Sun Oct 29 15:26:54 PST 2006; root:xnu-792.16.4.obj~1/RELEASE_I386 i386 i386
+#
+
+. $topsrcdir/build/macosx/universal/mozconfig
+
+export MOZILLA_OFFICIAL=1
+export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home
+mk_add_options MOZILLA_OFFICIAL=1
+
+mk_add_options MOZ_CO_PROJECT=xulrunner
+mk_add_options MOZ_MAKE_FLAGS="-j8"
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../build/universal
+
+ac_add_options --enable-application=xulrunner
+ac_add_options --disable-tests
+ac_add_options --enable-svg
+ac_add_options --enable-canvas
+ac_add_app_options ppc --enable-prebinding
--- a/mozilla/tools/tinderbox-configs/xulrunner/macosx/tinder-config.pl
+++ b/mozilla/tools/tinderbox-configs/xulrunner/macosx/tinder-config.pl
@@ -0,0 +1,268 @@
+#
+## hostname: bm-xserve09.build.mozilla.org
+## uname: Darwin bm-xserve09.build.mozilla.org 8.8.4 Darwin Kernel Version 8.8.4: Sun Oct 29 15:26:54 PST 2006; root:xnu-792.16.4.obj~1/RELEASE_I386 i386 i386
+#
+
+#- tinder-config.pl - Tinderbox configuration file.
+#-    Uncomment the variables you need to set.
+#-    The default values are the same as the commented variables.
+
+$MacUniversalBinary = 1;
+
+$ENV{CHOWN_ROOT} = "/builds/tinderbox/bin/chown_root";
+$ENV{REVERT_ROOT} = "/builds/tinderbox/bin/revert_root";
+$ENV{CHOWN_REVERT} = $ENV{REVERT_ROOT};
+$ENV{MOZ_CRASHREPORTER_NO_REPORT} = '1';
+
+# $ENV{MOZ_PACKAGE_MSI}
+#-----------------------------------------------------------------------------
+#  Default: 0
+#   Values: 0 | 1
+#  Purpose: Controls whether a MSI package is made.
+# Requires: Windows and a local MakeMSI installation.
+#$ENV{MOZ_PACKAGE_MSI} = 0;
+
+# $ENV{MOZ_SYMBOLS_TRANSFER_TYPE}
+#-----------------------------------------------------------------------------
+#  Default: scp
+#   Values: scp | rsync
+#  Purpose: Use scp or rsync to transfer symbols to the Talkback server.
+# Requires: The selected type requires the command be available both locally
+#           and on the Talkback server.
+#$ENV{MOZ_SYMBOLS_TRANSFER_TYPE} = "scp";
+
+#- PLEASE FILL THIS IN WITH YOUR PROPER EMAIL ADDRESS
+#$BuildAdministrator = "$ENV{USER}\@$ENV{HOST}";
+#$BuildAdministrator = ($ENV{USER} || "cltbld") . "\@" . ($ENV{HOST} || "dhcp");
+$BuildAdministrator = "build\@mozilla.org";
+
+#- You'll need to change these to suit your machine's needs
+#$DisplayServer = ':0.0';
+
+#- Default values of command-line opts
+#-
+#$BuildDepend       = 1;      # Depend or Clobber
+#$BuildDebug        = 0;      # Debug or Opt (Darwin)
+#$ReportStatus      = 1;      # Send results to server, or not
+#$ReportFinalStatus = 1;      # Finer control over $ReportStatus.
+$UseTimeStamp      = 0;      # Use the CVS 'pull-by-timestamp' option, or not
+#$BuildOnce         = 0;      # Build once, don't send results to server
+#$ConfigureOnly     = 0;      # Configure, but do not build.
+#$TestOnly          = 0;      # Only run tests, don't pull/build
+#$BuildEmbed        = 0;      # After building seamonkey, go build embed app.
+#$SkipMozilla       = 0;      # Use to debug post-mozilla.pl scripts.
+#$BuildLocales      = 0;      # Do l10n packaging?
+$BuildSDK           = 1;      # Build the SDK
+
+# Only used when $BuildLocales = 1
+%WGetFiles         = ();  # Pull files from the web, URL => Location
+#$WGetTimeout       = 360; # Wget timeout, in seconds
+#$BuildLocalesArgs  = "";  # Extra attributes to add to the makefile command
+                          # which builds the "installers-<locale>" target.
+                          # Typically used to set ZIP_IN and WIN32_INSTALLER_IN
+
+# Tests
+$CleanProfile             = 1;
+#$ResetHomeDirForTests     = 1;
+$ProductName              = "XULRunner";
+$VendorName               = 'Mozilla';
+
+$RunMozillaTests          = 0;  # Allow turning off of all tests if needed.
+#$RegxpcomTest             = 1;
+#$AliveTest                = 1;
+#$JavaTest                 = 0;
+#$ViewerTest               = 0;
+#$BloatTest                = 0;  # warren memory bloat test
+#$BloatTest2               = 0;  # dbaron memory bloat test, require tracemalloc
+#$DomToTextConversionTest  = 0;  
+#$XpcomGlueTest            = 0;
+#$CodesizeTest             = 0;  # Z,  require mozilla/tools/codesighs
+#$EmbedCodesizeTest        = 0;  # mZ, require mozilla/tools/codesigns
+#$MailBloatTest            = 0;
+#$EmbedTest                = 0;  # Assumes you wanted $BuildEmbed=1
+#$LayoutPerformanceTest    = 0;  # Tp
+#$DHTMLPerformanceTest     = 0;  # Tdhtml
+#$QATest                   = 0;  
+#$XULWindowOpenTest        = 0;  # Txul
+#$StartupPerformanceTest   = 0;  # Ts
+#@CompareLocaleDirs        = (); # Run compare-locales test on these directories
+# ("network","dom","toolkit","security/manager");
+#$CompareLocalesAviary     = 0;  # Should the compare-locales commands use the
+                                # aviary directory structure?
+
+#$TestsPhoneHome           = 0;  # Should test report back to server?
+
+# $results_server
+#----------------------------------------------------------------------------
+# Server on which test results will be accessible.  This was originally tegu,
+# then became axolotl.  Once we moved services from axolotl, it was time
+# to give this service its own hostname to make future transitions easier.
+# - cmp@mozilla.org
+#$results_server           = "build-graphs.mozilla.org";
+
+#$pageload_server          = "spider";  # localhost
+
+#
+# Timeouts, values are in seconds.
+#
+#$CVSCheckoutTimeout               = 3600;
+#$CreateProfileTimeout             = 45;
+#$RegxpcomTestTimeout              = 120;
+
+#$AliveTestTimeout                 = 45;
+#$ViewerTestTimeout                = 45;
+#$EmbedTestTimeout                 = 45;
+#$BloatTestTimeout                 = 120;   # seconds
+#$MailBloatTestTimeout             = 120;   # seconds
+#$JavaTestTimeout                  = 45;
+#$DomTestTimeout	                  = 45;    # seconds
+#$XpcomGlueTestTimeout             = 15;
+#$CodesizeTestTimeout              = 900;     # seconds
+#$CodesizeTestType                 = "auto";  # {"auto"|"base"}
+#$LayoutPerformanceTestTimeout     = 1200;  # entire test, seconds
+#$DHTMLPerformanceTestTimeout      = 1200;  # entire test, seconds
+#$QATestTimeout                    = 1200;   # entire test, seconds
+#$LayoutPerformanceTestPageTimeout = 30000; # each page, ms
+#$StartupPerformanceTestTimeout    = 15;    # seconds
+#$XULWindowOpenTestTimeout	      = 150;   # seconds
+
+
+#$MozConfigFileName = 'mozconfig';
+
+#$UseMozillaProfile = 1;
+#$MozProfileName = 'default';
+
+#- Set these to what makes sense for your system
+#$Make          = 'gmake';       # Must be GNU make
+#$MakeOverrides = '';
+#$mail          = '/bin/mail';
+#$CVS           = 'cvs -q';
+#$CVSCO         = 'checkout -P';
+
+# win32 usually doesn't have /bin/mail
+#$blat           = 'c:/nstools/bin/blat';
+#$use_blat       = 0;
+
+# Set moz_cvsroot to something like:
+# :pserver:$ENV{USER}%netscape.com\@cvs.mozilla.org:/cvsroot
+# :pserver:anonymous\@cvs-mirror.mozilla.org:/cvsroot
+#
+# Note that win32 may not need \@, depends on ' or ".
+# :pserver:$ENV{USER}%netscape.com@cvs.mozilla.org:/cvsroot
+
+# sharing bm-xserve09 with T'bird build, do all CVS pulls with that key
+# CONFIG: $moz_cvsroot   = '%mozillaCvsroot%';
+$moz_cvsroot   = 'cltbld@cvs.mozilla.org:/cvsroot';
+
+#- Set these proper values for your tinderbox server
+#$Tinderbox_server = 'tinderbox-daemon@tinderbox.mozilla.org';
+
+# Allow for non-client builds, e.g. camino.
+#$moz_client_mk = 'client.mk';
+
+#- Set if you want to build in a separate object tree
+$ObjDir = '../build/universal';
+
+# Extra build name, if needed.
+$BuildNameExtra = 'Release';
+
+# User comment, eg. ip address for dhcp builds.
+# ex: $UserComment = "ip = 208.12.36.108";
+#$UserComment = 0;
+
+#-
+#- The rest should not need to be changed
+#-
+
+#- Minimum wait period from start of build to start of next build in minutes.
+#$BuildSleep = 10;
+
+#- Until you get the script working. When it works,
+#- change to the tree you're actually building
+# CONFIG: $BuildTree  = '%buildTree%';
+$BuildTree  = 'MozillaRelease';
+
+#$BuildName = '';
+# CONFIG: $BuildTag = '%productTag%_RELEASE';
+$BuildTag = 'FIREFOX_3_0_17_RELEASE';
+#$BuildConfigDir = 'mozilla/config';
+#$Topsrcdir = 'mozilla';
+
+$BinaryName = 'xulrunner-bin';
+
+#
+# For embedding app, use:
+#$EmbedBinaryName = 'TestGtkEmbed';
+#$EmbedDistDir    = 'dist/bin'
+
+
+#$ShellOverride = ''; # Only used if the default shell is too stupid
+#$ConfigureArgs = '';
+#$ConfigureEnvArgs = '';
+#$Compiler = 'gcc';
+#$NSPRArgs = '';
+#$ShellOverride = '';
+
+# Release build options
+$ReleaseBuild  = 1;
+#$LocaleProduct = "browser";
+$shiptalkback  = 0;
+$ReleaseToLatest = 0; # Push the release to latest-<milestone>?
+$ReleaseToDated = 1; # Push the release to YYYY-MM-DD-HH-<milestone>?
+#$build_hour    = "8";
+$package_creation_path = "/xulrunner/installer";
+# needs setting for mac + talkback: $mac_bundle_path = "/browser/app";
+$mac_bundle_path = "/browser/app";
+$ssh_version   = "2";
+# CONFIG: $ssh_user      = "%sshUser%";
+$ssh_user      = "cltbld";
+#$ssh_key       = "$ENV{HOME}/.ssh/xrbld_dsa";
+# CONFIG: $ssh_server    = "%sshServer%";
+$ssh_server    = "stage-old.mozilla.org";
+$ReleaseGroup  = "xulrunner";
+$ftp_path      = "/home/ftp/pub/xulrunner/nightly";
+$url_path      = "http://ftp.mozilla.org/pub/mozilla.org/xulrunner/nightly";
+$tbox_ftp_path = "/home/ftp/pub/xulrunner/tinderbox-builds";
+$tbox_url_path = "http://ftp.mozilla.org/pub/mozilla.org/xulrunner/tinderbox-builds";
+# CONFIG: $milestone     = 'xulrunner%version%';
+$milestone     = 'xulrunner1.9.0.17';
+$notify_list   = "build-announce\@mozilla.org";
+$stub_installer = 0;
+$sea_installer = 0;
+$archive       = 1;
+$push_raw_xpis = 0;
+$crashreporter_buildsymbols = 0;
+$crashreporter_pushsymbols = 0;
+# CONFIG: $ENV{'SYMBOL_SERVER_HOST'}    = '%symbolServer%';
+$ENV{'SYMBOL_SERVER_HOST'}    = 'stage-old.mozilla.org';
+# CONFIG: $ENV{'SYMBOL_SERVER_USER'}    = '%symbolServerUser%';
+$ENV{'SYMBOL_SERVER_USER'}    = 'xrbld';
+# CONFIG: $ENV{'SYMBOL_SERVER_PATH'}    = '%symbolServerPath%';
+$ENV{'SYMBOL_SERVER_PATH'}    = '/mnt/netapp/breakpad/symbols_xr';
+# CONFIG: $ENV{'SYMBOL_SERVER_SSH_KEY'} = '%symbolServerKey%';
+$ENV{'SYMBOL_SERVER_SSH_KEY'} = '/Users/cltbld/.ssh/xrbld_dsa';
+
+# Reboot the OS at the end of build-and-test cycle. This is primarily
+# intended for Win9x, which can't last more than a few cycles before
+# locking up (and testing would be suspect even after a couple of cycles).
+# Right now, there is only code to force the reboot for Win9x, so even
+# setting this to 1, will not have an effect on other platforms. Setting
+# up win9x to automatically logon and begin running tinderbox is left 
+# as an exercise to the reader. 
+#$RebootSystem = 0;
+
+# LogCompression specifies the type of compression used on the log file.
+# Valid options are 'gzip', and 'bzip2'. Please make sure the binaries
+# for 'gzip' or 'bzip2' are in the user's path before setting this
+# option.
+#$LogCompression = '';
+
+# LogEncoding specifies the encoding format used for the logs. Valid
+# options are 'base64', and 'uuencode'. If $LogCompression is set above,
+# this needs to be set to 'base64' or 'uuencode' to ensure that the
+# binary data is transferred properly.
+#$LogEncoding = '';
+
+# Prevent Extension Manager from spawning child processes during tests
+# - processes that tbox scripts cannot kill. 
+#$ENV{NO_EM_RESTART} = '1';
--- a/mozilla/tools/tinderbox-configs/xulrunner/win32/CLOBBER
+++ b/mozilla/tools/tinderbox-configs/xulrunner/win32/CLOBBER
@@ -0,0 +1 @@
+Preemptive clobber for /README.txt merge conflict.
--- a/mozilla/tools/tinderbox-configs/xulrunner/win32/mozconfig
+++ b/mozilla/tools/tinderbox-configs/xulrunner/win32/mozconfig
@@ -0,0 +1,18 @@
+#
+# hostname: fxexp-win32-tbox
+# uname: CYGWIN_NT-5.2 fxexp-win32-tbox 1.5.19(0.150/4/2) 2006-01-20 13:28 i686 Cygwin
+#
+
+export MOZILLA_OFFICIAL
+export JAVA_HOME=/d/jdk1.5.0_10
+
+mk_add_options MOZILLA_OFFICIAL=1
+mk_add_options MOZ_CO_PROJECT=xulrunner
+mk_add_options MOZ_MAKE_FLAGS="-j2"
+
+ac_add_options --enable-application=xulrunner
+ac_add_options --enable-jemalloc
+ac_add_options --disable-tests
+ac_add_options --enable-svg
+ac_add_options --enable-canvas
+ac_add_options --disable-installer
--- a/mozilla/tools/tinderbox-configs/xulrunner/win32/tinder-config.pl
+++ b/mozilla/tools/tinderbox-configs/xulrunner/win32/tinder-config.pl
@@ -0,0 +1,255 @@
+#
+# hostname: fxexp-win32-tbox
+# uname: CYGWIN_NT-5.2 fxexp-win32-tbox 1.5.19(0.150/4/2) 2006-01-20 13:28 i686 Cygwin
+#
+
+#- tinder-config.pl - Tinderbox configuration file.
+#-    Uncomment the variables you need to set.
+#-    The default values are the same as the commented variables.
+
+$ENV{NO_EM_RESTART} = "1";
+$ENV{MOZ_INSTALLER_USE_7ZIP} = "1";
+$ENV{CVS_RSH} = "ssh";
+$ENV{MOZ_CRASHREPORTER_NO_REPORT} = '1';
+# Both these two variables are for source server support
+$ENV{PDBSTR_PATH} = 'C:\\Program Files\\Debugging Tools for Windows\\sdk\\srcsrv\\pdbstr.exe';
+$ENV{SRCSRV_ROOT} = ':pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot';
+
+# $ENV{MOZ_PACKAGE_MSI}
+#-----------------------------------------------------------------------------
+#  Default: 0
+#   Values: 0 | 1
+#  Purpose: Controls whether a MSI package is made.
+# Requires: Windows and a local MakeMSI installation.
+#$ENV{MOZ_PACKAGE_MSI} = 0;
+
+# $ENV{MOZ_SYMBOLS_TRANSFER_TYPE}
+#-----------------------------------------------------------------------------
+#  Default: scp
+#   Values: scp | rsync
+#  Purpose: Use scp or rsync to transfer symbols to the Talkback server.
+# Requires: The selected type requires the command be available both locally
+#           and on the Talkback server.
+#$ENV{MOZ_SYMBOLS_TRANSFER_TYPE} = "scp";
+
+#- PLEASE FILL THIS IN WITH YOUR PROPER EMAIL ADDRESS
+#$BuildAdministrator = "$ENV{USER}\@$ENV{HOST}";
+#$BuildAdministrator = ($ENV{USER} || "cltbld") . "\@" . ($ENV{HOST} || "dhcp");
+$BuildAdministrator = 'build@mozilla.org';
+
+#- You'll need to change these to suit your machine's needs
+#$DisplayServer = ':0.0';
+
+#- Default values of command-line opts
+#-
+#$BuildDepend       = 1;      # Depend or Clobber
+#$BuildDebug        = 0;      # Debug or Opt (Darwin)
+#$ReportStatus      = 1;      # Send results to server, or not
+#$ReportFinalStatus = 1;      # Finer control over $ReportStatus.
+$UseTimeStamp      = 0;      # Use the CVS 'pull-by-timestamp' option, or not
+#$BuildOnce         = 0;      # Build once, don't send results to server
+#$TestOnly          = 0;      # Only run tests, don't pull/build
+#$BuildEmbed        = 0;      # After building seamonkey, go build embed app.
+#$SkipMozilla       = 0;      # Use to debug post-mozilla.pl scripts.
+#$BuildLocales      = 0;      # Do l10n packaging?
+$BuildSDK           = 1;      # Build the SDK
+
+# Tests
+#$CleanProfile             = 0;
+#$ResetHomeDirForTests     = 1;
+$ProductName              = "XULRunner";
+$VendorName               = 'Mozilla';
+
+$RunMozillaTests          = 0;  # Allow turning off of all tests if needed.
+#$RegxpcomTest             = 1;
+#$AliveTest                = 1;
+#$JavaTest                 = 0;
+#$ViewerTest               = 0;
+#$BloatTest                = 0;  # warren memory bloat test
+#$BloatTest2               = 0;  # dbaron memory bloat test, require tracemalloc
+#$DomToTextConversionTest  = 0;  
+#$XpcomGlueTest            = 0;
+#$CodesizeTest             = 0;  # Z,  require mozilla/tools/codesighs
+#$EmbedCodesizeTest        = 0;  # mZ, require mozilla/tools/codesigns
+#$MailBloatTest            = 0;
+#$EmbedTest                = 0;  # Assumes you wanted $BuildEmbed=1
+#$LayoutPerformanceTest    = 0;  # Tp
+#$DHTMLPerformanceTest     = 0;  # Tdhtml
+#$QATest                   = 0;  
+#$XULWindowOpenTest        = 0;  # Txul
+#$StartupPerformanceTest   = 0;  # Ts
+
+#$TestsPhoneHome           = 0;  # Should test report back to server?
+
+# $results_server
+#----------------------------------------------------------------------------
+# Server on which test results will be accessible.  This was originally tegu,
+# then became axolotl.  Once we moved services from axolotl, it was time
+# to give this service its own hostname to make future transitions easier.
+# - cmp@mozilla.org
+#$results_server           = "build-graphs.mozilla.org";
+
+#$pageload_server          = "spider";  # localhost
+
+#
+# Timeouts, values are in seconds.
+#
+#$CVSCheckoutTimeout               = 3600;
+#$CreateProfileTimeout             = 45;
+#$RegxpcomTestTimeout              = 120;
+
+#$AliveTestTimeout                 = 45;
+#$ViewerTestTimeout                = 45;
+#$EmbedTestTimeout                 = 45;
+#$BloatTestTimeout                 = 120;   # seconds
+#$MailBloatTestTimeout             = 120;   # seconds
+#$JavaTestTimeout                  = 45;
+#$DomTestTimeout	                  = 45;    # seconds
+#$XpcomGlueTestTimeout             = 15;
+#$CodesizeTestTimeout              = 900;     # seconds
+#$CodesizeTestType                 = "auto";  # {"auto"|"base"}
+#$LayoutPerformanceTestTimeout     = 1200;  # entire test, seconds
+#$DHTMLPerformanceTestTimeout      = 1200;  # entire test, seconds
+#$QATestTimeout                    = 1200;   # entire test, seconds
+#$LayoutPerformanceTestPageTimeout = 30000; # each page, ms
+#$StartupPerformanceTestTimeout    = 15;    # seconds
+#$XULWindowOpenTestTimeout	      = 150;   # seconds
+
+
+#$MozConfigFileName = 'mozconfig';
+
+#$UseMozillaProfile = 1;
+#$MozProfileName = 'default';
+
+#- Set these to what makes sense for your system
+$Make          = 'make';       # Must be GNU make
+#$MakeOverrides = '';
+#$mail          = '/bin/mail';
+#$CVS           = 'cvs -q';
+#$CVSCO         = 'checkout -P';
+
+# win32 usually doesn't have /bin/mail
+$blat           = '/d/mozilla-build/blat261/full/blat';
+$use_blat       = 1;
+
+# Set moz_cvsroot to something like:
+# :pserver:$ENV{USER}%netscape.com\@cvs.mozilla.org:/cvsroot
+# :pserver:anonymous\@cvs-mirror.mozilla.org:/cvsroot
+#
+# Note that win32 may not need \@, depends on ' or ".
+# :pserver:$ENV{USER}%netscape.com@cvs.mozilla.org:/cvsroot
+
+#$moz_cvsroot   = $ENV{CVSROOT};
+# CONFIG: $moz_cvsroot = '%mozillaCvsroot%';
+$moz_cvsroot = 'cltbld@cvs.mozilla.org:/cvsroot';
+
+#- Set these proper values for your tinderbox server
+#$Tinderbox_server = 'tinderbox-daemon@tinderbox.mozilla.org';
+
+# Allow for non-client builds, e.g. camino.
+#$moz_client_mk = 'client.mk';
+
+#- Set if you want to build in a separate object tree
+$ObjDir = 'obj-xulrunner';
+
+# Extra build name, if needed.
+$BuildNameExtra = 'Release';
+
+# User comment, eg. ip address for dhcp builds.
+# ex: $UserComment = "ip = 208.12.36.108";
+#$UserComment = 0;
+
+#-
+#- The rest should not need to be changed
+#-
+
+#- Minimum wait period from start of build to start of next build in minutes.
+#$BuildSleep = 10;
+
+#- Until you get the script working. When it works,
+#- change to the tree you're actually building
+# CONFIG: $BuildTree  = '%buildTree%';
+$BuildTree  = 'MozillaRelease';
+
+#$BuildName = '';
+# CONFIG: $BuildTag = '%productTag%_RELEASE';
+$BuildTag = 'FIREFOX_3_0_17_RELEASE';
+#$BuildConfigDir = 'mozilla/config';
+#$Topsrcdir = 'mozilla';
+
+$BinaryName = 'xulrunner.exe';
+
+#
+# For embedding app, use:
+#$EmbedBinaryName = 'TestGtkEmbed';
+#$EmbedDistDir    = 'dist/bin'
+
+
+#$ShellOverride = ''; # Only used if the default shell is too stupid
+#$ConfigureArgs = '';
+#$ConfigureEnvArgs = '';
+#$Compiler = 'gcc';
+#$NSPRArgs = '';
+#$ShellOverride = '';
+
+# Release build options
+$ReleaseBuild  = 1;
+$shiptalkback  = 0;
+$ReleaseToLatest = 0; # Push the release to latest-<milestone>?
+$ReleaseToDated = 1; # Push the release to YYYY-MM-DD-HH-<milestone>?
+#$build_hour    = "8";
+$package_creation_path = "/xulrunner/installer";
+# needs setting for mac + talkback: $mac_bundle_path = "/browser/app";
+$ssh_version   = "2";
+# CONFIG: $ssh_user      = "%sshUser%";
+$ssh_user      = "cltbld";
+#$ssh_key       = "'$ENV{HOME}/.ssh/xrbld_dsa'";
+# CONFIG: $ssh_server    = "%sshServer%";
+$ssh_server    = "stage-old.mozilla.org";
+$ReleaseGroup  = "xulrunner";
+$ftp_path      = "/home/ftp/pub/xulrunner/nightly";
+$url_path      = "http://ftp.mozilla.org/pub/mozilla.org/xulrunner/nightly";
+$tbox_ftp_path = "/home/ftp/pub/xulrunner/tinderbox-builds";
+$tbox_url_path = "http://ftp.mozilla.org/pub/mozilla.org/xulrunner/tinderbox-builds";
+# CONFIG: $milestone     = 'xulrunner%version%';
+$milestone     = 'xulrunner1.9.0.17';
+$notify_list   = 'build-announce@mozilla.org';
+$stub_installer = 0;
+$sea_installer = 0;
+$archive       = 1;
+$push_raw_xpis = 0;
+$crashreporter_buildsymbols = 1;
+$crashreporter_pushsymbols = 1;
+# CONFIG: $ENV{'SYMBOL_SERVER_HOST'}    = '%symbolServer%';
+$ENV{'SYMBOL_SERVER_HOST'}    = 'stage-old.mozilla.org';
+# CONFIG: $ENV{'SYMBOL_SERVER_USER'}    = '%symbolServerUser%';
+$ENV{'SYMBOL_SERVER_USER'}    = 'xrbld';
+# CONFIG: $ENV{'SYMBOL_SERVER_PATH'}    = '%symbolServerPath%';
+$ENV{'SYMBOL_SERVER_PATH'}    = '/mnt/netapp/breakpad/symbols_xr';
+# CONFIG: $ENV{'SYMBOL_SERVER_SSH_KEY'} = '%symbolServerKey%';
+$ENV{'SYMBOL_SERVER_SSH_KEY'} = '/c/Documents and Settings/cltbld/.ssh/xrbld_dsa';
+
+# Reboot the OS at the end of build-and-test cycle. This is primarily
+# intended for Win9x, which can't last more than a few cycles before
+# locking up (and testing would be suspect even after a couple of cycles).
+# Right now, there is only code to force the reboot for Win9x, so even
+# setting this to 1, will not have an effect on other platforms. Setting
+# up win9x to automatically logon and begin running tinderbox is left 
+# as an exercise to the reader. 
+#$RebootSystem = 0;
+
+# LogCompression specifies the type of compression used on the log file.
+# Valid options are 'gzip', and 'bzip2'. Please make sure the binaries
+# for 'gzip' or 'bzip2' are in the user's path before setting this
+# option.
+#$LogCompression = '';
+
+# LogEncoding specifies the encoding format used for the logs. Valid
+# options are 'base64', and 'uuencode'. If $LogCompression is set above,
+# this needs to be set to 'base64' or 'uuencode' to ensure that the
+# binary data is transferred properly.
+#$LogEncoding = '';
+
+# Prevent Extension Manager from spawning child processes during tests
+# - processes that tbox scripts cannot kill. 
+#$ENV{NO_EM_RESTART} = '1';
				`@@ -0,0 +1 @@`
				`Clobbering to force nightly due to nightly bustage from bug 428672.`
				`@@ -0,0 +1 @@`
				`CLOBBERing to disable zipwriter from bug 379633`
				`@@ -0,0 +1 @@`
				`Preemptive clobber for /README.txt merge conflict.`