b=457747

- clobbering to pick up ftp_/url_path change git-svn-id: svn://10.0.0.236/branches/l10n@254471 18797224-902f-48f8-a5cc-f745e15eee43
b=4577747
2008-09-30 01:32:46 +00:00 · 2008-09-30 01:08:07 +00:00 · 2008-07-18 11:23:39 +00:00 · 2008-07-17 11:45:03 +00:00 · 2008-07-02 12:14:45 +00:00 · 2008-06-23 16:01:29 +00:00
30 changed files with 439 additions and 428 deletions
--- a/mozilla/tools/tinderbox-configs/firefox/linux/CLOBBER
+++ b/mozilla/tools/tinderbox-configs/firefox/linux/CLOBBER
@@ -1 +1 @@
-Clobbering to kick lcms
+bug 457747
--- a/mozilla/tools/tinderbox-configs/firefox/linux/mozconfig
+++ b/mozilla/tools/tinderbox-configs/firefox/linux/mozconfig
@@ -8,17 +8,14 @@ mk_add_options MOZ_CO_MODULE="mozilla/tools/update-packaging"
 ac_add_options --enable-application=browser 

 mk_add_options MOZ_CO_LOCALES=all
-# 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
+mk_add_options LOCALES_CVSROOT=:ext:ffxbld@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
+ac_add_options --with-branding=browser/branding/unofficial

 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
@@ -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.
@@ -144,8 +144,7 @@ $pageload_server      = "pageload.build.mozilla.org";
 # :pserver:$ENV{USER}%netscape.com@cvs.mozilla.org:/cvsroot

 #$moz_cvsroot   = $ENV{CVSROOT};
-# CONFIG: $moz_cvsroot   = '%mozillaCvsroot%';
-$moz_cvsroot   = 'cltbld@cvs.mozilla.org:/cvsroot';
+$moz_cvsroot   = ":ext:ffxbld\@cvs.mozilla.org:/cvsroot";

 #- Set these proper values for your tinderbox server
 #$Tinderbox_server = 'tinderbox-daemon@tinderbox.mozilla.org';
@@ -157,7 +156,7 @@ $moz_cvsroot   = 'cltbld@cvs.mozilla.org:/cvsroot';
 #$ObjDir = '';

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

 # User comment, eg. ip address for dhcp builds.
 # ex: $UserComment = "ip = 208.12.36.108";
@@ -168,14 +167,11 @@ $ConfigureOnly = 1;             # Configure only, don't build.
 $LocaleProduct = "browser";
 $LocalizationVersionFile = 'browser/config/version.txt';
 %WGetFiles = (
-# 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"
+	      "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla1.9.0/firefox-%version%.en-US.linux-i686.tar.bz2" =>
+	      "/builds/tinderbox/Fx-Trunk-l10n/Linux_2.6.18-53.1.19.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";
+$BuildLocalesArgs = "ZIP_IN=/builds/tinderbox/Fx-Trunk-l10n/Linux_2.6.18-53.1.19.el5_Depend/firefox.tar.bz2";
 #@CompareLocaleDirs        = (); # Run compare-locales test on these directories
@CompareLocaleDirs = (
  "netwerk",
@@ -196,12 +192,10 @@ $BuildLocalesArgs = "ZIP_IN=/builds/tinderbox/Fx-Mozilla1.9-l10n-Release/Linux_2

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

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

@@ -223,31 +217,28 @@ $BinaryName = 'firefox-bin';
 # Release build options
 $ReleaseBuild  = 1;
 $shiptalkback  = 0;
-$ReleaseToLatest = 0; # Push the release to latest-<milestone>?
-$ReleaseToDated = 1; # Push the release to YYYY-MM-DD-HH-<milestone>?
+$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 = "/browser/installer";
 # needs setting for mac + talkback: $mac_bundle_path = "/browser/app";
 $ssh_version   = "2";
-# CONFIG: $ssh_user      = "%sshUser%";
-$ssh_user      = "cltbld";
-#$ssh_key       = "'$ENV{HOME}/.ssh/cltbld_dsa'";
-# CONFIG: $ssh_server    = "%sshServer%";
+$ssh_user      = "ffxbld";
+$ssh_key       = "'$ENV{HOME}/.ssh/ffxbld_dsa'";
 $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";
+$ftp_path      = "/home/ftp/pub/firefox/nightly/old-l10n";
+$url_path      = "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/old-l10n";
 $tbox_ftp_path = "/home/ftp/pub/firefox/tinderbox-builds";
 $tbox_url_path = "http://ftp.mozilla.org/pub/mozilla.org/firefox/tinderbox-builds";
-# CONFIG: $milestone     = "firefox%version%-l10n";
-$milestone     = "firefox3.0.19-l10n";
+$milestone     = "mozilla1.9.0-l10n";
 $notify_list   = 'build-announce@mozilla.org';
 $stub_installer = 0;
 $sea_installer = 1;
 $archive       = 1;
 $push_raw_xpis = 0;
 $update_pushinfo = 0;
-$update_package = 1;
+$update_package = 0;
 $update_product = "Firefox";
 $update_version = "trunk";
 $update_platform = "Linux_x86-gcc3";
--- a/mozilla/tools/tinderbox-configs/firefox/macosx/CLOBBER
+++ b/mozilla/tools/tinderbox-configs/firefox/macosx/CLOBBER
@@ -0,0 +1 @@
+bug 457747
--- a/mozilla/tools/tinderbox-configs/firefox/macosx/mozconfig
+++ b/mozilla/tools/tinderbox-configs/firefox/macosx/mozconfig
@@ -9,10 +9,7 @@ mk_add_options MOZ_CO_MODULE="mozilla/tools/update-packaging"
 mk_add_options MOZ_CO_PROJECT=browser

 mk_add_options MOZ_CO_LOCALES=all
-# 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
+mk_add_options LOCALES_CVSROOT=:ext:ffxbld@cvs.mozilla.org:/l10n

 ac_add_options --enable-application=browser
 ac_add_options --enable-optimize="-O2 -g"
@@ -20,6 +17,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 --with-branding=browser/branding/unofficial
 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
-# CONFIG: $moz_cvsroot   = '%mozillaCvsroot%';
-$moz_cvsroot   = 'cltbld@cvs.mozilla.org:/cvsroot';
+
+$moz_cvsroot   = ":ext:ffxbld\@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   = 'cltbld@cvs.mozilla.org:/cvsroot';
 #$ObjDir = '';

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

 # User comment, eg. ip address for dhcp builds.
 # ex: $UserComment = "ip = 208.12.36.108";
@@ -166,14 +166,11 @@ $ConfigureOnly = 1;             # Configure only, don't build.
 $LocaleProduct = "browser";
 $LocalizationVersionFile = 'browser/config/version.txt';
 %WGetFiles = (
-# 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"
+	      "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla1.9.0/firefox-%version%.en-US.mac.dmg" =>
+	      "/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";
+$BuildLocalesArgs = "ZIP_IN=/builds/tinderbox/Fx-Trunk-l10n/Darwin_8.8.4_Depend/firefox.dmg";
 #@CompareLocaleDirs        = (); # Run compare-locales test on these directories
@CompareLocaleDirs = (
  "netwerk",
@@ -194,12 +191,10 @@ $BuildLocalesArgs = "ZIP_IN=/builds/tinderbox/Fx-Mozilla1.9-l10n-Release/Darwin_

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

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

@@ -221,30 +216,27 @@ $BinaryName = 'firefox-bin';
 # Release build options
 $ReleaseBuild  = 1;
 $shiptalkback  = 0;
-$ReleaseToLatest = 0; # Push the release to latest-<milestone>?
-$ReleaseToDated = 1; # Push the release to YYYY-MM-DD-HH-<milestone>?
+$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 = "/browser/installer";
 # needs setting for mac + talkback: $mac_bundle_path = "/browser/app";
 $mac_bundle_path = "/browser/app";
-# CONFIG: $ssh_user      = "%sshUser%";
-$ssh_user      = "cltbld";
-#$ssh_key       = "'$ENV{HOME}/.ssh/cltbld_dsa'";
-# CONFIG: $ssh_server    = "%sshServer%";
+$ssh_user      = "ffxbld";
+$ssh_key       = "'$ENV{HOME}/.ssh/ffxbld_dsa'";
 $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";
+$ftp_path      = "/home/ftp/pub/firefox/nightly/old-l10n";
+$url_path      = "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/old-l10n";
 $tbox_ftp_path = "/home/ftp/pub/firefox/tinderbox-builds";
 $tbox_url_path = "http://ftp.mozilla.org/pub/mozilla.org/firefox/tinderbox-builds";
-# CONFIG: $milestone     = "firefox%version%-l10n";
-$milestone     = "firefox3.0.19-l10n";
+$milestone     = "mozilla1.9.0-l10n";
 $notify_list   = "build-announce\@mozilla.org";
 $stub_installer = 0;
 $sea_installer = 0;
 $archive       = 1;
 $push_raw_xpis = 0;
-$update_package = 1;
+$update_package = 0;
 $update_product = "Firefox";
 $update_version = "trunk";
 $update_platform = "Darwin_Universal-gcc3";
--- a/mozilla/tools/tinderbox-configs/firefox/win32/CLOBBER
+++ b/mozilla/tools/tinderbox-configs/firefox/win32/CLOBBER
@@ -0,0 +1 @@
+bug 457747
--- a/mozilla/tools/tinderbox-configs/firefox/win32/mozconfig
+++ b/mozilla/tools/tinderbox-configs/firefox/win32/mozconfig
@@ -7,14 +7,12 @@ mk_add_options MOZ_CO_PROJECT=browser
 mk_add_options MOZ_CO_MODULE="mozilla/tools/update-packaging"

 mk_add_options MOZ_CO_LOCALES=all
-# 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
+mk_add_options LOCALES_CVSROOT=:ext:ffxbld@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
+ac_add_options --with-branding=browser/branding/unofficial
+
--- a/mozilla/tools/tinderbox-configs/firefox/win32/tinder-config.pl
+++ b/mozilla/tools/tinderbox-configs/firefox/win32/tinder-config.pl
@@ -138,8 +138,7 @@ $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

-# CONFIG: $moz_cvsroot   = '%mozillaCvsroot%';
-$moz_cvsroot   = 'cltbld@cvs.mozilla.org:/cvsroot';
+$moz_cvsroot   = ":ext:ffxbld\@cvs.mozilla.org:/cvsroot";

 #- Set these proper values for your tinderbox server
 #$Tinderbox_server = 'tinderbox-daemon@tinderbox.mozilla.org';
@@ -151,7 +150,7 @@ $moz_cvsroot   = 'cltbld@cvs.mozilla.org:/cvsroot';
 #$ObjDir = '';

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

 # User comment, eg. ip address for dhcp builds.
 # ex: $UserComment = "ip = 208.12.36.108";
@@ -162,18 +161,13 @@ $ConfigureOnly = 1;             # Configure only, don't build.
 $LocaleProduct = "browser";
 $LocalizationVersionFile = 'browser/config/version.txt';
 %WGetFiles = (
-# 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"
+	      "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla1.9.0/firefox-%version%.en-US.win32.installer.exe" =>
+	      "/e/builds/tinderbox/Fx-Trunk-l10n/WINNT_5.2_Depend/firefox-installer.exe",
+	      "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla1.9.0/firefox-%version%.en-US.win32.zip" =>
+	      "/e/builds/tinderbox/Fx-Trunk-l10n/WINNT_5.2_Depend/firefox.zip"
 	      );

-# 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";
+$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";
@CompareLocaleDirs = (
  "netwerk",
  "dom",
@@ -193,12 +187,10 @@ $BuildLocalesArgs = "ZIP_IN=/e/fx19l10nrel/WINNT_5.2_Depend/firefox.zip WIN32_IN

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

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

@@ -220,30 +212,27 @@ $BinaryName = 'firefox.exe';
 # Release build options
 $ReleaseBuild  = 1;
 $shiptalkback  = 0;
-$ReleaseToLatest = 0; # Push the release to latest-<milestone>?
-$ReleaseToDated = 1; # Push the release to YYYY-MM-DD-HH-<milestone>?
+$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 = "/browser/installer";
 # needs setting for mac + talkback: $mac_bundle_path = "/browser/app";
 $ssh_version   = "2";
-# CONFIG: $ssh_user      = "%sshUser%";
-$ssh_user      = "cltbld";
-#$ssh_key       = "'$ENV{HOME}/.ssh/cltbld_dsa'";
-# CONFIG: $ssh_server    = "%sshServer%";
+$ssh_user      = "ffxbld";
+$ssh_key       = "'$ENV{HOME}/.ssh/ffxbld_dsa'";
 $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";
+$ftp_path      = "/home/ftp/pub/firefox/nightly/old-l10n";
+$url_path      = "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/old-l10n";
 $tbox_ftp_path = "/home/ftp/pub/firefox/tinderbox-builds";
 $tbox_url_path = "http://ftp.mozilla.org/pub/mozilla.org/firefox/tinderbox-builds";
-# CONFIG: $milestone     = 'firefox%version%-l10n';
-$milestone     = 'firefox3.0.19-l10n';
+$milestone     = "mozilla1.9.0-l10n";
 $notify_list   = 'build-announce@mozilla.org';
 $stub_installer = 0;
 $sea_installer = 1;
 $archive       = 1;
 $push_raw_xpis = 0;
-$update_package = 1;
+$update_package = 0;
 $update_product = "Firefox";
 $update_version = "trunk";
 $update_platform = "WINNT_x86-msvc";
--- a/mozilla/tools/tinderbox-configs/sunbird/linux/CLOBBER
+++ b/mozilla/tools/tinderbox-configs/sunbird/linux/CLOBBER
@@ -0,0 +1,7 @@
+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
@@ -0,0 +1,23 @@
+#
+## 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/xulrunner/win32/tinder-config.pl
+++ b/mozilla/tools/tinderbox-configs/xulrunner/win32/tinder-config.pl
@@ -1,16 +1,13 @@
 #
-# 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
+## 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
 #

 #- 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}
 #-----------------------------------------------------------------------------
@@ -31,15 +28,14 @@ $ENV{MOZ_CRASHREPORTER_NO_REPORT} = '1';

 #- PLEASE FILL THIS IN WITH YOUR PROPER EMAIL ADDRESS
 #$BuildAdministrator = "$ENV{USER}\@$ENV{HOST}";
-#$BuildAdministrator = ($ENV{USER} || "cltbld") . "\@" . ($ENV{HOST} || "dhcp");
-$BuildAdministrator = 'build@mozilla.org';
+#$BuildAdministrator = ($ENV{USER} || "calbld") . "\@" . ($ENV{HOST} || "dhcp");

 #- You'll need to change these to suit your machine's needs
 #$DisplayServer = ':0.0';

 #- Default values of command-line opts
 #-
-#$BuildDepend       = 1;      # Depend or Clobber
+$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.
@@ -47,16 +43,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       = 0;      # Use to debug post-mozilla.pl scripts.
-#$BuildLocales      = 0;      # Do l10n packaging?
+#$SkipMozilla       = 1;      # Use to debug post-mozilla.pl scripts.
+$BuildLocales      = 1;      # Do l10n packaging?

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

-$RunMozillaTests          = 0;  # Allow turning off of all tests if needed.
+#$RunMozillaTests          = 1;  # Allow turning off of all tests if needed.
 #$RegxpcomTest             = 1;
 #$AliveTest                = 1;
 #$JavaTest                 = 0;
@@ -74,6 +70,16 @@ $RunMozillaTests          = 0;  # Allow turning off of all tests if needed.
 #$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?

@@ -118,15 +124,15 @@ $RunMozillaTests          = 0;  # Allow turning off of all tests if needed.
 #$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           = '/d/mozilla-build/blat261/full/blat';
-$use_blat       = 1;
+#$blat           = 'c:/nstools/bin/blat';
+#$use_blat       = 0;

 # Set moz_cvsroot to something like:
 # :pserver:$ENV{USER}%netscape.com\@cvs.mozilla.org:/cvsroot
@@ -136,8 +142,7 @@ $use_blat       = 1;
 # :pserver:$ENV{USER}%netscape.com@cvs.mozilla.org:/cvsroot

 #$moz_cvsroot   = $ENV{CVSROOT};
-# CONFIG: $moz_cvsroot = '%mozillaCvsroot%';
-$moz_cvsroot = 'cltbld@cvs.mozilla.org:/cvsroot';
+$moz_cvsroot   = ":ext:calbld\@cvs.mozilla.org:/cvsroot";

 #- Set these proper values for your tinderbox server
 #$Tinderbox_server = 'tinderbox-daemon@tinderbox.mozilla.org';
@@ -146,15 +151,32 @@ $moz_cvsroot = 'cltbld@cvs.mozilla.org:/cvsroot';
 #$moz_client_mk = 'client.mk';

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

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

 # 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://ftp.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://ftp.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
 #-
@@ -164,16 +186,14 @@ $BuildNameExtra = 'Release';

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

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

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

 #
 # For embedding app, use:
@@ -190,40 +210,35 @@ $BinaryName = 'xulrunner.exe';

 # Release build options
 $ReleaseBuild  = 1;
+$ReleaseGroup = 'calendar';
+$LocaleProduct = "calendar";
 $shiptalkback  = 0;
-#$ReleaseToLatest = 0; # Push the release to latest-<milestone>?
-#$ReleaseToDated = 1; # Push the release to YYYY-MM-DD-HH-<milestone>?
-#$build_hour    = "8";
-$package_creation_path = "/xulrunner/installer";
+$ReleaseToLatest = 1; # Push the release to latest-<milestone>?
+$ReleaseToDated = 0; # Push the release to YYYY-MM-DD-HH-<milestone>?
+$build_hour    = "23";
+$package_creation_path = "/calendar/installer";
 # needs setting for mac + talkback: $mac_bundle_path = "/browser/app";
 $ssh_version   = "2";
-# CONFIG: $ssh_user      = "%sshUser%";
-$ssh_user      = "cltbld";
-#$ssh_key       = "'$ENV{HOME}/.ssh/xrbld_dsa'";
-# CONFIG: $ssh_server    = "%sshServer%";
+$ssh_user      = "calbld";
 $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';
+$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';
 $stub_installer = 0;
 $sea_installer = 0;
 $archive       = 1;
 $push_raw_xpis = 0;
-$crashreporter_buildsymbols = 0;
-$crashreporter_pushsymbols = 0;
-# CONFIG: $ENV{'SYMBOL_SERVER_HOST'}    = '%symbolServer%';
-$ENV{'SYMBOL_SERVER_HOST'}    = 'stage-old.mozilla.org';
-# CONFIG: $ENV{'SYMBOL_SERVER_USER'}    = '%symbolServerUser%';
-$ENV{'SYMBOL_SERVER_USER'}    = 'xrbld';
-# CONFIG: $ENV{'SYMBOL_SERVER_PATH'}    = '%symbolServerPath%';
-$ENV{'SYMBOL_SERVER_PATH'}    = '/mnt/netapp/breakpad/symbols_xr';
-# CONFIG: $ENV{'SYMBOL_SERVER_SSH_KEY'} = '%symbolServerKey%';
-$ENV{'SYMBOL_SERVER_SSH_KEY'} = '/c/Documents and Settings/cltbld/.ssh/xrbld_dsa';
+#$update_package = 1;
+#$update_product = "Sunbird";
+#$update_version = "trunk";
+#$update_platform = "Linux_x86-gcc3";
+#$update_hash = "sha1";
+#$update_filehost = "ftp.mozilla.org";
+#$update_ver_file = 'calendar/sunbird/config/version.txt';
+#$update_pushinfo = 1;

 # 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/sunbird/macosx/CLOBBER
+++ b/mozilla/tools/tinderbox-configs/sunbird/macosx/CLOBBER
@@ -0,0 +1,7 @@
+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
@@ -0,0 +1,22 @@
+#
+## 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/xulrunner/linux/tinder-config.pl
+++ b/mozilla/tools/tinderbox-configs/xulrunner/linux/tinder-config.pl
@@ -1,13 +1,13 @@
 #
-## 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
+## hostname: cb-xserve03
+## uname: Darwin cb-xserve03 8.7.0 Darwin Kernel Version 8.7.0: Fri May 26 15:20:53 PDT 2006; root:xnu-792.6.76.obj~1/RELEASE_PPC Power Macintosh powerpc
 #

 #- tinder-config.pl - Tinderbox configuration file.
 #-    Uncomment the variables you need to set.
 #-    The default values are the same as the commented variables.

-$ENV{MOZ_CRASHREPORTER_NO_REPORT} = '1';
+$ENV{CVS_RSH} = "ssh";

 # $ENV{MOZ_PACKAGE_MSI}
 #-----------------------------------------------------------------------------
@@ -27,48 +27,43 @@ $ENV{MOZ_CRASHREPORTER_NO_REPORT} = '1';
 #$ENV{MOZ_SYMBOLS_TRANSFER_TYPE} = "scp";

 #- PLEASE FILL THIS IN WITH YOUR PROPER EMAIL ADDRESS
+$BuildAdministrator = 'build@mozilla.org';
 #$BuildAdministrator = "$ENV{USER}\@$ENV{HOST}";
-#$BuildAdministrator = ($ENV{USER} || "cltbld") . "\@" . ($ENV{HOST} || "dhcp");
-$BuildAdministrator = "build\@mozilla.org";
+#$BuildAdministrator = ($ENV{USER} || "calbld") . "\@" . ($ENV{HOST} || "dhcp");

 #- You'll need to change these to suit your machine's needs
 #$DisplayServer = ':0.0';

 #- Default values of command-line opts
 #-
-#$BuildDepend       = 1;      # Depend or Clobber
+$BuildDepend       = 0;      # Depend or Clobber
 #$BuildDebug        = 0;      # Debug or Opt (Darwin)
 #$ReportStatus      = 1;      # Send results to server, or not
 #$ReportFinalStatus = 1;      # Finer control over $ReportStatus.
 $UseTimeStamp      = 0;      # Use the CVS 'pull-by-timestamp' option, or not
 #$BuildOnce         = 0;      # Build once, don't send results to server
-#$ConfigureOnly     = 0;      # Configure, but do not build.
 #$TestOnly          = 0;      # Only run tests, don't pull/build
 #$BuildEmbed        = 0;      # After building seamonkey, go build embed app.
-#$SkipMozilla       = 0;      # Use to debug post-mozilla.pl scripts.
-#$BuildLocales      = 0;      # Do l10n packaging?
-
-# 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
+#$SkipMozilla       = 1;      # Use to debug post-mozilla.pl scripts.
+$BuildLocales      = 1;      # Do l10n packaging?

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

-$RunMozillaTests          = 0;  # 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                = 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
@@ -76,13 +71,18 @@ $RunMozillaTests          = 0;  # Allow turning off of all tests if needed.
 #$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
-# ("network","dom","toolkit","security/manager");
-#$CompareLocalesAviary     = 0;  # Should the compare-locales commands use the
-                                # aviary directory structure?
+@CompareLocaleDirs = (
+  "netwerk",
+  "calendar",
+  "dom",
+  "toolkit",
+  "security/manager",
+  "other-licenses/branding/sunbird",
+);

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

@@ -109,7 +109,7 @@ $RunMozillaTests          = 0;  # Allow turning off of all tests if needed.
 #$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 @@ $RunMozillaTests          = 0;  # Allow turning off of all tests if needed.
 #$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 @@ $RunMozillaTests          = 0;  # Allow turning off of all tests if needed.
 # :pserver:$ENV{USER}%netscape.com@cvs.mozilla.org:/cvsroot

 #$moz_cvsroot   = $ENV{CVSROOT};
-# CONFIG: $moz_cvsroot   = '%mozillaCvsroot%';
-$moz_cvsroot   = 'cltbld@cvs.mozilla.org:/cvsroot';
+#$moz_cvsroot   = ':ext:calbld@cvs.mozilla.org:/cvsroot';
+$moz_cvsroot   = ':ext:calbld@cvs.mozilla.org:/cvsroot';

 #- Set these proper values for your tinderbox server
 #$Tinderbox_server = 'tinderbox-daemon@tinderbox.mozilla.org';
@@ -155,15 +155,32 @@ $moz_cvsroot   = 'cltbld@cvs.mozilla.org:/cvsroot';
 #$moz_client_mk = 'client.mk';

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

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

 # 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://ftp.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://ftp.mozilla.org/pub/mozilla.org/calendar/sunbird/nightly/latest-trunk/sunbird-%version%.en-US.mac.dmg" =>
+	      "/builds/tinderbox/Sb-Trunk-l10n/Darwin_8.7.0_Clobber/sunbird.dmg"
+	      );
+
+$BuildLocalesArgs = "ZIP_IN=/builds/tinderbox/Sb-Trunk-l10n/Darwin_8.7.0_Clobber/sunbird.dmg";
+
 #-
 #- The rest should not need to be changed
 #-
@@ -173,16 +190,14 @@ $BuildNameExtra = 'Release';

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

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

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

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

 # Release build options
 $ReleaseBuild  = 1;
-#$LocaleProduct = "browser";
+$ReleaseGroup = 'calendar';
+$LocaleProduct = "calendar";
 $shiptalkback  = 0;
-$ReleaseToLatest = 0; # Push the release to latest-<milestone>?
-$ReleaseToDated = 1; # Push the release to YYYY-MM-DD-HH-<milestone>?
-#$build_hour    = "8";
-$package_creation_path = "/xulrunner/installer";
-# needs setting for mac + talkback: $mac_bundle_path = "/browser/app";
+$ReleaseToLatest = 1; # Push the release to latest-<milestone>?
+$ReleaseToDated = 0; # Push the release to YYYY-MM-DD-HH-<milestone>?
+$build_hour    = "23";
+$package_creation_path = "/calendar/installer";
+# needs setting for mac + talkback:
+$mac_bundle_path = "/calendar/sunbird/app";
 $ssh_version   = "2";
-# CONFIG: $ssh_user      = "%sshUser%";
-$ssh_user      = "cltbld";
-#$ssh_key       = "$ENV{HOME}/.ssh/xrbld_dsa";
-# CONFIG: $ssh_server    = "%sshServer%";
+$ssh_user      = "calbld";
 $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";
+$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';
 $stub_installer = 0;
 $sea_installer = 0;
 $archive       = 1;
 $push_raw_xpis = 0;
-$crashreporter_buildsymbols = 0;
-$crashreporter_pushsymbols = 0;
-# CONFIG: $ENV{'SYMBOL_SERVER_HOST'}    = '%symbolServer%';
-$ENV{'SYMBOL_SERVER_HOST'}    = 'stage-old.mozilla.org';
-# CONFIG: $ENV{'SYMBOL_SERVER_USER'}    = '%symbolServerUser%';
-$ENV{'SYMBOL_SERVER_USER'}    = 'xrbld';
-# CONFIG: $ENV{'SYMBOL_SERVER_PATH'}    = '%symbolServerPath%';
-$ENV{'SYMBOL_SERVER_PATH'}    = '/mnt/netapp/breakpad/symbols_xr';
-# CONFIG: $ENV{'SYMBOL_SERVER_SSH_KEY'} = '%symbolServerKey%';
-$ENV{'SYMBOL_SERVER_SSH_KEY'} = '/home/cltbld/.ssh/xrbld_dsa';
+#$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;

 # 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.
@@ -257,5 +267,5 @@ $ENV{'SYMBOL_SERVER_SSH_KEY'} = '/home/cltbld/.ssh/xrbld_dsa';
 #$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/sunbird/win32/CLOBBER
+++ b/mozilla/tools/tinderbox-configs/sunbird/win32/CLOBBER
@@ -0,0 +1,8 @@
+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
@@ -0,0 +1,27 @@
+#
+## 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/xulrunner/macosx/tinder-config.pl
+++ b/mozilla/tools/tinderbox-configs/xulrunner/macosx/tinder-config.pl
@@ -1,18 +1,24 @@
 #
-## 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
+## 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
 #

 #- tinder-config.pl - Tinderbox configuration file.
 #-    Uncomment the variables you need to set.
 #-    The default values are the same as the commented variables.

-$MacUniversalBinary = 1;
+# $ENV{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';

-$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_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{MOZ_PACKAGE_MSI}
 #-----------------------------------------------------------------------------
@@ -33,40 +39,31 @@ $ENV{MOZ_CRASHREPORTER_NO_REPORT} = '1';

 #- PLEASE FILL THIS IN WITH YOUR PROPER EMAIL ADDRESS
 #$BuildAdministrator = "$ENV{USER}\@$ENV{HOST}";
-#$BuildAdministrator = ($ENV{USER} || "cltbld") . "\@" . ($ENV{HOST} || "dhcp");
-$BuildAdministrator = "build\@mozilla.org";
+#$BuildAdministrator = ($ENV{USER} || "calbld") . "\@" . ($ENV{HOST} || "dhcp");

 #- You'll need to change these to suit your machine's needs
 #$DisplayServer = ':0.0';

 #- Default values of command-line opts
 #-
-#$BuildDepend       = 1;      # Depend or Clobber
+$BuildDepend       = 0;      # Depend or Clobber
 #$BuildDebug        = 0;      # Debug or Opt (Darwin)
 #$ReportStatus      = 1;      # Send results to server, or not
 #$ReportFinalStatus = 1;      # Finer control over $ReportStatus.
 $UseTimeStamp      = 0;      # Use the CVS 'pull-by-timestamp' option, or not
 #$BuildOnce         = 0;      # Build once, don't send results to server
-#$ConfigureOnly     = 0;      # Configure, but do not build.
-#$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?
-
-# 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
+#$SkipMozilla       = 1;      # Use to debug post-mozilla.pl scripts.
+$BuildLocales      = 1;      # Do l10n packaging?

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

-$RunMozillaTests          = 0;  # Allow turning off of all tests if needed.
+#$RunMozillaTests          = 1;  # Allow turning off of all tests if needed.
 #$RegxpcomTest             = 1;
 #$AliveTest                = 1;
 #$JavaTest                 = 0;
@@ -86,10 +83,18 @@ $RunMozillaTests          = 0;  # Allow turning off of all tests if needed.
 #$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           = 0;  # Should test report back to server?
+$TestsPhoneHome           = 1;  # Should test report back to server?

 # $results_server
 #----------------------------------------------------------------------------
@@ -132,14 +137,14 @@ $RunMozillaTests          = 0;  # Allow turning off of all tests if needed.
 #$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';
+$blat           = 'blat';
 #$use_blat       = 0;

 # Set moz_cvsroot to something like:
@@ -149,9 +154,8 @@ $RunMozillaTests          = 0;  # Allow turning off of all tests if needed.
 # Note that win32 may not need \@, depends on ' or ".
 # :pserver:$ENV{USER}%netscape.com@cvs.mozilla.org:/cvsroot

-# sharing bm-xserve09 with T'bird build, do all CVS pulls with that key
-# CONFIG: $moz_cvsroot   = '%mozillaCvsroot%';
-$moz_cvsroot   = 'cltbld@cvs.mozilla.org:/cvsroot';
+#$moz_cvsroot   = $ENV{CVSROOT};
+$moz_cvsroot   = ":ext:calbld\@cvs.mozilla.org:/cvsroot";

 #- Set these proper values for your tinderbox server
 #$Tinderbox_server = 'tinderbox-daemon@tinderbox.mozilla.org';
@@ -160,15 +164,35 @@ $moz_cvsroot   = 'cltbld@cvs.mozilla.org:/cvsroot';
 #$moz_client_mk = 'client.mk';

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

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

 # 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://ftp.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://ftp.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://ftp.mozilla.org/pub/mozilla.org/calendar/sunbird/nightly/latest-trunk/sunbird-%version%.en-US.win32.zip" =>
+	      "e:/builds/tinderbox/Sunbird-Trunk-l10n/WINNT_5.2_Clobber/sunbird.zip",
+	      "http://ftp.mozilla.org/pub/mozilla.org/calendar/sunbird/nightly/latest-trunk/sunbird-%version%.en-US.win32.installer.exe" =>
+	      "e:/builds/tinderbox/Sunbird-Trunk-l10n/WINNT_5.2_Clobber/sunbird-installer.exe"
+	      );
+
+$BuildLocalesArgs = "ZIP_IN=e:/builds/tinderbox/Sunbird-Trunk-l10n/WINNT_5.2_Clobber/sunbird.zip WIN32_INSTALLER_IN=e:/builds/tinderbox/Sunbird-Trunk-l10n/WINNT_5.2_Clobber/sunbird-installer.exe";
 #-
 #- The rest should not need to be changed
 #-
@@ -178,16 +202,14 @@ $BuildNameExtra = 'Release';

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

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

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

 #
 # For embedding app, use:
@@ -204,42 +226,35 @@ $BinaryName = 'xulrunner-bin';

 # Release build options
 $ReleaseBuild  = 1;
-#$LocaleProduct = "browser";
+$ReleaseGroup = 'calendar';
+$LocaleProduct = "calendar";
 $shiptalkback  = 0;
-#$ReleaseToLatest = 0; # Push the release to latest-<milestone>?
-#$ReleaseToDated = 1; # Push the release to YYYY-MM-DD-HH-<milestone>?
-#$build_hour    = "8";
-$package_creation_path = "/xulrunner/installer";
+$ReleaseToLatest = 1; # Push the release to latest-<milestone>?
+$ReleaseToDated = 0; # Push the release to YYYY-MM-DD-HH-<milestone>?
+$build_hour    = "23";
+$package_creation_path = "/calendar/installer";
 # needs setting for mac + talkback: $mac_bundle_path = "/browser/app";
-$mac_bundle_path = "/browser/app";
 $ssh_version   = "2";
-# CONFIG: $ssh_user      = "%sshUser%";
-$ssh_user      = "cltbld";
-#$ssh_key       = "$ENV{HOME}/.ssh/xrbld_dsa";
-# CONFIG: $ssh_server    = "%sshServer%";
+$ssh_user      = "calbld";
 $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";
+$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';
 $stub_installer = 0;
-$sea_installer = 0;
+$sea_installer = 1;
 $archive       = 1;
 $push_raw_xpis = 0;
-$crashreporter_buildsymbols = 0;
-$crashreporter_pushsymbols = 0;
-# CONFIG: $ENV{'SYMBOL_SERVER_HOST'}    = '%symbolServer%';
-$ENV{'SYMBOL_SERVER_HOST'}    = 'stage-old.mozilla.org';
-# CONFIG: $ENV{'SYMBOL_SERVER_USER'}    = '%symbolServerUser%';
-$ENV{'SYMBOL_SERVER_USER'}    = 'xrbld';
-# CONFIG: $ENV{'SYMBOL_SERVER_PATH'}    = '%symbolServerPath%';
-$ENV{'SYMBOL_SERVER_PATH'}    = '/mnt/netapp/breakpad/symbols_xr';
-# CONFIG: $ENV{'SYMBOL_SERVER_SSH_KEY'} = '%symbolServerKey%';
-$ENV{'SYMBOL_SERVER_SSH_KEY'} = '/Users/cltbld/.ssh/xrbld_dsa';
+#$update_package = 1;
+#$update_product = "Sunbird";
+#$update_version = "trunk";
+#$update_platform = "WINNT_x86-msvc";
+#$update_hash = "sha1";
+#$update_filehost = "ftp.mozilla.org";
+#$update_ver_file = 'calendar/sunbird/config/version.txt';
+#$update_pushinfo = 1;

 # 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/linux/mozconfig
+++ b/mozilla/tools/tinderbox-configs/thunderbird/linux/mozconfig
@@ -7,11 +7,9 @@ export MOZILLA_OFFICIAL=1
 
 mk_add_options MOZ_CO_PROJECT=mail
 mk_add_options MOZ_CO_LOCALES=all
-# 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"
+# 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"
 mk_add_options MOZ_CO_MODULE="mozilla/tools/update-packaging"

 ac_add_options --enable-update-packaging
--- a/mozilla/tools/tinderbox-configs/thunderbird/linux/tinder-config.pl
+++ b/mozilla/tools/tinderbox-configs/thunderbird/linux/tinder-config.pl
@@ -125,8 +125,7 @@ $ProductName              = "Thunderbird";
 # :pserver:$ENV{USER}%netscape.com@cvs.mozilla.org:/cvsroot

 #$moz_cvsroot   = $ENV{CVSROOT};
-# CONFIG: $moz_cvsroot   = '%mozillaCvsroot%';
-$moz_cvsroot   = 'cltbld@cvs.mozilla.org:/cvsroot';
+$moz_cvsroot   = ":ext:ffxbld\@cvs.mozilla.org:/cvsroot";

 #- Set these proper values for your tinderbox server
 #$Tinderbox_server = 'tinderbox-daemon@tinderbox.mozilla.org';
@@ -138,7 +137,7 @@ $moz_cvsroot   = 'cltbld@cvs.mozilla.org:/cvsroot';
 #$ObjDir = '';

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

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

 $LocalizationVersionFile = 'mail/config/version.txt';
 %WGetFiles = (
-# 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"
+	      "http://ftp.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-53.1.19.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";
+$BuildLocalesArgs = "ZIP_IN=/builds/tinderbox/Tb-Trunk-l10n/Linux_2.6.18-53.1.19.el5_Depend/thunderbird.tar.bz2";

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

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

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

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

 # 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/mozconfig
+++ b/mozilla/tools/tinderbox-configs/thunderbird/macosx/mozconfig
@@ -5,11 +5,8 @@

 mk_add_options MOZ_CO_PROJECT=mail
 mk_add_options MOZ_CO_LOCALES=all
-# 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"
+# on a tbox where ffxbld is the default ssh key
+mk_add_options LOCALES_CVSROOT=:ext:ffxbld@cvs.mozilla.org:/l10n

 ac_add_options --enable-application=mail
 ac_add_options --enable-optimize
@@ -17,4 +14,3 @@ ac_add_options --disable-debug
 ac_add_options --disable-tests
 ac_add_options --enable-static
 ac_add_options --disable-shared
-ac_add_options --enable-update-packaging
--- a/mozilla/tools/tinderbox-configs/thunderbird/macosx/tinder-config.pl
+++ b/mozilla/tools/tinderbox-configs/thunderbird/macosx/tinder-config.pl
@@ -33,7 +33,7 @@ $BuildLocales      = 1;
 # Tests
 $CleanProfile             = 1;
 #$ResetHomeDirForTests     = 1;
-$ProductName              = "Thunderbird";
+$ProductName              = "Shredder";
 #$VendorName               = 'Mozilla';

 #$RunMozillaTests          = 1;  # Allow turning off of all tests if needed.
@@ -119,8 +119,7 @@ $ProductName              = "Thunderbird";
 # Note that win32 may not need \@, depends on ' or ".
 # :pserver:$ENV{USER}%netscape.com@cvs.mozilla.org:/cvsroot

-# CONFIG: $moz_cvsroot   = '%mozillaCvsroot%';
-$moz_cvsroot   = 'cltbld@cvs.mozilla.org:/cvsroot';
+$moz_cvsroot   = ":ext:ffxbld\@cvs.mozilla.org:/cvsroot";

 #- Set these proper values for your tinderbox server
 #$Tinderbox_server = 'tinderbox-daemon@tinderbox.mozilla.org';
@@ -132,7 +131,7 @@ $moz_cvsroot   = 'cltbld@cvs.mozilla.org:/cvsroot';
 #$ObjDir = '';

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

 # User comment, eg. ip address for dhcp builds.
 # ex: $UserComment = "ip = 208.12.36.108";
@@ -142,14 +141,10 @@ $BuildNameExtra = 'Tb-Trunk-l10n-Release';
 $ConfigureOnly = 1;
 $LocalizationVersionFile = 'mail/config/version.txt';
 %WGetFiles = (
-# 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"
+	     "http://ftp.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: $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";
+$BuildLocalesArgs = "ZIP_IN=/builds/tinderbox/Tb-Trunk-l10n/Darwin_8.8.4_Depend/thunderbird.dmg";


 #-
@@ -161,12 +156,12 @@ $BuildLocalesArgs = "ZIP_IN=/builds/tinderbox/Tb-Mozilla1.9-l10n-Release/Darwin_

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

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

@@ -192,35 +187,26 @@ $BinaryName = 'thunderbird-bin';
 $ReleaseBuild  = 1;
 $LocaleProduct = "mail";
 $shiptalkback  = 0;
-$ReleaseToLatest = 0; # Push the release to latest-<milestone>?
-$ReleaseToDated = 1; # Push the release to YYYY-MM-DD-HH-<milestone>?
+$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 = "/mail/installer";
 # needs setting for mac + talkback: $mac_bundle_path = "/browser/app";
 $mac_bundle_path = "/mail/app";
-# CONFIG: $ssh_user      = "%sshUser%";
-$ssh_user      = "cltbld";
-# CONFIG: $ssh_server    = "%sshServer%";
+$ssh_user      = "tbirdbld";
+$ssh_key       = "'$ENV{HOME}/.ssh/tbirdbld_dsa'";
 $ssh_server    = "stage-old.mozilla.org";
+$ReleaseGroup  = "thunderbird";
 $ftp_path      = "/home/ftp/pub/thunderbird/nightly";
 $url_path      = "http://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly";
 $tbox_ftp_path = "/home/ftp/pub/thunderbird/tinderbox-builds";
 $tbox_url_path = "http://ftp.mozilla.org/pub/mozilla.org/thunderbird/tinderbox-builds";
-# CONFIG: $milestone     = 'thunderbird%version%-l10n';
-$milestone     = 'thunderbird3.0a2-l10n';
+$milestone     = "trunk-l10n";
 $notify_list   = "build-announce\@mozilla.org";
 $stub_installer = 0;
 $sea_installer = 0;
 $archive       = 1;
-$push_raw_xpis = 0;
-$update_package = 1;
-$update_product = "Thunderbird";
-$update_version = "trunk";
-$update_platform = "Darwin_Universal-gcc3";
-$update_hash = "sha1";
-$update_filehost = "ftp.mozilla.org";
-$update_ver_file = 'mail/config/version.txt';
-$update_pushinfo = 0;
+#$push_raw_xpis = 1;

 # 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/mozconfig
+++ b/mozilla/tools/tinderbox-configs/thunderbird/win32/mozconfig
@@ -5,10 +5,8 @@

 mk_add_options MOZ_CO_PROJECT=mail
 mk_add_options MOZ_CO_LOCALES=all
-# 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
+# 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_CO_MODULE="mozilla/tools/update-packaging"

 ac_add_options --enable-application=mail
--- 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
-# CONFIG: $moz_cvsroot = '%mozillaCvsroot%';
-$moz_cvsroot = 'cltbld@cvs.mozilla.org:/cvsroot';
+
+$moz_cvsroot   = ":ext:ffxbld\@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 = 'cltbld@cvs.mozilla.org:/cvsroot';
 #$ObjDir = '';

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

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

 # On windows
 $LocalizationVersionFile = 'mail/config/version.txt';
-%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"
-);
+%WGetFiles = ("http://ftp.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://ftp.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");

-# 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";
+$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";

 #-
 #- The rest should not need to be changed
@@ -163,12 +156,12 @@ $BuildLocalesArgs = "ZIP_IN=/e/tb19l10nrel/WINNT_5.2_Depend/thunderbird.zip WIN3

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

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

@@ -194,35 +187,34 @@ $BinaryName = 'thunderbird.exe';
 $ReleaseBuild  = 1;
 $LocaleProduct = "mail";
 $shiptalkback  = 0;
-$ReleaseToLatest = 0; # Push the release to latest-<milestone>?
-$ReleaseToDated = 1; # Push the release to YYYY-MM-DD-HH-<milestone>?
+$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 = "/mail/installer";
 # needs setting for mac + talkback: $mac_bundle_path = "/browser/app";
 $ssh_version   = "2";
-# CONFIG: $ssh_user      = "%sshUser%";
-$ssh_user      = "cltbld";
-# CONFIG: $ssh_server    = "%sshServer%";
+$ssh_user      = "tbirdbld";
+$ssh_key       = "'$ENV{HOME}/.ssh/tbirdbld_dsa'";
 $ssh_server    = "stage-old.mozilla.org";
+$ReleaseGroup  = "thunderbird";
 $ftp_path      = "/home/ftp/pub/thunderbird/nightly";
 $url_path      = "http://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly";
 $tbox_ftp_path = "/home/ftp/pub/thunderbird/tinderbox-builds";
 $tbox_url_path = "http://ftp.mozilla.org/pub/mozilla.org/thunderbird/tinderbox-builds";
-# CONFIG: $milestone     = 'thunderbird%version%-l10n';
-$milestone     = 'thunderbird3.0a2-l10n';
+$milestone     = "trunk-l10n";
 $notify_list   = "build-announce\@mozilla.org";
 $stub_installer = 0;
 $sea_installer = 1;
 $archive       = 1;
 $push_raw_xpis = 0;
-$update_package = 1;
+$update_package = 0;
 $update_product = "Thunderbird";
-$update_version = "trunk";
+$update_version = "1.5";
 $update_platform = "WINNT_x86-msvc";
 $update_hash = "sha1";
 $update_filehost = "ftp.mozilla.org";
-$update_ver_file = 'mail/config/version.txt';
-$update_pushinfo = 0;
+$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
--- a/mozilla/tools/tinderbox-configs/xulrunner/linux/CLOBBER
+++ b/mozilla/tools/tinderbox-configs/xulrunner/linux/CLOBBER
@@ -1 +0,0 @@
-Clobbering to fix up checkout issues
--- a/mozilla/tools/tinderbox-configs/xulrunner/linux/mozconfig
+++ b/mozilla/tools/tinderbox-configs/xulrunner/linux/mozconfig
@@ -1,16 +0,0 @@
-#
-## 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/macosx/CLOBBER
+++ b/mozilla/tools/tinderbox-configs/xulrunner/macosx/CLOBBER
@@ -1 +0,0 @@
-CLOBBERing to disable zipwriter from bug 379633
--- a/mozilla/tools/tinderbox-configs/xulrunner/macosx/mozconfig
+++ b/mozilla/tools/tinderbox-configs/xulrunner/macosx/mozconfig
@@ -1,19 +0,0 @@
-#
-## 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/win32/CLOBBER
+++ b/mozilla/tools/tinderbox-configs/xulrunner/win32/CLOBBER
@@ -1 +0,0 @@
-Preemptive clobber for /README.txt merge conflict.
--- a/mozilla/tools/tinderbox-configs/xulrunner/win32/mozconfig
+++ b/mozilla/tools/tinderbox-configs/xulrunner/win32/mozconfig
@@ -1,16 +0,0 @@
-#
-# 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
Author	SHA1	Message	Date
ccooper%deadsquid.com	0a708bdd9b	b=457747 - clobbering to pick up ftp_/url_path change git-svn-id: svn://10.0.0.236/branches/l10n@254471 18797224-902f-48f8-a5cc-f745e15eee43	2008-09-30 01:32:46 +00:00
ccooper%deadsquid.com	94c19e68ef	b=4577747 p=armenzg r=ccooper - changes the 3 platforms to push to nightly/old-school and report to MozillaTest git-svn-id: svn://10.0.0.236/branches/l10n@254469 18797224-902f-48f8-a5cc-f745e15eee43	2008-09-30 01:08:07 +00:00
bugzilla%standard8.plus.com	99ea43a16b	Clobber build to generate new nightlies as they were broken due to bug 445708 git-svn-id: svn://10.0.0.236/branches/l10n@253107 18797224-902f-48f8-a5cc-f745e15eee43	2008-07-18 11:23:39 +00:00
bugzilla%standard8.plus.com	af5e41e6e9	Bug 445708 Disable official branding on Thunderbird l10n tinderboxes. r=nthomas git-svn-id: svn://10.0.0.236/branches/l10n@253079 18797224-902f-48f8-a5cc-f745e15eee43	2008-07-17 11:45:03 +00:00
(no author)	c8d6dcded5	This commit was manufactured by cvs2svn to create branch 'l10n'. git-svn-id: svn://10.0.0.236/branches/l10n@252788 18797224-902f-48f8-a5cc-f745e15eee43	2008-07-02 12:14:45 +00:00
nrthomas%gmail.com	e0c59053c7	Bug 436926, change branding on Fx3.0.x nightlies to Gran Paradiso (l10n portion), r=ccooper git-svn-id: svn://10.0.0.236/branches/l10n@252508 18797224-902f-48f8-a5cc-f745e15eee43	2008-06-23 16:01:29 +00:00
ause%sun.com	24af131643	Bug 436391 - no more cygdrive, volume now is e: git-svn-id: svn://10.0.0.236/branches/l10n@252051 18797224-902f-48f8-a5cc-f745e15eee43	2008-06-02 16:48:08 +00:00
nrthomas%gmail.com	26fc7f5ad5	Fix up l10n configs for kernel upgrade git-svn-id: svn://10.0.0.236/branches/l10n@251919 18797224-902f-48f8-a5cc-f745e15eee43	2008-05-29 09:25:56 +00:00
nrthomas%gmail.com	25931ed72b	Bug 434060, move 3.0 nightly builds to latest-mozilla1.9.0-l10n, r=bhearsum git-svn-id: svn://10.0.0.236/branches/l10n@251722 18797224-902f-48f8-a5cc-f745e15eee43	2008-05-20 15:47:47 +00:00
philringnalda%gmail.com	9eac0b3a1b	Bug 429844 - Thunderbird Linux and Mac trunk l10n builds have unofficial branding, r=ted git-svn-id: svn://10.0.0.236/branches/l10n@250524 18797224-902f-48f8-a5cc-f745e15eee43	2008-04-20 18:44:29 +00:00
ause%sun.com	66994ee3a7	adapt to reimaged cb-xserve03 git-svn-id: svn://10.0.0.236/branches/l10n@249926 18797224-902f-48f8-a5cc-f745e15eee43	2008-04-09 15:33:37 +00:00
nrthomas%gmail.com	597e96df6a	Bug 421012, global s/md5/sha1/ for update hash function (even for configs that don't use it) git-svn-id: svn://10.0.0.236/branches/l10n@248902 18797224-902f-48f8-a5cc-f745e15eee43	2008-03-31 19:35:14 +00:00
nrthomas%gmail.com	5cf9edd1e1	Bug 422733, l10n tinderboxes should use stage-old until we can upload incrementally (bug 422759) git-svn-id: svn://10.0.0.236/branches/l10n@247808 18797224-902f-48f8-a5cc-f745e15eee43	2008-03-14 10:22:57 +00:00
ause%sun.com	517cc49928	bug 408167 - change build_hour to have nightlies earlier git-svn-id: svn://10.0.0.236/branches/l10n@243385 18797224-902f-48f8-a5cc-f745e15eee43	2008-01-17 18:43:25 +00:00
nrthomas%gmail.com	9bdc19f793	Disable Breakpad symbols on l10n boxes, which only repack git-svn-id: svn://10.0.0.236/branches/l10n@239088 18797224-902f-48f8-a5cc-f745e15eee43	2007-11-09 19:02:50 +00:00
nrthomas%gmail.com	9bcfb10e7b	Supplemental fix, NPOTB git-svn-id: svn://10.0.0.236/branches/l10n@238904 18797224-902f-48f8-a5cc-f745e15eee43	2007-11-07 16:35:37 +00:00
				`@@ -1 +0,0 @@`
				`CLOBBERing to disable zipwriter from bug 379633`
				`@@ -1 +0,0 @@`
				`Preemptive clobber for /README.txt merge conflict.`