Fix blat for l10n test box

git-svn-id: svn://10.0.0.236/branches/feature_newref_l10n@234073 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/tools/tinderbox-configs/firefox/linux/CLOBBER

@@ -1 +0,0 @@
-Clobbering because preed says it'll fix the red.

mozilla/tools/tinderbox-configs/firefox/linux/mozconfig

@@ -1,19 +0,0 @@
-#
-## hostname: fxdbug-linux-tbox.build.mozilla.org
-## uname: Linux fxdbug-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
-#
-
-mk_add_options MOZ_CO_PROJECT=browser
-mk_add_options MOZ_CO_MODULE="mozilla/tools/trace-malloc"
-
-ac_add_options --enable-application=browser
-
-ac_add_options --disable-optimize
-ac_add_options --enable-debug
-
-ac_add_options --enable-canvas
-ac_add_options --enable-svg
-ac_add_options --enable-pango
-
-ac_add_options --enable-trace-malloc
-ac_add_options --disable-libxul

mozilla/tools/tinderbox-configs/firefox/linux/tinder-config.pl

@@ -1,190 +0,0 @@
-#
-## hostname: fxdbug-linux-tbox.build.mozilla.org
-## uname: Linux fxdbug-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{PATH} = "/usr/local/binutils-2.13.2.1/bin:/usr/local/gcc-3.4.3/bin:" . $ENV{PATH};
-
-$ENV{MOZ_CRASHREPORTER_NO_REPORT} = '1';
-# Disable the Gnome Bug Buddy so that it doesn't block us getting stacks
-$ENV{GNOME_DISABLE_CRASH_DIALOG} = '1';
-
-
-#- 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      = 1;      # 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               = "Firefox";
-$VendorName                = "Mozilla";
-$ENV{NO_EM_RESTART}        = '1';
-
-#$RunMozillaTests          = 1;  # Allow turning off of all tests if needed.
-#$RegxpcomTest             = 1;
-#$AliveTest                = 1;
-#$JavaTest                 = 0;
-#$ViewerTest               = 0;
-$BloatTest                = 1;  # warren memory bloat test
-$BloatTest2               = 1;  # 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           = 1;  # Should test report back to server?
-#$results_server           = "axolotl.mozilla.org"; # was tegu
-#$pageload_server          = "spider";  # localhost
-
-#
-# Timeouts, values are in seconds.
-#
-
-#$CreateProfileTimeout             = 45;
-$RegxpcomTestTimeout              = 60;
-
-#$AliveTestTimeout                 = 45;
-#$ViewerTestTimeout                = 45;
-#$EmbedTestTimeout                 = 45;
-$BloatTestTimeout                 = 1800;   # 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';
-
-# This sets the value of the XPCOM_DEBUG_BREAK environment variable.  We
-# default to 'warn', which suppresses the assertion dialogs on Windows
-# and gives platform parity.  Use 'abort' for fatal assertions.
-$MozAssertBehavior = 'stack-and-abort';
-
-#- 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   = ':ext:ffxbld@cvs.mozilla.org:/cvsroot';
-#$moz_cvsroot   = ":pserver:anonymous\@cvs-mirror.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';
-
-# Extra build name, if needed.
-#$BuildNameExtra = 'GTK1 (gcc 3.4)';
-
-# 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';
-$BuildTree  = 'Firefox3.0';
-
-#$BuildName = '';
-#$BuildTag = '';
-#$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 = '';
-
-# allow override of timezone value (for win32 POSIX::strftime)
-#$Timezone = '';
-
-# 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 = 'uuencode';

mozilla/tools/tinderbox-configs/firefox/macosx/CLOBBER

@@ -1 +0,0 @@
-- trigger another clobber to test bug 388691

mozilla/tools/tinderbox-configs/firefox/macosx/mozconfig

@@ -1,24 +0,0 @@
-#
-## hostname: bm-xservex08.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
-#
-
-#. $topsrcdir/build/macosx/universal/mozconfig
-
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-mk_add_options MOZ_CO_PROJECT="browser"
-mk_add_options MOZ_CO_MODULE="mozilla/tools/trace-malloc"
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../build
-
-ac_add_options --enable-application=browser
-
-ac_add_app_options ppc --enable-prebinding
-
-ac_add_options --disable-optimize
-ac_add_options --enable-debug
-
-ac_add_options --enable-canvas
-ac_add_options --enable-svg
-
-ac_add_options --enable-trace-malloc
-ac_add_options --enable-libxul

mozilla/tools/tinderbox-configs/firefox/macosx/tinder-config.pl

@@ -1,192 +0,0 @@
-#
-## 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{PATH} = "/usr/local/binutils-2.13.2.1/bin:/usr/local/gcc-3.4.3/bin:" . $ENV{PATH};
-
-$ENV{MOZ_CRASHREPORTER_NO_REPORT} = '1';
-
-#$MacUniversalBinary = 1;
-
-#- 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        = 1;      # Debug or Opt (Darwin)
-#$ReportStatus      = 1;      # Send results to server, or not
-#$ReportFinalStatus = 1;      # Finer control over $ReportStatus.
-#$UseTimeStamp      = 1;      # 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               = "GranParadiso";
-$VendorName                = "";
-$ENV{NO_EM_RESTART}        = '1';
-
-#$RunMozillaTests          = 1;  # Allow turning off of all tests if needed.
-#$RegxpcomTest             = 1;
-#$AliveTest                = 1;
-#$JavaTest                 = 0;
-#$ViewerTest               = 0;
-$BloatTest                = 1;  # warren memory bloat test
-$BloatTest2               = 1;  # 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           = 1;  # Should test report back to server?
-#$results_server           = "axolotl.mozilla.org"; # was tegu
-#$pageload_server          = "spider";  # localhost
-
-#
-# Timeouts, values are in seconds.
-#
-
-#$CreateProfileTimeout             = 45;
-$RegxpcomTestTimeout              = 60;
-
-#$AliveTestTimeout                 = 45;
-#$ViewerTestTimeout                = 45;
-#$EmbedTestTimeout                 = 45;
-$BloatTestTimeout                 = 300;   # 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';
-
-# This sets the value of the XPCOM_DEBUG_BREAK environment variable.  We
-# default to 'warn', which suppresses the assertion dialogs on Windows
-# and gives platform parity.  Use 'abort' (or, on trunk after 2007-08-10,
-# 'stack-and-abort') for fatal assertions.
-$MozAssertBehavior = 'stack-and-abort';
-
-#- 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   = ':ext:ffxbld@cvs.mozilla.org:/cvsroot';
-#$moz_cvsroot   = ":pserver:anonymous\@cvs-mirror.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';
-
-# Extra build name, if needed.
-$BuildNameExtra = 'Debug + Leak Test';
-
-# 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';
-$BuildTree  = 'Firefox3.0';
-
-#$BuildName = '';
-#$BuildTag = '';
-#$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 = '';
-
-# allow override of timezone value (for win32 POSIX::strftime)
-#$Timezone = '';
-
-# 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 = 'uuencode';

mozilla/tools/tinderbox-configs/firefox/win32/CLOBBER

@@ -1 +0,0 @@
-Clobber in case the intermittant leak is cruft-buildup

mozilla/tools/tinderbox-configs/firefox/win32/mozconfig

@@ -1,14 +1,17 @@
 #
-## hostname: fxdbug-win32-tbox
-## uname: MINGW32_NT-5.2 FX-WIN32-TBOX 1.0.11(0.46/3/2) 2007-01-12 12:05 i686 Msys
+## hostname: l10n-win32-tbox
+## uname: MINGW32_NT-5.2 L10N-WIN32-TBOX 1.0.11(0.46/3/2) 2007-01-12 12:05 i686 Msys
 #
 
 mk_add_options MOZ_CO_PROJECT=browser
-mk_add_options MOZ_CO_MODULE="mozilla/tools/trace-malloc"
-mk_add_options MOZ_MAKE_FLAGS="-j5"
-mk_add_options MOZ_PACKAGE_NSIS=1
+mk_add_options MOZ_CO_LOCALES=all
+mk_add_options LOCALES_CVSROOT=:ext:cltbld@cvs.mozilla.org:/l10n
+mk_add_options MOZ_CO_MODULE="mozilla/tools/update-packaging"
+#mk_add_options MOZ_CO_LOCALES_DATE="11/25/2005 13:00:00 PST"
 
+ac_add_options --enable-update-packaging
 ac_add_options --enable-application=browser
-ac_add_options --disable-optimize
-ac_add_options --enable-debug
-ac_add_options --enable-trace-malloc
+ac_add_options --enable-optimize
+ac_add_options --disable-debug
+ac_add_options --disable-tests
+ac_add_options --enable-official-branding

mozilla/tools/tinderbox-configs/firefox/win32/tinder-config.pl

@@ -1,37 +1,18 @@
 #
-## hostname: fxdbug-win32-tbox
-## uname: MINGW32_NT-5.2 FX-WIN32-TBOX 1.0.11(0.46/3/2) 2007-01-12 12:05 i686 Msys
+## hostname: l10n-win32-tbox
+## uname: MINGW32_NT-5.2 L10N-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{MOZ_INSTALLER_USE_7ZIP} = '1';
-$ENV{MOZ_PACKAGE_NSIS} = '1';
-$ENV{MOZ_CRASHREPORTER_NO_REPORT} = '1';
-$ENV{NO_EM_RESTART} = '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";
+$ENV{CVS_RSH} = "ssh";
+$ENV{MOZ_INSTALLER_USE_7ZIP} = "1";
+$ENV{MOZ_SYMBOLS_TRANSFER_TYPE} = "rsync";
 
 #- 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
@@ -39,30 +20,30 @@ $BuildAdministrator = 'build@mozilla.org';
 
 #- Default values of command-line opts
 #-
-#$BuildDepend       = 1;      # Depend or Clobber
+$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      = 1;      # Use the CVS 'pull-by-timestamp' option, or not
+$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
+#$TestOnly          = 1;      # 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?
+#$SkipMozilla       = 1;      # Use to debug post-mozilla.pl scripts.
+$BuildLocales      = 1;
 
 # Tests
 $CleanProfile             = 1;
 #$ResetHomeDirForTests     = 1;
 $ProductName              = "Firefox";
-$VendorName               = "Mozilla";
+$VendorName               = 'Mozilla';
 
-$RunMozillaTests          = 1;  # Allow turning off of all tests if needed.
+#$RunMozillaTests          = 1;  # Allow turning off of all tests if needed.
 #$RegxpcomTest             = 1;
 #$AliveTest                = 1;
 #$JavaTest                 = 0;
 #$ViewerTest               = 0;
-$BloatTest                = 1;  # warren memory bloat test
-$BloatTest2               = 1;  # dbaron memory bloat test, require tracemalloc
+#$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
@@ -74,21 +55,19 @@ $BloatTest2               = 1;  # dbaron memory bloat test, require tracemalloc
 #$QATest                   = 0;  
 #$XULWindowOpenTest        = 0;  # Txul
 #$StartupPerformanceTest   = 0;  # Ts
-#$NeckoUnitTest            = 0;
-#$RenderPerformanceTest    = 0;  # Tgfx
+$LocaleProduct = "browser";
+@CompareLocaleDirs = (
+  "netwerk",
+  "dom",
+  "toolkit",
+  "security/manager",
+  "browser",
+  "other-licenses/branding/firefox",
+);
 
-$TestsPhoneHome           = 1;  # Should test report back to server?
-#$GraphNameOverride        = 'fxdbug-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
+#$TestsPhoneHome           = 0;  # Should test report back to server?
+#$results_server           = "axolotl.mozilla.org"; # was tegu
+#$pageload_server          = "spider";  # localhost
 
 #
 # Timeouts, values are in seconds.
@@ -97,36 +76,29 @@ $pageload_server          = "pageload.build.mozilla.org";  # localhost
 #$CreateProfileTimeout             = 45;
 #$RegxpcomTestTimeout              = 120;
 
-#$AliveTestTimeout                 = 30;
+#$AliveTestTimeout                 = 45;
 #$ViewerTestTimeout                = 45;
 #$EmbedTestTimeout                 = 45;
-$BloatTestTimeout                 = 1800;   # seconds
+#$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
+#$LayoutPerformanceTestTimeout     = 1200;  # 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
+#$StartupPerformanceTestTimeout    = 60;    # seconds
+#$XULWindowOpenTestTimeout	      = 150;   # seconds
+
 
 #$MozConfigFileName = 'mozconfig';
 
 #$UseMozillaProfile = 1;
 #$MozProfileName = 'default';
 
-# This sets the value of the XPCOM_DEBUG_BREAK environment variable.  We
-# default to 'warn', which suppresses the assertion dialogs on Windows
-# and gives platform parity.  Use 'abort' (or, on trunk after 2007-08-10,
-# 'stack-and-abort') for fatal assertions.
-$MozAssertBehavior = 'stack-and-abort';
-
 #- Set these to what makes sense for your system
 $Make          = 'make';       # Must be GNU make
 #$MakeOverrides = '';
@@ -135,8 +107,8 @@ $Make          = 'make';       # Must be GNU make
 #$CVSCO         = 'checkout -P';
 
 # win32 usually doesn't have /bin/mail
-$blat           = '/d/mozilla-build/blat261/full/blat';
-$use_blat       = 0;
+$blat           = '/d/mozilla-build/blat261/full/blat.exe';
+$use_blat       = 1;
 
 # Set moz_cvsroot to something like:
 # :pserver:$ENV{USER}%netscape.com\@cvs.mozilla.org:/cvsroot
@@ -145,8 +117,7 @@ $use_blat       = 0;
 # Note that win32 may not need \@, depends on ' or ".
 # :pserver:$ENV{USER}%netscape.com@cvs.mozilla.org:/cvsroot
 
-#$moz_cvsroot   = $ENV{CVSROOT};
-$moz_cvsroot = ':ext:ffxbld@cvs.mozilla.org:/cvsroot';
+$moz_cvsroot   = ":ext:cltbld\@cvs.mozilla.org:/cvsroot";
 
 #- Set these proper values for your tinderbox server
 #$Tinderbox_server = 'tinderbox-daemon@tinderbox.mozilla.org';
@@ -155,15 +126,29 @@ $moz_cvsroot = ':ext:ffxbld@cvs.mozilla.org:/cvsroot';
 #$moz_client_mk = 'client.mk';
 
 #- Set if you want to build in a separate object tree
-$ObjDir = 'obj-fx-trunk';
+#$ObjDir = '';
 
 # Extra build name, if needed.
-$BuildNameExtra = 'Debug + Leak Test';
+$BuildNameExtra = 'Fx-Trunk-l10n testing';
 
 # User comment, eg. ip address for dhcp builds.
 # ex: $UserComment = "ip = 208.12.36.108";
 #$UserComment = 0;
 
+# Configure only, don't build.
+$ConfigureOnly = 1; 
+
+# Existing build files to download.
+$LocalizationVersionFile = 'browser/config/version.txt';
+%WGetFiles = (
+	      "http://stage.mozilla.org/pub/mozilla.org/firefox/nightly/latest-trunk/firefox-%version%.en-US.win32.installer.exe" =>
+	      "/e/builds/tinderbox/Fx-Trunk-l10n/WINNT_5.2_Depend/firefox-installer.exe",
+	      "http://stage.mozilla.org/pub/mozilla.org/firefox/nightly/latest-trunk/firefox-%version%.en-US.win32.zip" =>
+	      "/e/builds/tinderbox/Fx-Trunk-l10n/WINNT_5.2_Depend/firefox.zip"
+	      );
+
+$BuildLocalesArgs = "ZIP_IN=/e/builds/tinderbox/Fx-Trunk-l10n/WINNT_5.2_Depend/firefox.zip WIN32_INSTALLER_IN=/e/builds/tinderbox/Fx-Trunk-l10n/WINNT_5.2_Depend/firefox-installer.exe";
+
 #-
 #- The rest should not need to be changed
 #-
@@ -173,11 +158,10 @@ $BuildNameExtra = 'Debug + Leak Test';
 
 #- Until you get the script working. When it works,
 #- change to the tree you're actually building
-#$BuildTree  = 'MozillaTest';
-$BuildTree  = 'Firefox3.0';
+$BuildTree  = 'Mozilla-l10n';
 
 #$BuildName = '';
-#$BuildTag = '';
+#$BuildTag = 'MOZILLA_1_8_BRANCH';
 #$BuildConfigDir = 'mozilla/config';
 #$Topsrcdir = 'mozilla';
 
@@ -199,6 +183,36 @@ $BinaryName = 'firefox.exe';
 # allow override of timezone value (for win32 POSIX::strftime)
 #$Timezone = '';
 
+# Release build options
+$ReleaseBuild  = 1;
+$shiptalkback  = 0;
+$ReleaseToLatest = 0; # Push the release to latest-<milestone>?
+$ReleaseToDated = 0; # Push the release to YYYY-MM-DD-HH-<milestone>?
+$build_hour    = "9";
+$package_creation_path = "/browser/installer";
+# needs setting for mac + talkback: $mac_bundle_path = "/browser/app";
+$ssh_version   = "2";
+$ssh_user      = "cltbld";
+$ssh_server    = "stage.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";
+$milestone     = "trunk-l10n";
+$notify_list   = "build-announce\@mozilla.org";
+$stub_installer = 0;
+$sea_installer = 1;
+$archive       = 1;
+$push_raw_xpis = 0;
+$update_package = 0;
+$update_product = "Firefox";
+$update_version = "1.5";
+$update_platform = "WINNT_x86-msvc";
+$update_hash = "sha1";
+$update_filehost = "ftp.mozilla.org";
+$update_appv = "1.5";
+$update_extv = "1.5";
+
 # 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).
@@ -219,3 +233,7 @@ $BinaryName = 'firefox.exe';
 # 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';