"Automated configuration bump, release for firefox 3.0.19build1"

git-svn-id: svn://10.0.0.236/branches/l10n_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
30 changed files with 445 additions and 451 deletions
--- a/mozilla/tools/tinderbox-configs/firefox/linux/mozconfig
+++ b/mozilla/tools/tinderbox-configs/firefox/linux/mozconfig
@@ -8,13 +8,17 @@ mk_add_options MOZ_CO_MODULE="mozilla/tools/update-packaging"
 ac_add_options --enable-application=browser 

 mk_add_options MOZ_CO_LOCALES=all
-mk_add_options LOCALES_CVSROOT=:ext:ffxbld@cvs.mozilla.org:/l10n
+# CONFIG: mk_add_options LOCALES_CO_TAG=%productTag%_RELEASE
+mk_add_options LOCALES_CO_TAG=FIREFOX_3_0_19_RELEASE
+# CONFIG: mk_add_options LOCALES_CVSROOT=%l10nCvsroot%
+mk_add_options LOCALES_CVSROOT=cltbld@cvs.mozilla.org:/l10n

 ac_add_options --enable-update-packaging

 ac_add_options --enable-optimize="-Os -freorder-blocks -fno-reorder-functions -gstabs+"
 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
@@ -144,7 +144,8 @@ $pageload_server      = "pageload.build.mozilla.org";
 # :pserver:$ENV{USER}%netscape.com@cvs.mozilla.org:/cvsroot

 #$moz_cvsroot   = $ENV{CVSROOT};
-$moz_cvsroot   = ":ext:ffxbld\@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';
@@ -156,7 +157,7 @@ $moz_cvsroot   = ":ext:ffxbld\@cvs.mozilla.org:/cvsroot";
 #$ObjDir = '';

 # Extra build name, if needed.
-$BuildNameExtra = 'Fx-Trunk-l10n';
+$BuildNameExtra = 'Fx-Trunk-l10n-Release';

 # User comment, eg. ip address for dhcp builds.
 # ex: $UserComment = "ip = 208.12.36.108";
@@ -167,11 +168,14 @@ $ConfigureOnly = 1;             # Configure only, don't build.
 $LocaleProduct = "browser";
 $LocalizationVersionFile = 'browser/config/version.txt';
 %WGetFiles = (
-	      "http://stage.mozilla.org/pub/mozilla.org/firefox/nightly/latest-trunk/firefox-%version%.en-US.linux-i686.tar.bz2" =>
-	      "/builds/tinderbox/Fx-Trunk-l10n/Linux_2.6.18-8.el5_Depend/firefox.tar.bz2"
+# CONFIG:             "http://%stagingServer%/pub/mozilla.org/firefox/nightly/%version%-candidates/build%build%/firefox-%appVersion%.en-US.linux-i686.tar.bz2" => 
+"http://stage-old.mozilla.org/pub/mozilla.org/firefox/nightly/3.0.19-candidates/build1/firefox-3.0.19.en-US.linux-i686.tar.bz2" => 
+# CONFIG:             "/%l10n_buildDir%/%l10n_buildPlatform%/firefox.tar.bz2"
+"//builds/tinderbox/Fx-Mozilla1.9-l10n-Release/Linux_2.6.18-53.1.13.el5_Depend/firefox.tar.bz2"
 	      );

-$BuildLocalesArgs = "ZIP_IN=/builds/tinderbox/Fx-Trunk-l10n/Linux_2.6.18-8.el5_Depend/firefox.tar.bz2";
+# CONFIG: $BuildLocalesArgs = "ZIP_IN=%l10n_buildDir%/%l10n_buildPlatform%/firefox.tar.bz2";
+$BuildLocalesArgs = "ZIP_IN=/builds/tinderbox/Fx-Mozilla1.9-l10n-Release/Linux_2.6.18-53.1.13.el5_Depend/firefox.tar.bz2";
 #@CompareLocaleDirs        = (); # Run compare-locales test on these directories
@CompareLocaleDirs = (
  "netwerk",
@@ -192,10 +196,12 @@ $BuildLocalesArgs = "ZIP_IN=/builds/tinderbox/Fx-Trunk-l10n/Linux_2.6.18-8.el5_D

 #- Until you get the script working. When it works,
 #- change to the tree you're actually building
-$BuildTree  = 'Mozilla-l10n';
+# CONFIG: $BuildTree  = '%buildTree%';
+$BuildTree  = 'MozillaRelease';

 #$BuildName = '';
-#$BuildTag = '';
+# CONFIG: $BuildTag = '%productTag%_RELEASE';
+$BuildTag = 'FIREFOX_3_0_19_RELEASE';
 #$BuildConfigDir = 'mozilla/config';
 #$Topsrcdir = 'mozilla';

@@ -217,36 +223,39 @@ $BinaryName = 'firefox-bin';
 # Release build options
 $ReleaseBuild  = 1;
 $shiptalkback  = 0;
-$ReleaseToLatest = 1; # Push the release to latest-<milestone>?
-$ReleaseToDated = 0; # Push the release to YYYY-MM-DD-HH-<milestone>?
+$ReleaseToLatest = 0; # Push the release to latest-<milestone>?
+$ReleaseToDated = 1; # 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      = "ffxbld";
-$ssh_key       = "'$ENV{HOME}/.ssh/ffxbld_dsa'";
-$ssh_server    = "stage.mozilla.org";
+# CONFIG: $ssh_user      = "%sshUser%";
+$ssh_user      = "cltbld";
+#$ssh_key       = "'$ENV{HOME}/.ssh/cltbld_dsa'";
+# CONFIG: $ssh_server    = "%sshServer%";
+$ssh_server    = "stage-old.mozilla.org";
 $ReleaseGroup  = "firefox";
 $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";
+# CONFIG: $milestone     = "firefox%version%-l10n";
+$milestone     = "firefox3.0.19-l10n";
 $notify_list   = 'build-announce@mozilla.org';
 $stub_installer = 0;
 $sea_installer = 1;
 $archive       = 1;
 $push_raw_xpis = 0;
 $update_pushinfo = 0;
-$update_package = 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;
+$crashreporter_buildsymbols = 0;
+$crashreporter_pushsymbols = 0;
 $ENV{'SYMBOL_SERVER_HOST'} = 'stage.mozilla.org';
 $ENV{'SYMBOL_SERVER_USER'}   = 'ffxbld';
 $ENV{'SYMBOL_SERVER_PATH'}   = '/mnt/netapp/breakpad/symbols_ffx/';
--- a/mozilla/tools/tinderbox-configs/firefox/macosx/mozconfig
+++ b/mozilla/tools/tinderbox-configs/firefox/macosx/mozconfig
@@ -9,7 +9,10 @@ mk_add_options MOZ_CO_MODULE="mozilla/tools/update-packaging"
 mk_add_options MOZ_CO_PROJECT=browser

 mk_add_options MOZ_CO_LOCALES=all
-mk_add_options LOCALES_CVSROOT=:ext:ffxbld@cvs.mozilla.org:/l10n
+# CONFIG: mk_add_options LOCALES_CO_TAG=%productTag%_RELEASE
+mk_add_options LOCALES_CO_TAG=FIREFOX_3_0_19_RELEASE
+# CONFIG: mk_add_options LOCALES_CVSROOT=%l10nCvsroot%
+mk_add_options LOCALES_CVSROOT=cltbld@cvs.mozilla.org:/l10n

 ac_add_options --enable-application=browser
 ac_add_options --enable-optimize="-O2 -g"
@@ -17,6 +20,6 @@ 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-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
@@ -142,8 +142,8 @@ $DHTMLPerformanceTestTimeout      = 180;  # entire test, seconds
 #
 # 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";
+# 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';
@@ -155,7 +155,7 @@ $moz_cvsroot   = ":ext:ffxbld\@cvs.mozilla.org:/cvsroot";
 #$ObjDir = '';

 # Extra build name, if needed.
-$BuildNameExtra = 'Fx-Trunk-l10n';
+$BuildNameExtra = 'Fx-Trunk-l10n-Release';

 # User comment, eg. ip address for dhcp builds.
 # ex: $UserComment = "ip = 208.12.36.108";
@@ -166,11 +166,14 @@ $ConfigureOnly = 1;             # Configure only, don't build.
 $LocaleProduct = "browser";
 $LocalizationVersionFile = 'browser/config/version.txt';
 %WGetFiles = (
-	      "http://stage.mozilla.org/pub/mozilla.org/firefox/nightly/latest-trunk/firefox-%version%.en-US.mac.dmg" =>
-	      "/builds/tinderbox/Fx-Trunk-l10n/Darwin_8.8.4_Depend/firefox.dmg"
+# CONFIG:             "http://%stagingServer%/pub/mozilla.org/firefox/nightly/%version%-candidates/build%build%/firefox-%appVersion%.en-US.mac.dmg" => 
+"http://stage-old.mozilla.org/pub/mozilla.org/firefox/nightly/3.0.19-candidates/build1/firefox-3.0.19.en-US.mac.dmg" => 
+# CONFIG:             "%l10n_buildDir%/%l10n_buildPlatform%/firefox.dmg"
+"/builds/tinderbox/Fx-Mozilla1.9-l10n-Release/Darwin_8.8.4_Depend/firefox.dmg"
 	      );

-$BuildLocalesArgs = "ZIP_IN=/builds/tinderbox/Fx-Trunk-l10n/Darwin_8.8.4_Depend/firefox.dmg";
+# CONFIG: $BuildLocalesArgs = "ZIP_IN=%l10n_buildDir%/%l10n_buildPlatform%/firefox.dmg";
+$BuildLocalesArgs = "ZIP_IN=/builds/tinderbox/Fx-Mozilla1.9-l10n-Release/Darwin_8.8.4_Depend/firefox.dmg";
 #@CompareLocaleDirs        = (); # Run compare-locales test on these directories
@CompareLocaleDirs = (
  "netwerk",
@@ -191,10 +194,12 @@ $BuildLocalesArgs = "ZIP_IN=/builds/tinderbox/Fx-Trunk-l10n/Darwin_8.8.4_Depend/

 #- Until you get the script working. When it works,
 #- change to the tree you're actually building
-$BuildTree  = 'Mozilla-l10n';
+# CONFIG: $BuildTree  = '%buildTree%';
+$BuildTree  = 'MozillaRelease';

 #$BuildName = '';
-#$BuildTag = '';
+# CONFIG: $BuildTag = '%productTag%_RELEASE';
+$BuildTag = 'FIREFOX_3_0_19_RELEASE';
 #$BuildConfigDir = 'mozilla/config';
 #$Topsrcdir = 'mozilla';

@@ -216,36 +221,39 @@ $BinaryName = 'firefox-bin';
 # Release build options
 $ReleaseBuild  = 1;
 $shiptalkback  = 0;
-$ReleaseToLatest = 1; # Push the release to latest-<milestone>?
-$ReleaseToDated = 0; # Push the release to YYYY-MM-DD-HH-<milestone>?
+$ReleaseToLatest = 0; # Push the release to latest-<milestone>?
+$ReleaseToDated = 1; # 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";
 $mac_bundle_path = "/browser/app";
-$ssh_user      = "ffxbld";
-$ssh_key       = "'$ENV{HOME}/.ssh/ffxbld_dsa'";
-$ssh_server    = "stage.mozilla.org";
+# CONFIG: $ssh_user      = "%sshUser%";
+$ssh_user      = "cltbld";
+#$ssh_key       = "'$ENV{HOME}/.ssh/cltbld_dsa'";
+# CONFIG: $ssh_server    = "%sshServer%";
+$ssh_server    = "stage-old.mozilla.org";
 $ReleaseGroup  = "firefox";
 $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";
+# CONFIG: $milestone     = "firefox%version%-l10n";
+$milestone     = "firefox3.0.19-l10n";
 $notify_list   = "build-announce\@mozilla.org";
 $stub_installer = 0;
 $sea_installer = 0;
 $archive       = 1;
 $push_raw_xpis = 0;
-$update_package = 0;
+$update_package = 1;
 $update_product = "Firefox";
 $update_version = "trunk";
 $update_platform = "Darwin_Universal-gcc3";
-$update_hash = "md5";
+$update_hash = "sha1";
 $update_filehost = "ftp.mozilla.org";
 $update_ver_file = 'browser/config/version.txt';
 $update_pushinfo = 0;
-$crashreporter_buildsymbols = 1;
-$crashreporter_pushsymbols = 1;
+$crashreporter_buildsymbols = 0;
+$crashreporter_pushsymbols = 0;
 $ENV{SYMBOL_SERVER_HOST} = 'stage.mozilla.org';
 $ENV{SYMBOL_SERVER_USER}   = 'ffxbld';
 $ENV{SYMBOL_SERVER_PATH}   = '/mnt/netapp/breakpad/symbols_ffx/';
--- a/mozilla/tools/tinderbox-configs/firefox/win32/mozconfig
+++ b/mozilla/tools/tinderbox-configs/firefox/win32/mozconfig
@@ -7,10 +7,14 @@ mk_add_options MOZ_CO_PROJECT=browser
 mk_add_options MOZ_CO_MODULE="mozilla/tools/update-packaging"

 mk_add_options MOZ_CO_LOCALES=all
-mk_add_options LOCALES_CVSROOT=:ext:ffxbld@cvs.mozilla.org:/l10n
+# CONFIG: mk_add_options LOCALES_CO_TAG=%productTag%_RELEASE
+mk_add_options LOCALES_CO_TAG=FIREFOX_3_0_19_RELEASE
+# CONFIG: mk_add_options LOCALES_CVSROOT=%l10nCvsroot%
+mk_add_options LOCALES_CVSROOT=cltbld@cvs.mozilla.org:/l10n

 ac_add_options --enable-application=browser
 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
--- a/mozilla/tools/tinderbox-configs/firefox/win32/tinder-config.pl
+++ b/mozilla/tools/tinderbox-configs/firefox/win32/tinder-config.pl
@@ -138,7 +138,8 @@ $blat           = '/d/mozilla-build/blat261/full/blat';
 # 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";
+# 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';
@@ -150,7 +151,7 @@ $moz_cvsroot   = ":ext:ffxbld\@cvs.mozilla.org:/cvsroot";
 #$ObjDir = '';

 # Extra build name, if needed.
-$BuildNameExtra = 'Fx-Trunk-l10n';
+$BuildNameExtra = 'Fx-Trunk-l10n-Release';

 # User comment, eg. ip address for dhcp builds.
 # ex: $UserComment = "ip = 208.12.36.108";
@@ -161,13 +162,18 @@ $ConfigureOnly = 1;             # Configure only, don't build.
 $LocaleProduct = "browser";
 $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"
+# CONFIG:             'http://%stagingServer%/pub/mozilla.org/firefox/nightly/%version%-candidates/build%build%/unsigned/firefox-%appVersion%.en-US.win32.installer.exe' =>
+'http://stage-old.mozilla.org/pub/mozilla.org/firefox/nightly/3.0.19-candidates/build1/unsigned/firefox-3.0.19.en-US.win32.installer.exe' =>
+# CONFIG:             "%l10n_buildDir%/%l10n_buildPlatform%/firefox-installer.exe",
+"/e/fx19l10nrel/WINNT_5.2_Depend/firefox-installer.exe",
+# CONFIG:             'http://%stagingServer%/pub/mozilla.org/firefox/nightly/%version%-candidates/build%build%/unsigned/firefox-%appVersion%.en-US.win32.zip' =>
+'http://stage-old.mozilla.org/pub/mozilla.org/firefox/nightly/3.0.19-candidates/build1/unsigned/firefox-3.0.19.en-US.win32.zip' =>
+# CONFIG:             "%l10n_buildDir%/%l10n_buildPlatform%/firefox.zip"
+"/e/fx19l10nrel/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";
+# CONFIG: $BuildLocalesArgs = "ZIP_IN=%l10n_buildDir%/%l10n_buildPlatform%/firefox.zip WIN32_INSTALLER_IN=%l10n_buildDir%/%l10n_buildPlatform%/firefox-installer.exe";
+$BuildLocalesArgs = "ZIP_IN=/e/fx19l10nrel/WINNT_5.2_Depend/firefox.zip WIN32_INSTALLER_IN=/e/fx19l10nrel/WINNT_5.2_Depend/firefox-installer.exe";
@CompareLocaleDirs = (
  "netwerk",
  "dom",
@@ -187,10 +193,12 @@ $BuildLocalesArgs = "ZIP_IN=/e/builds/tinderbox/Fx-Trunk-l10n/WINNT_5.2_Depend/f

 #- Until you get the script working. When it works,
 #- change to the tree you're actually building
-$BuildTree  = 'Mozilla-l10n';
+# CONFIG: $BuildTree  = '%buildTree%';
+$BuildTree  = 'MozillaRelease';

 #$BuildName = '';
-#$BuildTag = '';
+# CONFIG: $BuildTag = '%productTag%_RELEASE';
+$BuildTag = 'FIREFOX_3_0_19_RELEASE';
 #$BuildConfigDir = 'mozilla/config';
 #$Topsrcdir = 'mozilla';

@@ -212,36 +220,39 @@ $BinaryName = 'firefox.exe';
 # Release build options
 $ReleaseBuild  = 1;
 $shiptalkback  = 0;
-$ReleaseToLatest = 1; # Push the release to latest-<milestone>?
-$ReleaseToDated = 0; # Push the release to YYYY-MM-DD-HH-<milestone>?
+$ReleaseToLatest = 0; # Push the release to latest-<milestone>?
+$ReleaseToDated = 1; # 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      = "ffxbld";
-$ssh_key       = "'$ENV{HOME}/.ssh/ffxbld_dsa'";
-$ssh_server    = "stage.mozilla.org";
+# CONFIG: $ssh_user      = "%sshUser%";
+$ssh_user      = "cltbld";
+#$ssh_key       = "'$ENV{HOME}/.ssh/cltbld_dsa'";
+# CONFIG: $ssh_server    = "%sshServer%";
+$ssh_server    = "stage-old.mozilla.org";
 $ReleaseGroup  = "firefox";
 $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";
+# CONFIG: $milestone     = 'firefox%version%-l10n';
+$milestone     = 'firefox3.0.19-l10n';
 $notify_list   = 'build-announce@mozilla.org';
 $stub_installer = 0;
 $sea_installer = 1;
 $archive       = 1;
 $push_raw_xpis = 0;
-$update_package = 0;
+$update_package = 1;
 $update_product = "Firefox";
-$update_version = "1.5";
+$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;
+$crashreporter_buildsymbols = 0;
+$crashreporter_pushsymbols = 0;
 $ENV{'SYMBOL_SERVER_HOST'} = 'stage.mozilla.org';
 $ENV{'SYMBOL_SERVER_USER'}   = 'ffxbld';
 $ENV{'SYMBOL_SERVER_PATH'}   = '/mnt/netapp/breakpad/symbols_ffx/';
--- a/mozilla/tools/tinderbox-configs/sunbird/linux/CLOBBER
+++ b/mozilla/tools/tinderbox-configs/sunbird/linux/CLOBBER
@@ -1,7 +0,0 @@
-2007-02-09 06:42 UTC - Spin l10n builds for SUNBIRD_0_3_1_RELEASE
-2006-02-12 21:54 UTC - Respinning to check fixes that block 0.3.1rc2
-2006-02-13 17:31 UTC - Spinning l10n for 0.3.1rc2
-2006-02-13 19:51 UTC - Respinning l10n for 0.3.1rc2
-2006-02-13 19:51 UTC - Respinning l10n for 0.3.1rc2
-2007-03-28 14:40 UTC - Respinning to pick up tinder-config changes
-2007-07-24 16:05 UTC - Clobbering to fix modules/lcms
--- a/mozilla/tools/tinderbox-configs/sunbird/linux/mozconfig
+++ b/mozilla/tools/tinderbox-configs/sunbird/linux/mozconfig
@@ -1,23 +0,0 @@
-#
-## hostname: sb-linux-tbox
-## uname: Linux sb-linux-tbox.build.mozilla.org 2.6.9-42.ELsmp #1 SMP Sat Aug 12 09:39:11 CDT 2006 i686 i686 i386 GNU/Linux
-#
-
-mk_add_options MOZ_CO_PROJECT=calendar
-#mk_add_options MOZ_CO_MODULE="mozilla/tools/update-packaging"
-mk_add_options MOZ_CO_LOCALES=all
-mk_add_options LOCALES_CVSROOT=:ext:calbld@cvs.mozilla.org:/l10n
-mk_add_options MOZ_MAKE_FLAGS="-j6"
-mk_add_options JS_READLINE=1
-
-ac_add_options --enable-application=calendar
-#ac_add_options --enable-update-channel=nightly
-#ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --enable-optimize
-ac_add_options --enable-static
-ac_add_options --disable-shared
-ac_add_options --disable-installer
-ac_add_options --disable-tests
-
-#ac_add_options --enable-official-branding
--- a/mozilla/tools/tinderbox-configs/sunbird/macosx/CLOBBER
+++ b/mozilla/tools/tinderbox-configs/sunbird/macosx/CLOBBER
@@ -1,7 +0,0 @@
-2007-02-09 06:42 UTC - Spin l10n builds for SUNBIRD_0_3_1_RELEASE
-2006-02-12 21:54 UTC - Respinning to check fixes that block 0.3.1rc2
-2006-02-13 17:31 UTC - Spinning l10n for 0.3.1rc2
-2006-02-13 19:51 UTC - Respinning l10n for 0.3.1rc2
-2006-02-13 19:51 UTC - Respinning l10n for 0.3.1rc2
-2007-03-20 11:40 UTC - Respin to use new pserver cvs read-only access (bug 374042)
-2007-03-28 14:40 UTC - Respinning to pick up tinder-config changes
--- a/mozilla/tools/tinderbox-configs/sunbird/macosx/mozconfig
+++ b/mozilla/tools/tinderbox-configs/sunbird/macosx/mozconfig
@@ -1,22 +0,0 @@
-#
-## hostname: cg-xserve03
-## uname: Darwin cg-xserve03.mozilla.com 8.8.1 Darwin Kernel Version 8.8.1: Mon Sep 25 19:45:30 PDT 2006; root:xnu-792.13.8.obj~1/RELEASE_PPC Power Macintosh powerpc
-#
-
-mk_add_options MOZ_CO_PROJECT="calendar"
-mk_add_options MOZ_MAKE_FLAGS="-j6"
-mk_add_options MOZ_CO_LOCALES=all
-mk_add_options LOCALES_CVSROOT=:ext:calbld@cvs.mozilla.org:/l10n
-mk_add_options JS_READLINE=1
-
-ac_add_options --enable-application="calendar"
-ac_add_options --disable-debug
-ac_add_options --enable-optimize="-O2 -g"
-ac_add_options --disable-tests
-ac_add_options --disable-installer
-
-ac_add_options --enable-static
-ac_add_options --disable-shared
-ac_add_app_options ppc --enable-prebinding
-
-#ac_add_options --enable-official-branding
--- a/mozilla/tools/tinderbox-configs/sunbird/win32/CLOBBER
+++ b/mozilla/tools/tinderbox-configs/sunbird/win32/CLOBBER
@@ -1,8 +0,0 @@
-Edit this file and include an explanation of why you're respinning. - #build
-2007-02-07 22:03 - Respinning to pick up l10n Makefile change
-2007-02-09 06:42 UTC - Spin l10n builds for SUNBIRD_0_3_1_RELEASE
-2006-02-12 21:54 UTC - Respinning to check fixes that block 0.3.1rc2
-2006-02-13 17:31 UTC - Spinning l10n for 0.3.1rc2
-2006-02-13 19:51 UTC - Respinning l10n for 0.3.1rc2
-2006-02-13 19:51 UTC - Respinning l10n for 0.3.1rc2
-2007-03-28 14:40 UTC - Respinning to pick up tinder-config changes
--- a/mozilla/tools/tinderbox-configs/sunbird/win32/mozconfig
+++ b/mozilla/tools/tinderbox-configs/sunbird/win32/mozconfig
@@ -1,27 +0,0 @@
-#
-## hostname: sb-win32-tbox
-## uname: CYGWIN_NT-5.2 sb-win32-tbox 1.5.19(0.150/4/2) 2006-01-20 13:28 i686 Cygwin
-#
-
-mk_add_options MOZ_CO_PROJECT=calendar
-#mk_add_options MOZ_CO_MODULE="mozilla/tools/update-packaging"
-#mk_add_options MOZ_CO_MODULE=mozilla/tools/codesighs
-mk_add_options MOZ_CO_LOCALES=all
-mk_add_options LOCALES_CVSROOT=:ext:calbld@cvs.mozilla.org:/l10n
-mk_add_options MOZ_MAKE_FLAGS="-j6"
-mk_add_options JS_READLINE=1
-# mk_add_options MOZ_INSTALLER_USE_7ZIP=1
-# mk_add_options MOZ_PACKAGE_MSI=0
-mk_add_options MOZ_PACKAGE_NSIS=1
-
-ac_add_options --enable-application=calendar
-#ac_add_options --enable-update-channel=nightly
-#ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --enable-optimize
-ac_add_options --enable-static
-ac_add_options --disable-shared
-ac_add_options --enable-installer
-ac_add_options --disable-tests
-#ac_add_options --enable-codesighs
-#ac_add_options --enable-official-branding
--- a/mozilla/tools/tinderbox-configs/thunderbird/linux/CLOBBER
+++ b/mozilla/tools/tinderbox-configs/thunderbird/linux/CLOBBER
@@ -1 +1,2 @@
-2007-03-30 14:20 UTC - Doing a clobber build to avoid cvs conflicts from bug 359716
+2007-03-30 14:20 UTC - Doing a clobber build to avoid cvs conflicts from bug 359716
+2008-07-18 11:20 UTC - Clobber build to generate new nightlies as they were broken due to bug 445708
--- a/mozilla/tools/tinderbox-configs/thunderbird/linux/mozconfig
+++ b/mozilla/tools/tinderbox-configs/thunderbird/linux/mozconfig
@@ -7,13 +7,15 @@ export MOZILLA_OFFICIAL=1
 
 mk_add_options MOZ_CO_PROJECT=mail
 mk_add_options MOZ_CO_LOCALES=all
-# on a tbox where ffxbld is the default ssh key
-mk_add_options LOCALES_CVSROOT=:ext:ffxbld@cvs.mozilla.org:/l10n
-mk_add_options MOZ_MAKE_FLAGS="-j3"
+# CONFIG: mk_add_options LOCALES_CO_TAG=%productTag%_RELEASE
+mk_add_options LOCALES_CO_TAG=THUNDERBIRD_3_0a2_RELEASE
+# CONFIG: mk_add_options LOCALES_CVSROOT=%l10nCvsroot%
+mk_add_options LOCALES_CVSROOT=cltbld@cvs.mozilla.org:/l10n
+mk_add_options MOZ_MAKE_FLAGS="-j1"
 mk_add_options MOZ_CO_MODULE="mozilla/tools/update-packaging"

 ac_add_options --enable-update-packaging
 ac_add_options --enable-application=mail
 ac_add_options --disable-debug
-ac_add_options --enable-optimize="-O2 -gstabs+"
+ac_add_options --enable-optimize
 ac_add_options --disable-tests
--- a/mozilla/tools/tinderbox-configs/thunderbird/linux/tinder-config.pl
+++ b/mozilla/tools/tinderbox-configs/thunderbird/linux/tinder-config.pl
@@ -1,6 +1,6 @@
 #
 ## hostname: l10n-linux-tbox
-## uname: Linux l10n-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
+## uname: Linux l10n-linux-tbox.build.mozilla.org 2.6.18-53.1.19.el5 #1 SMP Wed May 7 08:20:19 EDT 2008 i686 athlon i386 GNU/Linux
 #

 #- tinder-config.pl - Tinderbox configuration file.
@@ -125,7 +125,8 @@ $ProductName              = "Thunderbird";
 # :pserver:$ENV{USER}%netscape.com@cvs.mozilla.org:/cvsroot

 #$moz_cvsroot   = $ENV{CVSROOT};
-$moz_cvsroot   = ":ext:ffxbld\@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';
@@ -137,7 +138,7 @@ $moz_cvsroot   = ":ext:ffxbld\@cvs.mozilla.org:/cvsroot";
 #$ObjDir = '';

 # Extra build name, if needed.
-$BuildNameExtra = 'Tb-Trunk-l10n';
+$BuildNameExtra = 'Tb-Trunk-l10n-Release';

 # User comment, eg. ip address for dhcp builds.
 # ex: $UserComment = "ip = 208.12.36.108";
@@ -148,11 +149,14 @@ $ConfigureOnly = 1;

 $LocalizationVersionFile = 'mail/config/version.txt';
 %WGetFiles = (
-	      "http://stage.mozilla.org/pub/mozilla.org/thunderbird/nightly/latest-trunk/thunderbird-%version%.en-US.linux-i686.tar.bz2" =>
-	      "/builds/tinderbox/Tb-Trunk-l10n/Linux_2.6.18-8.el5_Depend/thunderbird.tar.bz2"
+# CONFIG:             "http://%stagingServer%/pub/mozilla.org/thunderbird/nightly/%version%-candidates/build%build%/thunderbird-%version%.en-US.linux-i686.tar.bz2" =>
+"http://stage-old.mozilla.org/pub/mozilla.org/thunderbird/nightly/3.0a2-candidates/build1/thunderbird-3.0a2.en-US.linux-i686.tar.bz2" =>
+# CONFIG:             "%l10n_buildDir%/%l10n_buildPlatform%/thunderbird.tar.bz2"
+"/builds/tinderbox/Tb-Mozilla1.9-l10n-Release/Linux_2.6.18-53.1.13.el5_Depend/thunderbird.tar.bz2"
 	      );

-$BuildLocalesArgs = "ZIP_IN=/builds/tinderbox/Tb-Trunk-l10n/Linux_2.6.18-8.el5_Depend/thunderbird.tar.bz2";
+# CONFIG: $BuildLocalesArgs = "ZIP_IN=%l10n_buildDir%/%l10n_buildPlatform%/thunderbird.tar.bz2";
+$BuildLocalesArgs = "ZIP_IN=/builds/tinderbox/Tb-Mozilla1.9-l10n-Release/Linux_2.6.18-53.1.13.el5_Depend/thunderbird.tar.bz2";

 #-
 #- The rest should not need to be changed
@@ -163,12 +167,12 @@ $BuildLocalesArgs = "ZIP_IN=/builds/tinderbox/Tb-Trunk-l10n/Linux_2.6.18-8.el5_D

 #- Until you get the script working. When it works,
 #- change to the tree you're actually building
-$BuildTree  = 'Mozilla-l10n';
+# CONFIG: $BuildTree  = '%buildTree%';
+$BuildTree  = 'MozillaRelease';

 #$BuildName = '';
-$BuildTag = '';
-#$BuildTag = 'AVIARY_1_0_1_20050124_BRANCH';
-#$BuildTag = 'FIREFOX_1_0_RELEASE';
+# CONFIG: $BuildTag = '%productTag%_RELEASE';
+$BuildTag = 'THUNDERBIRD_3_0a2_RELEASE';
 #$BuildConfigDir = 'mozilla/config';
 #$Topsrcdir = 'mozilla';

@@ -194,34 +198,35 @@ $BinaryName = 'thunderbird-bin';
 $ReleaseBuild  = 1;
 $LocaleProduct = "mail";
 $shiptalkback  = 0;
-$ReleaseToLatest = 1; # Push the release to latest-<milestone>?
-$ReleaseToDated = 0; # Push the release to YYYY-MM-DD-HH-<milestone>?
+$ReleaseToLatest = 0; # Push the release to latest-<milestone>?
+$ReleaseToDated = 1; # Push the release to YYYY-MM-DD-HH-<milestone>?
 $build_hour    = "9";
 $package_creation_path = "/mail/installer";
 # needs setting for mac + talkback: $mac_bundle_path = "/browser/app";
 $ssh_version   = "2";
-$ssh_user      = "tbirdbld";
-$ssh_key       = "'$ENV{HOME}/.ssh/tbirdbld_dsa'";
-$ssh_server    = "stage.mozilla.org";
-$ReleaseGroup  = "thunderbird";
+# CONFIG: $ssh_user      = "%sshUser%";
+$ssh_user      = "cltbld";
+# CONFIG: $ssh_server    = "%sshServer%";
+$ssh_server    = "stage-old.mozilla.org";
 $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";
-$milestone     = "trunk-l10n";
+# CONFIG: $milestone     = 'thunderbird%version%-l10n';
+$milestone     = 'thunderbird3.0a2-l10n';
 $notify_list   = "build-announce\@mozilla.org";
 $stub_installer = 0;
 $sea_installer = 0;
 $archive       = 1;
 $push_raw_xpis = 1;
-$update_package = 0;
+$update_package = 1;
 $update_product = "Thunderbird";
 $update_version = "trunk";
 $update_platform = "Linux_x86-gcc3";
 $update_hash = "sha1";
 $update_filehost = "ftp.mozilla.org";
-$update_appv = "3.0a1";
-$update_extv = "3.0a1";
+$update_ver_file = 'mail/config/version.txt';
+$update_pushinfo = 0;

 # 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
--- a/mozilla/tools/tinderbox-configs/thunderbird/macosx/CLOBBER
+++ b/mozilla/tools/tinderbox-configs/thunderbird/macosx/CLOBBER
@@ -1 +1,2 @@
-2007-03-30 14:20 UTC - Respinning to fix cvs conflicts from bug 359716
+2007-03-30 14:20 UTC - Respinning to fix cvs conflicts from bug 359716
+2008-07-18 11:20 UTC - Clobber build to generate new nightlies as they were broken due to bug 445708
--- a/mozilla/tools/tinderbox-configs/thunderbird/macosx/mozconfig
+++ b/mozilla/tools/tinderbox-configs/thunderbird/macosx/mozconfig
@@ -5,14 +5,16 @@

 mk_add_options MOZ_CO_PROJECT=mail
 mk_add_options MOZ_CO_LOCALES=all
-# on a tbox where ffxbld is the default ssh key
-mk_add_options LOCALES_CVSROOT=:ext:ffxbld@cvs.mozilla.org:/l10n
+# CONFIG: mk_add_options LOCALES_CO_TAG=%productTag%_RELEASE
+mk_add_options LOCALES_CO_TAG=THUNDERBIRD_3_0a2_RELEASE
+# CONFIG: mk_add_options LOCALES_CVSROOT=%l10nCvsroot%
+mk_add_options LOCALES_CVSROOT=cltbld@cvs.mozilla.org:/l10n
+mk_add_options MOZ_CO_MODULE="mozilla/tools/update-packaging"

 ac_add_options --enable-application=mail
-ac_add_options --enable-optimize="-O2 -g"
+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-prebinding
-
+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
@@ -34,7 +34,7 @@ $BuildLocales      = 1;
 $CleanProfile             = 1;
 #$ResetHomeDirForTests     = 1;
 $ProductName              = "Thunderbird";
-$VendorName               = 'Mozilla';
+#$VendorName               = 'Mozilla';

 #$RunMozillaTests          = 1;  # Allow turning off of all tests if needed.
 #$RegxpcomTest             = 1;
@@ -119,7 +119,8 @@ $VendorName               = 'Mozilla';
 # 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";
+# 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';
@@ -131,7 +132,7 @@ $moz_cvsroot   = ":ext:ffxbld\@cvs.mozilla.org:/cvsroot";
 #$ObjDir = '';

 # Extra build name, if needed.
-$BuildNameExtra = 'Tb-Trunk-l10n';
+$BuildNameExtra = 'Tb-Trunk-l10n-Release';

 # User comment, eg. ip address for dhcp builds.
 # ex: $UserComment = "ip = 208.12.36.108";
@@ -141,10 +142,14 @@ $BuildNameExtra = 'Tb-Trunk-l10n';
 $ConfigureOnly = 1;
 $LocalizationVersionFile = 'mail/config/version.txt';
 %WGetFiles = (
-	     "http://stage.mozilla.org/pub/mozilla.org/thunderbird/nightly/latest-trunk/thunderbird-%version%.en-US.mac.dmg" =>
-	     "/builds/tinderbox/Tb-Trunk-l10n/Darwin_8.8.4_Depend/thunderbird.dmg"
+# CONFIG:             "http://%stagingServer%/pub/mozilla.org/thunderbird/nightly/%version%-candidates/build%build%/thunderbird-%version%.en-US.mac.dmg" =>
+"http://stage-old.mozilla.org/pub/mozilla.org/thunderbird/nightly/3.0a2-candidates/build1/thunderbird-3.0a2.en-US.mac.dmg" =>
+# CONFIG:             "%l10n_buildDir%/%l10n_buildPlatform%/thunderbird.dmg"
+"/builds/tinderbox/Tb-Mozilla1.9-l10n-Release/Darwin_8.8.4_Depend/thunderbird.dmg"
 	     );
-$BuildLocalesArgs = "ZIP_IN=/builds/tinderbox/Tb-Trunk-l10n/Darwin_8.8.4_Depend/thunderbird.dmg";
+
+# CONFIG: $BuildLocalesArgs = "ZIP_IN=%l10n_buildDir%/%l10n_buildPlatform%/thunderbird.dmg";
+$BuildLocalesArgs = "ZIP_IN=/builds/tinderbox/Tb-Mozilla1.9-l10n-Release/Darwin_8.8.4_Depend/thunderbird.dmg";


 #-
@@ -156,12 +161,12 @@ $BuildLocalesArgs = "ZIP_IN=/builds/tinderbox/Tb-Trunk-l10n/Darwin_8.8.4_Depend/

 #- Until you get the script working. When it works,
 #- change to the tree you're actually building
-$BuildTree  = 'Mozilla-l10n';
+# CONFIG: $BuildTree  = '%buildTree%';
+$BuildTree  = 'MozillaRelease';

 #$BuildName = '';
-$BuildTag = '';
-#$BuildTag = 'AVIARY_1_0_1_20050124_BRANCH';
-#$BuildTag = 'FIREFOX_1_0_RELEASE';
+# CONFIG: $BuildTag = '%productTag%_RELEASE';
+$BuildTag = 'THUNDERBIRD_3_0a2_RELEASE';
 #$BuildConfigDir = 'mozilla/config';
 #$Topsrcdir = 'mozilla';

@@ -187,26 +192,35 @@ $BinaryName = 'thunderbird-bin';
 $ReleaseBuild  = 1;
 $LocaleProduct = "mail";
 $shiptalkback  = 0;
-$ReleaseToLatest = 1; # Push the release to latest-<milestone>?
-$ReleaseToDated = 0; # Push the release to YYYY-MM-DD-HH-<milestone>?
+$ReleaseToLatest = 0; # Push the release to latest-<milestone>?
+$ReleaseToDated = 1; # Push the release to YYYY-MM-DD-HH-<milestone>?
 $build_hour    = "9";
 $package_creation_path = "/mail/installer";
 # needs setting for mac + talkback: $mac_bundle_path = "/browser/app";
 $mac_bundle_path = "/mail/app";
-$ssh_user      = "tbirdbld";
-$ssh_key       = "'$ENV{HOME}/.ssh/tbirdbld_dsa'";
-$ssh_server    = "stage.mozilla.org";
-$ReleaseGroup  = "thunderbird";
+# CONFIG: $ssh_user      = "%sshUser%";
+$ssh_user      = "cltbld";
+# CONFIG: $ssh_server    = "%sshServer%";
+$ssh_server    = "stage-old.mozilla.org";
 $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";
-$milestone     = "trunk-l10n";
+# CONFIG: $milestone     = 'thunderbird%version%-l10n';
+$milestone     = 'thunderbird3.0a2-l10n';
 $notify_list   = "build-announce\@mozilla.org";
 $stub_installer = 0;
 $sea_installer = 0;
 $archive       = 1;
-#$push_raw_xpis = 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;

 # 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
--- a/mozilla/tools/tinderbox-configs/thunderbird/win32/CLOBBER
+++ b/mozilla/tools/tinderbox-configs/thunderbird/win32/CLOBBER
@@ -0,0 +1 @@
+2008-07-18 11:20 UTC - Clobber build to generate new nightlies as they were broken due to bug 445708
--- a/mozilla/tools/tinderbox-configs/thunderbird/win32/mozconfig
+++ b/mozilla/tools/tinderbox-configs/thunderbird/win32/mozconfig
@@ -5,15 +5,16 @@

 mk_add_options MOZ_CO_PROJECT=mail
 mk_add_options MOZ_CO_LOCALES=all
-# on a tbox where ffxbld is the default ssh key
-mk_add_options LOCALES_CVSROOT=:ext:ffxbld@cvs.mozilla.org:/l10n
+# CONFIG: mk_add_options LOCALES_CO_TAG=%productTag%_RELEASE
+mk_add_options LOCALES_CO_TAG=THUNDERBIRD_3_0a2_RELEASE
+# CONFIG: mk_add_options LOCALES_CVSROOT=%l10nCvsroot%
+mk_add_options LOCALES_CVSROOT=cltbld@cvs.mozilla.org:/l10n
 mk_add_options MOZ_CO_MODULE="mozilla/tools/update-packaging"

 ac_add_options --enable-application=mail
 ac_add_options --disable-debug
 ac_add_options --enable-optimize
 ac_add_options --disable-tests
-ac_add_options --enable-official-branding
 ac_add_options --disable-shared
 ac_add_options --enable-static
 ac_add_options --enable-update-packaging
--- a/mozilla/tools/tinderbox-configs/thunderbird/win32/tinder-config.pl
+++ b/mozilla/tools/tinderbox-configs/thunderbird/win32/tinder-config.pl
@@ -116,8 +116,8 @@ $use_blat       = 1;
 #
 # 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";
+# 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';
@@ -129,7 +129,7 @@ $moz_cvsroot   = ":ext:ffxbld\@cvs.mozilla.org:/cvsroot";
 #$ObjDir = '';

 # Extra build name, if needed.
-$BuildNameExtra = 'Tb-Trunk-l10n';
+$BuildNameExtra = 'Tb-Trunk-l10n-Release';

 # User comment, eg. ip address for dhcp builds.
 # ex: $UserComment = "ip = 208.12.36.108";
@@ -140,12 +140,19 @@ $ConfigureOnly = 1;

 # On windows
 $LocalizationVersionFile = 'mail/config/version.txt';
-%WGetFiles = ("http://stage.mozilla.org/pub/mozilla.org/thunderbird/nightly/latest-trunk/thunderbird-%version%.en-US.win32.installer.exe" =>
-	      "/e/builds/tinderbox/Tb-Trunk-l10n/WINNT_5.2_Depend/thunderbird-installer.exe",
-	      "http://stage.mozilla.org/pub/mozilla.org/thunderbird/nightly/latest-trunk/thunderbird-%version%.en-US.win32.zip" =>
-	      "/e/builds/tinderbox/Tb-Trunk-l10n/WINNT_5.2_Depend/thunderbird.zip");
+%WGetFiles = (
+# CONFIG:              "http://%stagingServer%/pub/mozilla.org/thunderbird/nightly/%version%-candidates/build%build%/unsigned/thunderbird-%version%.en-US.win32.installer.exe" =>
+"http://stage-old.mozilla.org/pub/mozilla.org/thunderbird/nightly/3.0a2-candidates/build1/unsigned/thunderbird-3.0a2.en-US.win32.installer.exe" =>
+# CONFIG:              "%l10n_buildDir%/%l10n_buildPlatform%/thunderbird-installer.exe",
+"/e/tb19l10nrel/WINNT_5.2_Depend/thunderbird-installer.exe",
+# CONFIG:              "http://%stagingServer%/pub/mozilla.org/thunderbird/nightly/%version%-candidates/build%build%/unsigned/thunderbird-%version%.en-US.win32.zip" =>
+"http://stage-old.mozilla.org/pub/mozilla.org/thunderbird/nightly/3.0a2-candidates/build1/unsigned/thunderbird-3.0a2.en-US.win32.zip" =>
+# CONFIG:              "%l10n_buildDir%/%l10n_buildPlatform%/thunderbird.zip"
+"/e/tb19l10nrel/WINNT_5.2_Depend/thunderbird.zip"
+);

-$BuildLocalesArgs = "ZIP_IN=/e/builds/tinderbox/Tb-Trunk-l10n/WINNT_5.2_Depend/thunderbird.zip WIN32_INSTALLER_IN=/e/builds/tinderbox/Tb-Trunk-l10n/WINNT_5.2_Depend/thunderbird-installer.exe";
+# CONFIG: $BuildLocalesArgs = "ZIP_IN=%l10n_buildDir%/%l10n_buildPlatform%/thunderbird.zip WIN32_INSTALLER_IN=%l10n_buildDir%/%l10n_buildPlatform%/thunderbird-installer.exe";
+$BuildLocalesArgs = "ZIP_IN=/e/tb19l10nrel/WINNT_5.2_Depend/thunderbird.zip WIN32_INSTALLER_IN=/e/tb19l10nrel/WINNT_5.2_Depend/thunderbird-installer.exe";

 #-
 #- The rest should not need to be changed
@@ -156,12 +163,12 @@ $BuildLocalesArgs = "ZIP_IN=/e/builds/tinderbox/Tb-Trunk-l10n/WINNT_5.2_Depend/t

 #- Until you get the script working. When it works,
 #- change to the tree you're actually building
-$BuildTree  = 'Mozilla-l10n';
+# CONFIG: $BuildTree  = '%buildTree%';
+$BuildTree  = 'MozillaRelease';

 #$BuildName = '';
-#$BuildTag = 'MOZILLA_1_8_BRANCH';
-#$BuildTag = 'AVIARY_1_0_1_20050124_BRANCH';
-#$BuildTag = 'FIREFOX_1_0_RELEASE';
+# CONFIG: $BuildTag = '%productTag%_RELEASE';
+$BuildTag = 'THUNDERBIRD_3_0a2_RELEASE';
 #$BuildConfigDir = 'mozilla/config';
 #$Topsrcdir = 'mozilla';

@@ -187,34 +194,35 @@ $BinaryName = 'thunderbird.exe';
 $ReleaseBuild  = 1;
 $LocaleProduct = "mail";
 $shiptalkback  = 0;
-$ReleaseToLatest = 1; # Push the release to latest-<milestone>?
-$ReleaseToDated = 0; # Push the release to YYYY-MM-DD-HH-<milestone>?
+$ReleaseToLatest = 0; # Push the release to latest-<milestone>?
+$ReleaseToDated = 1; # Push the release to YYYY-MM-DD-HH-<milestone>?
 $build_hour    = "9";
 $package_creation_path = "/mail/installer";
 # needs setting for mac + talkback: $mac_bundle_path = "/browser/app";
 $ssh_version   = "2";
-$ssh_user      = "tbirdbld";
-$ssh_key       = "'$ENV{HOME}/.ssh/tbirdbld_dsa'";
-$ssh_server    = "stage.mozilla.org";
-$ReleaseGroup  = "thunderbird";
+# CONFIG: $ssh_user      = "%sshUser%";
+$ssh_user      = "cltbld";
+# CONFIG: $ssh_server    = "%sshServer%";
+$ssh_server    = "stage-old.mozilla.org";
 $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";
-$milestone     = "trunk-l10n";
+# CONFIG: $milestone     = 'thunderbird%version%-l10n';
+$milestone     = 'thunderbird3.0a2-l10n';
 $notify_list   = "build-announce\@mozilla.org";
 $stub_installer = 0;
 $sea_installer = 1;
 $archive       = 1;
 $push_raw_xpis = 0;
-$update_package = 0;
+$update_package = 1;
 $update_product = "Thunderbird";
-$update_version = "1.5";
+$update_version = "trunk";
 $update_platform = "WINNT_x86-msvc";
 $update_hash = "sha1";
 $update_filehost = "ftp.mozilla.org";
-$update_appv = "1.5";
-$update_extv = "1.5";
+$update_ver_file = 'mail/config/version.txt';
+$update_pushinfo = 0;

 # 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
--- 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,16 @@
+#
+## 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
+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
@@ -1,13 +1,13 @@
 #
-## hostname: cg-xserve03
-## uname: Darwin cg-xserve03.mozilla.com 8.8.1 Darwin Kernel Version 8.8.1: Mon Sep 25 19:45:30 PDT 2006; root:xnu-792.13.8.obj~1/RELEASE_PPC Power Macintosh powerpc
+## 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{CVS_RSH} = "ssh";
+$ENV{MOZ_CRASHREPORTER_NO_REPORT} = '1';

 # $ENV{MOZ_PACKAGE_MSI}
 #-----------------------------------------------------------------------------
@@ -27,43 +27,48 @@ $ENV{CVS_RSH} = "ssh";
 #$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} || "calbld") . "\@" . ($ENV{HOST} || "dhcp");
+#$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       = 0;      # Depend or Clobber
+#$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       = 1;      # Use to debug post-mozilla.pl scripts.
-$BuildLocales      = 1;      # Do l10n packaging?
+#$SkipMozilla       = 0;      # Use to debug post-mozilla.pl scripts.
+#$BuildLocales      = 0;      # Do l10n packaging?
+
+# 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              = 'Sunbird';
-#$MacOSProductName         = 'Sunbird';
-$ProductName              = 'Calendar';
-$MacOSProductName         = 'Calendar';
+$ProductName              = "XULRunner";
 $VendorName               = 'Mozilla';

-#$RunMozillaTests          = 1;  # Allow turning off of all tests if needed.
+$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;
+#$DomToTextConversionTest  = 0;  
 #$XpcomGlueTest            = 0;
 #$CodesizeTest             = 0;  # Z,  require mozilla/tools/codesighs
 #$EmbedCodesizeTest        = 0;  # mZ, require mozilla/tools/codesigns
@@ -71,18 +76,13 @@ $VendorName               = 'Mozilla';
 #$EmbedTest                = 0;  # Assumes you wanted $BuildEmbed=1
 #$LayoutPerformanceTest    = 0;  # Tp
 #$DHTMLPerformanceTest     = 0;  # Tdhtml
-#$QATest                   = 0;
+#$QATest                   = 0;  
 #$XULWindowOpenTest        = 0;  # Txul
 #$StartupPerformanceTest   = 0;  # Ts
 #@CompareLocaleDirs        = (); # Run compare-locales test on these directories
-@CompareLocaleDirs = (
-  "netwerk",
-  "calendar",
-  "dom",
-  "toolkit",
-  "security/manager",
-  "other-licenses/branding/sunbird",
-);
+# ("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?

@@ -109,7 +109,7 @@ $VendorName               = 'Mozilla';
 #$BloatTestTimeout                 = 120;   # seconds
 #$MailBloatTestTimeout             = 120;   # seconds
 #$JavaTestTimeout                  = 45;
-#$DomTestTimeout                   = 45;    # seconds
+#$DomTestTimeout	                  = 45;    # seconds
 #$XpcomGlueTestTimeout             = 15;
 #$CodesizeTestTimeout              = 900;     # seconds
 #$CodesizeTestType                 = "auto";  # {"auto"|"base"}
@@ -118,7 +118,7 @@ $VendorName               = 'Mozilla';
 #$QATestTimeout                    = 1200;   # entire test, seconds
 #$LayoutPerformanceTestPageTimeout = 30000; # each page, ms
 #$StartupPerformanceTestTimeout    = 15;    # seconds
-#$XULWindowOpenTestTimeout         = 150;   # seconds
+#$XULWindowOpenTestTimeout	      = 150;   # seconds


 #$MozConfigFileName = 'mozconfig';
@@ -145,8 +145,8 @@ $VendorName               = 'Mozilla';
 # :pserver:$ENV{USER}%netscape.com@cvs.mozilla.org:/cvsroot

 #$moz_cvsroot   = $ENV{CVSROOT};
-#$moz_cvsroot   = ':ext:calbld@cvs.mozilla.org:/cvsroot';
-$moz_cvsroot   = ':ext:calbld@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';
@@ -155,32 +155,15 @@ $moz_cvsroot   = ':ext:calbld@cvs.mozilla.org:/cvsroot';
 #$moz_client_mk = 'client.mk';

 #- Set if you want to build in a separate object tree
-#$ObjDir = '';
+$ObjDir = 'obj-xulrunner';

 # Extra build name, if needed.
-$BuildNameExtra = 'Sb-Trunk-l10n';
+$BuildNameExtra = 'Release';

 # User comment, eg. ip address for dhcp builds.
 # ex: $UserComment = "ip = 208.12.36.108";
 #$UserComment = 0;

-# Configure only, don't build.
-$ConfigureOnly = 1;
-
-$LocalizationVersionFile = 'calendar/sunbird/config/version.txt';
-
-# %WGetFiles = (
-#	      "http://stage.mozilla.org/pub/mozilla.org/calendar/sunbird/releases/0.3.1rc2/mac/en-US/sunbird-%version%.en-US.mac.dmg" =>
-#	      "/builds/tinderbox/Sb-Trunk-l10n/Darwin_8.8.4_Clobber/sunbird.dmg"
-#	      );
-
-%WGetFiles = (
-	      "http://stage.mozilla.org/pub/mozilla.org/calendar/sunbird/nightly/latest-trunk/sunbird-%version%.en-US.mac.dmg" =>
-	      "/builds/tinderbox/Sunbird-Trunk-l10n/Darwin_8.8.1_Clobber/sunbird.dmg"
-	      );
-
-$BuildLocalesArgs = "ZIP_IN=/builds/tinderbox/Sunbird-Trunk-l10n/Darwin_8.8.1_Clobber/sunbird.dmg";
-
 #-
 #- The rest should not need to be changed
 #-
@@ -190,14 +173,16 @@ $BuildLocalesArgs = "ZIP_IN=/builds/tinderbox/Sunbird-Trunk-l10n/Darwin_8.8.1_Cl

 #- Until you get the script working. When it works,
 #- change to the tree you're actually building
-$BuildTree  = 'Mozilla-l10n';
+# CONFIG: $BuildTree  = '%buildTree%';
+$BuildTree  = 'MozillaRelease';

 #$BuildName = '';
-#$BuildTag = 'SUNBIRD_0_3_1_RELEASE';
+# CONFIG: $BuildTag = '%productTag%_RELEASE';
+$BuildTag = 'FIREFOX_3_0_17_RELEASE';
 #$BuildConfigDir = 'mozilla/config';
 #$Topsrcdir = 'mozilla';

-$BinaryName = 'sunbird-bin';
+$BinaryName = 'xulrunner-bin';

 #
 # For embedding app, use:
@@ -214,44 +199,49 @@ $BinaryName = 'sunbird-bin';

 # Release build options
 $ReleaseBuild  = 1;
-$ReleaseGroup = 'calendar';
-$LocaleProduct = "calendar";
+#$LocaleProduct = "browser";
 $shiptalkback  = 0;
-$ReleaseToLatest = 1; # Push the release to latest-<milestone>?
-$ReleaseToDated = 0; # Push the release to YYYY-MM-DD-HH-<milestone>?
-$build_hour    = "9";
-$package_creation_path = "/calendar/installer";
-# needs setting for mac + talkback:
-$mac_bundle_path = "/calendar/sunbird/app";
+$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";
-$ssh_user      = "calbld";
-$ssh_server    = "stage.mozilla.org";
-$ftp_path      = "/home/ftp/pub/calendar/sunbird/nightly";
-$url_path      = "http://ftp.mozilla.org/pub/mozilla.org/calendar/sunbird/nightly";
-$tbox_ftp_path = "/home/ftp/pub/calendar/sunbird/tinderbox-builds";
-$tbox_url_path = "http://ftp.mozilla.org/pub/mozilla.org/calendar/sunbird/tinderbox-builds";
-$milestone     = "trunk-l10n";
-$notify_list   = 'build-announce@mozilla.org';
+# 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;
-#$update_package = 1;
-#$update_product = "Sunbird";
-#$update_version = "trunk";
-#$update_platform = "Darwin_Universal-gcc3";
-#$update_hash = "sha1";
-#$update_filehost = "ftp.mozilla.org";
-#$update_ver_file = 'calendar/sunbird/config/version.txt';
-#$update_pushinfo = 1;
+$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.
+# 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.
@@ -267,5 +257,5 @@ $push_raw_xpis = 0;
 #$LogEncoding = '';

 # Prevent Extension Manager from spawning child processes during tests
-# - processes that tbox scripts cannot kill.
-$ENV{NO_EM_RESTART} = '1';
+# - 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,19 @@
+#
+## 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
+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
@@ -1,24 +1,18 @@
 #
-## hostname: sb-win32-tbox
-## uname: CYGWIN_NT-5.2 sb-win32-tbox 1.5.19(0.150/4/2) 2006-01-20 13:28 i686 Cygwin
+## 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.

-# $ENV{MOZ_INSTALLER_USE_7ZIP}
-#-----------------------------------------------------------------------------
-#  Purpose: Controls whether a 7-Zip Self Extracting Full Installer is made.
-# Requires: Windows and a local 7-Zip installation.
-$ENV{MOZ_INSTALLER_USE_7ZIP} = '1';
+$MacUniversalBinary = 1;

-# $ENV{MOZ_PACKAGE_NSIS}
-#-----------------------------------------------------------------------------
-#  Purpose: Controls whether the Nullsoft Installer System is used for
-#           creating an installer.
-# Requires: Windows and a local NSIS installation.
-$ENV{MOZ_PACKAGE_NSIS} = '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}
 #-----------------------------------------------------------------------------
@@ -39,31 +33,40 @@ $ENV{MOZ_PACKAGE_NSIS} = '1';

 #- PLEASE FILL THIS IN WITH YOUR PROPER EMAIL ADDRESS
 #$BuildAdministrator = "$ENV{USER}\@$ENV{HOST}";
-#$BuildAdministrator = ($ENV{USER} || "calbld") . "\@" . ($ENV{HOST} || "dhcp");
+#$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       = 0;      # Depend or Clobber
+#$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          = 1;      # Only run tests, don't pull/build
+#$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       = 1;      # Use to debug post-mozilla.pl scripts.
-$BuildLocales      = 1;      # Do l10n packaging?
+#$SkipMozilla       = 0;      # Use to debug post-mozilla.pl scripts.
+#$BuildLocales      = 0;      # Do l10n packaging?
+
+# 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              = "Sunbird";
+$ProductName              = "XULRunner";
 $VendorName               = 'Mozilla';

-#$RunMozillaTests          = 1;  # Allow turning off of all tests if needed.
+$RunMozillaTests          = 0;  # Allow turning off of all tests if needed.
 #$RegxpcomTest             = 1;
 #$AliveTest                = 1;
 #$JavaTest                 = 0;
@@ -83,18 +86,10 @@ $VendorName               = 'Mozilla';
 #$StartupPerformanceTest   = 0;  # Ts
 #@CompareLocaleDirs        = (); # Run compare-locales test on these directories
 # ("network","dom","toolkit","security/manager");
-@CompareLocaleDirs = (
-  "netwerk",
-  "calendar",
-  "dom",
-  "toolkit",
-  "security/manager",
-  "other-licenses/branding/sunbird",
-);
 #$CompareLocalesAviary     = 0;  # Should the compare-locales commands use the
                                # aviary directory structure?

-$TestsPhoneHome           = 1;  # Should test report back to server?
+#$TestsPhoneHome           = 0;  # Should test report back to server?

 # $results_server
 #----------------------------------------------------------------------------
@@ -137,14 +132,14 @@ $TestsPhoneHome           = 1;  # Should test report back to server?
 #$MozProfileName = 'default';

 #- Set these to what makes sense for your system
-$Make          = 'make';       # Must be GNU make
+#$Make          = 'gmake';       # Must be GNU make
 #$MakeOverrides = '';
 #$mail          = '/bin/mail';
 #$CVS           = 'cvs -q';
 #$CVSCO         = 'checkout -P';

 # win32 usually doesn't have /bin/mail
-$blat           = 'blat';
+#$blat           = 'c:/nstools/bin/blat';
 #$use_blat       = 0;

 # Set moz_cvsroot to something like:
@@ -154,8 +149,9 @@ $blat           = 'blat';
 # 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:calbld\@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';
@@ -164,35 +160,15 @@ $moz_cvsroot   = ":ext:calbld\@cvs.mozilla.org:/cvsroot";
 #$moz_client_mk = 'client.mk';

 #- Set if you want to build in a separate object tree
-#$ObjDir = 'sunbird-obj';
+$ObjDir = '../build/universal';

 # Extra build name, if needed.
-$BuildNameExtra = 'Sb-Trunk-l10n';
+$BuildNameExtra = 'Release';

 # User comment, eg. ip address for dhcp builds.
 # ex: $UserComment = "ip = 208.12.36.108";
 #$UserComment = 0;

-# Configure only, don't build.
-$ConfigureOnly = 1;
-
-$LocalizationVersionFile = 'calendar/sunbird/config/version.txt';
-
-# %WGetFiles = (
-#	      "http://stage.mozilla.org/pub/mozilla.org/calendar/sunbird/releases/0.3.1rc2/win32/en-US/sunbird-%version%.en-US.win32.zip" =>
-#	      "/cygdrive/d/builds/tinderbox/Sunbird-Trunk-l10n/WINNT_5.2_Clobber/sunbird.zip",
-#	      "http://stage.mozilla.org/pub/mozilla.org/calendar/sunbird/releases/0.3.1rc2/win32/en-US/sunbird-%version%.en-US.win32.installer.exe" =>
-#	      "/cygdrive/d/builds/tinderbox/Sunbird-Trunk-l10n/WINNT_5.2_Clobber/sunbird-installer.exe"
-#	      );
-
-%WGetFiles = (
-	      "http://stage.mozilla.org/pub/mozilla.org/calendar/sunbird/nightly/latest-trunk/sunbird-%version%.en-US.win32.zip" =>
-	      "/cygdrive/d/builds/tinderbox/Sunbird-Trunk-l10n/WINNT_5.2_Clobber/sunbird.zip",
-	      "http://stage.mozilla.org/pub/mozilla.org/calendar/sunbird/nightly/latest-trunk/sunbird-%version%.en-US.win32.installer.exe" =>
-	      "/cygdrive/d/builds/tinderbox/Sunbird-Trunk-l10n/WINNT_5.2_Clobber/sunbird-installer.exe"
-	      );
-
-$BuildLocalesArgs = "ZIP_IN=/cygdrive/d/builds/tinderbox/Sunbird-Trunk-l10n/WINNT_5.2_Clobber/sunbird.zip WIN32_INSTALLER_IN=/cygdrive/d/builds/tinderbox/Sunbird-Trunk-l10n/WINNT_5.2_Clobber/sunbird-installer.exe";
 #-
 #- The rest should not need to be changed
 #-
@@ -202,14 +178,16 @@ $BuildLocalesArgs = "ZIP_IN=/cygdrive/d/builds/tinderbox/Sunbird-Trunk-l10n/WINN

 #- Until you get the script working. When it works,
 #- change to the tree you're actually building
-$BuildTree  = 'Mozilla-l10n';
+# CONFIG: $BuildTree  = '%buildTree%';
+$BuildTree  = 'MozillaRelease';

 #$BuildName = '';
-#$BuildTag = 'SUNBIRD_0_3_1_RELEASE';
+# CONFIG: $BuildTag = '%productTag%_RELEASE';
+$BuildTag = 'FIREFOX_3_0_17_RELEASE';
 #$BuildConfigDir = 'mozilla/config';
 #$Topsrcdir = 'mozilla';

-$BinaryName = 'sunbird.exe';
+$BinaryName = 'xulrunner-bin';

 #
 # For embedding app, use:
@@ -226,35 +204,42 @@ $BinaryName = 'sunbird.exe';

 # Release build options
 $ReleaseBuild  = 1;
-$ReleaseGroup = 'calendar';
-$LocaleProduct = "calendar";
+#$LocaleProduct = "browser";
 $shiptalkback  = 0;
-$ReleaseToLatest = 1; # Push the release to latest-<milestone>?
-$ReleaseToDated = 0; # Push the release to YYYY-MM-DD-HH-<milestone>?
-$build_hour    = "9";
-$package_creation_path = "/calendar/installer";
+#$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";
-$ssh_user      = "calbld";
-$ssh_server    = "stage.mozilla.org";
-$ftp_path      = "/home/ftp/pub/calendar/sunbird/nightly";
-$url_path      = "http://ftp.mozilla.org/pub/mozilla.org/calendar/sunbird/nightly";
-$tbox_ftp_path = "/home/ftp/pub/calendar/sunbird/tinderbox-builds";
-$tbox_url_path = "http://ftp.mozilla.org/pub/mozilla.org/calendar/sunbird/tinderbox-builds";
-$milestone     = "trunk-l10n";
-$notify_list   = 'build-announce@mozilla.org';
+# 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 = 1;
+$sea_installer = 0;
 $archive       = 1;
 $push_raw_xpis = 0;
-#$update_package = 1;
-#$update_product = "Sunbird";
-#$update_version = "trunk";
-#$update_platform = "WINNT_x86-msvc";
-#$update_hash = "md5";
-#$update_filehost = "ftp.mozilla.org";
-#$update_ver_file = 'calendar/sunbird/config/version.txt';
-#$update_pushinfo = 1;
+$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
--- 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,16 @@
+#
+# 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
+
+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 --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
@@ -1,13 +1,16 @@
 #
-## hostname: sb-linux-tbox
-## uname: Linux sb-linux-tbox.build.mozilla.org 2.6.9-42.ELsmp #1 SMP Sat Aug 12 09:39:11 CDT 2006 i686 i686 i386 GNU/Linux
+# 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';

 # $ENV{MOZ_PACKAGE_MSI}
 #-----------------------------------------------------------------------------
@@ -28,14 +31,15 @@ $ENV{CVS_RSH} = "ssh";

 #- PLEASE FILL THIS IN WITH YOUR PROPER EMAIL ADDRESS
 #$BuildAdministrator = "$ENV{USER}\@$ENV{HOST}";
-#$BuildAdministrator = ($ENV{USER} || "calbld") . "\@" . ($ENV{HOST} || "dhcp");
+#$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       = 0;      # Depend or Clobber
+#$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.
@@ -43,16 +47,16 @@ $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       = 1;      # Use to debug post-mozilla.pl scripts.
-$BuildLocales      = 1;      # Do l10n packaging?
+#$SkipMozilla       = 0;      # Use to debug post-mozilla.pl scripts.
+#$BuildLocales      = 0;      # Do l10n packaging?

 # Tests
-$CleanProfile             = 1;
-$ResetHomeDirForTests     = 1;
-$ProductName              = "Sunbird";
+#$CleanProfile             = 0;
+#$ResetHomeDirForTests     = 1;
+$ProductName              = "XULRunner";
 $VendorName               = 'Mozilla';

-#$RunMozillaTests          = 1;  # Allow turning off of all tests if needed.
+$RunMozillaTests          = 0;  # Allow turning off of all tests if needed.
 #$RegxpcomTest             = 1;
 #$AliveTest                = 1;
 #$JavaTest                 = 0;
@@ -70,16 +74,6 @@ $VendorName               = 'Mozilla';
 #$QATest                   = 0;  
 #$XULWindowOpenTest        = 0;  # Txul
 #$StartupPerformanceTest   = 0;  # Ts
-#@CompareLocaleDirs        = (); # Run compare-locales test on these directories
-# ("network","dom","toolkit","security/manager");
-@CompareLocaleDirs = (
-  "netwerk",
-  "calendar",
-  "dom",
-  "toolkit",
-  "security/manager",
-  "other-licenses/branding/sunbird",
-);

 #$TestsPhoneHome           = 0;  # Should test report back to server?

@@ -124,15 +118,15 @@ $VendorName               = 'Mozilla';
 #$MozProfileName = 'default';

 #- Set these to what makes sense for your system
-#$Make          = 'gmake';       # Must be GNU make
+$Make          = 'make';       # 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;
+$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
@@ -142,7 +136,8 @@ $VendorName               = 'Mozilla';
 # :pserver:$ENV{USER}%netscape.com@cvs.mozilla.org:/cvsroot

 #$moz_cvsroot   = $ENV{CVSROOT};
-$moz_cvsroot   = ":ext:calbld\@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';
@@ -151,32 +146,15 @@ $moz_cvsroot   = ":ext:calbld\@cvs.mozilla.org:/cvsroot";
 #$moz_client_mk = 'client.mk';

 #- Set if you want to build in a separate object tree
-#$ObjDir = '';
+$ObjDir = 'obj-xulrunner';

 # Extra build name, if needed.
-$BuildNameExtra = 'Sb-Trunk-l10n';
+$BuildNameExtra = 'Release';

 # User comment, eg. ip address for dhcp builds.
 # ex: $UserComment = "ip = 208.12.36.108";
 #$UserComment = 0;

-# Configure only, don't build.
-$ConfigureOnly = 1;
-
-$LocalizationVersionFile = 'calendar/sunbird/config/version.txt';
-
-# %WGetFiles = (
-#	      "http://stage.mozilla.org/pub/mozilla.org/calendar/sunbird/releases/0.3.1rc2/linux-i686/en-US/sunbird-%version%.en-US.linux-i686.tar.bz2" =>
-#	      "/builds/tinderbox/Sb-Trunk-l10n/Linux_2.6.9-42.ELsmp_Clobber/sunbird.tar.bz2"
-#	      );
-
-%WGetFiles = (
-	      "http://stage.mozilla.org/pub/mozilla.org/calendar/sunbird/nightly/latest-trunk/sunbird-%version%.en-US.linux-i686.tar.bz2" =>
-	      "/builds/tinderbox/Sb-Trunk-l10n/Linux_2.6.9-42.ELsmp_Clobber/sunbird.tar.bz2"
-	      );
-
-$BuildLocalesArgs = "ZIP_IN=/builds/tinderbox/Sb-Trunk-l10n/Linux_2.6.9-42.ELsmp_Clobber/sunbird.tar.bz2";
-
 #-
 #- The rest should not need to be changed
 #-
@@ -186,14 +164,16 @@ $BuildLocalesArgs = "ZIP_IN=/builds/tinderbox/Sb-Trunk-l10n/Linux_2.6.9-42.ELsmp

 #- Until you get the script working. When it works,
 #- change to the tree you're actually building
-$BuildTree  = 'Mozilla-l10n';
+# CONFIG: $BuildTree  = '%buildTree%';
+$BuildTree  = 'MozillaRelease';

 #$BuildName = '';
-#$BuildTag = 'SUNBIRD_0_3_1_RELEASE';
+# CONFIG: $BuildTag = '%productTag%_RELEASE';
+$BuildTag = 'FIREFOX_3_0_17_RELEASE';
 #$BuildConfigDir = 'mozilla/config';
 #$Topsrcdir = 'mozilla';

-$BinaryName = 'sunbird-bin';
+$BinaryName = 'xulrunner.exe';

 #
 # For embedding app, use:
@@ -210,35 +190,40 @@ $BinaryName = 'sunbird-bin';

 # Release build options
 $ReleaseBuild  = 1;
-$ReleaseGroup = 'calendar';
-$LocaleProduct = "calendar";
 $shiptalkback  = 0;
-$ReleaseToLatest = 1; # Push the release to latest-<milestone>?
-$ReleaseToDated = 0; # Push the release to YYYY-MM-DD-HH-<milestone>?
-$build_hour    = "9";
-$package_creation_path = "/calendar/installer";
+#$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";
-$ssh_user      = "calbld";
-$ssh_server    = "stage.mozilla.org";
-$ftp_path      = "/home/ftp/pub/calendar/sunbird/nightly";
-$url_path      = "http://ftp.mozilla.org/pub/mozilla.org/calendar/sunbird/nightly";
-$tbox_ftp_path = "/home/ftp/pub/calendar/sunbird/tinderbox-builds";
-$tbox_url_path = "http://ftp.mozilla.org/pub/mozilla.org/calendar/sunbird/tinderbox-builds";
-$milestone     = "trunk-l10n";
+# 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;
-#$update_package = 1;
-#$update_product = "Sunbird";
-#$update_version = "trunk";
-#$update_platform = "Linux_x86-gcc3";
-#$update_hash = "md5";
-#$update_filehost = "ftp.mozilla.org";
-#$update_ver_file = 'calendar/sunbird/config/version.txt';
-#$update_pushinfo = 1;
+$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'} = '/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
				`@@ -0,0 +1 @@`
				`2008-07-18 11:20 UTC - Clobber build to generate new nightlies as they were broken due to bug 445708`
				`@@ -0,0 +1 @@`
				`CLOBBERing to disable zipwriter from bug 379633`
				`@@ -0,0 +1 @@`
				`Preemptive clobber for /README.txt merge conflict.`