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

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

@@ -1 +1 @@
-Clobbering to kick lcms
+bug 457747

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

@@ -15,6 +15,7 @@ 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 --with-branding=browser/branding/unofficial
 
 CC=/tools/gcc/bin/gcc
 CXX=/tools/gcc/bin/g++

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.
@@ -156,7 +156,7 @@ $moz_cvsroot   = ":ext:ffxbld\@cvs.mozilla.org:/cvsroot";
 #$ObjDir = '';
 
 # Extra build name, if needed.
-$BuildNameExtra = 'Fx-Trunk-l10n';
+$BuildNameExtra = 'Fx-Moz1.9.0-l10n';
 
 # User comment, eg. ip address for dhcp builds.
 # ex: $UserComment = "ip = 208.12.36.108";
@@ -167,11 +167,11 @@ $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"
+	      "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"
 	      );
 
-$BuildLocalesArgs = "ZIP_IN=/builds/tinderbox/Fx-Trunk-l10n/Linux_2.6.18-8.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",
@@ -192,7 +192,7 @@ $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';
+$BuildTree  = 'MozillaTest';
 
 #$BuildName = '';
 #$BuildTag = '';
@@ -225,13 +225,13 @@ $package_creation_path = "/browser/installer";
 $ssh_version   = "2";
 $ssh_user      = "ffxbld";
 $ssh_key       = "'$ENV{HOME}/.ssh/ffxbld_dsa'";
-$ssh_server    = "stage.mozilla.org";
+$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";
-$milestone     = "trunk-l10n";
+$milestone     = "mozilla1.9.0-l10n";
 $notify_list   = 'build-announce@mozilla.org';
 $stub_installer = 0;
 $sea_installer = 1;
@@ -245,8 +245,8 @@ $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/';

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

@@ -0,0 +1 @@
+bug 457747

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

@@ -17,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
 

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

@@ -155,7 +155,7 @@ $moz_cvsroot   = ":ext:ffxbld\@cvs.mozilla.org:/cvsroot";
 #$ObjDir = '';
 
 # Extra build name, if needed.
-$BuildNameExtra = 'Fx-Trunk-l10n';
+$BuildNameExtra = 'Fx-Moz1.9.0-l10n';
 
 # User comment, eg. ip address for dhcp builds.
 # ex: $UserComment = "ip = 208.12.36.108";
@@ -166,7 +166,7 @@ $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" =>
+	      "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"
 	      );
 
@@ -191,7 +191,7 @@ $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';
+$BuildTree  = 'MozillaTest';
 
 #$BuildName = '';
 #$BuildTag = '';
@@ -224,13 +224,13 @@ $package_creation_path = "/browser/installer";
 $mac_bundle_path = "/browser/app";
 $ssh_user      = "ffxbld";
 $ssh_key       = "'$ENV{HOME}/.ssh/ffxbld_dsa'";
-$ssh_server    = "stage.mozilla.org";
+$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";
-$milestone     = "trunk-l10n";
+$milestone     = "mozilla1.9.0-l10n";
 $notify_list   = "build-announce\@mozilla.org";
 $stub_installer = 0;
 $sea_installer = 0;
@@ -240,12 +240,12 @@ $update_package = 0;
 $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/';

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

@@ -0,0 +1 @@
+bug 457747

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

@@ -14,3 +14,5 @@ ac_add_options --enable-optimize
 ac_add_options --disable-debug
 ac_add_options --disable-tests
 ac_add_options --enable-update-packaging
+ac_add_options --with-branding=browser/branding/unofficial
+

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

@@ -150,7 +150,7 @@ $moz_cvsroot   = ":ext:ffxbld\@cvs.mozilla.org:/cvsroot";
 #$ObjDir = '';
 
 # Extra build name, if needed.
-$BuildNameExtra = 'Fx-Trunk-l10n';
+$BuildNameExtra = 'Fx-Moz1.9.0-l10n';
 
 # User comment, eg. ip address for dhcp builds.
 # ex: $UserComment = "ip = 208.12.36.108";
@@ -161,9 +161,9 @@ $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" =>
+	      "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://stage.mozilla.org/pub/mozilla.org/firefox/nightly/latest-trunk/firefox-%version%.en-US.win32.zip" =>
+	      "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"
 	      );
 
@@ -187,7 +187,7 @@ $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';
+$BuildTree  = 'MozillaTest';
 
 #$BuildName = '';
 #$BuildTag = '';
@@ -220,13 +220,13 @@ $package_creation_path = "/browser/installer";
 $ssh_version   = "2";
 $ssh_user      = "ffxbld";
 $ssh_key       = "'$ENV{HOME}/.ssh/ffxbld_dsa'";
-$ssh_server    = "stage.mozilla.org";
+$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";
-$milestone     = "trunk-l10n";
+$milestone     = "mozilla1.9.0-l10n";
 $notify_list   = 'build-announce@mozilla.org';
 $stub_installer = 0;
 $sea_installer = 1;
@@ -234,14 +234,14 @@ $archive       = 1;
 $push_raw_xpis = 0;
 $update_package = 0;
 $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/';

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

@@ -166,12 +166,12 @@ $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" =>
+#	      "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://stage.mozilla.org/pub/mozilla.org/calendar/sunbird/nightly/latest-trunk/sunbird-%version%.en-US.linux-i686.tar.bz2" =>
+	      "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"
 	      );
 
@@ -215,12 +215,12 @@ $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";
+$build_hour    = "23";
 $package_creation_path = "/calendar/installer";
 # needs setting for mac + talkback: $mac_bundle_path = "/browser/app";
 $ssh_version   = "2";
 $ssh_user      = "calbld";
-$ssh_server    = "stage.mozilla.org";
+$ssh_server    = "stage-old.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";
@@ -235,7 +235,7 @@ $push_raw_xpis = 0;
 #$update_product = "Sunbird";
 #$update_version = "trunk";
 #$update_platform = "Linux_x86-gcc3";
-#$update_hash = "md5";
+#$update_hash = "sha1";
 #$update_filehost = "ftp.mozilla.org";
 #$update_ver_file = 'calendar/sunbird/config/version.txt';
 #$update_pushinfo = 1;

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

@@ -1,6 +1,6 @@
 #
-## 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: 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.
@@ -170,16 +170,16 @@ $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" =>
+#	      "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://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"
+	      "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/Sunbird-Trunk-l10n/Darwin_8.8.1_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
@@ -219,13 +219,13 @@ $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";
+$build_hour    = "23";
 $package_creation_path = "/calendar/installer";
 # needs setting for mac + talkback:
 $mac_bundle_path = "/calendar/sunbird/app";
 $ssh_version   = "2";
 $ssh_user      = "calbld";
-$ssh_server    = "stage.mozilla.org";
+$ssh_server    = "stage-old.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";

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

@@ -179,20 +179,20 @@ $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" =>
+#	      "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://stage.mozilla.org/pub/mozilla.org/calendar/sunbird/releases/0.3.1rc2/win32/en-US/sunbird-%version%.en-US.win32.installer.exe" =>
+#	      "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://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"
+	      "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=/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";
+$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
 #-
@@ -231,12 +231,12 @@ $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";
+$build_hour    = "23";
 $package_creation_path = "/calendar/installer";
 # needs setting for mac + talkback: $mac_bundle_path = "/browser/app";
 $ssh_version   = "2";
 $ssh_user      = "calbld";
-$ssh_server    = "stage.mozilla.org";
+$ssh_server    = "stage-old.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";
@@ -251,7 +251,7 @@ $push_raw_xpis = 0;
 #$update_product = "Sunbird";
 #$update_version = "trunk";
 #$update_platform = "WINNT_x86-msvc";
-#$update_hash = "md5";
+#$update_hash = "sha1";
 #$update_filehost = "ftp.mozilla.org";
 #$update_ver_file = 'calendar/sunbird/config/version.txt';
 #$update_pushinfo = 1;

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

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

@@ -15,5 +15,5 @@ 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

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.
@@ -148,11 +148,11 @@ $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"
+	      "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"
 	      );
 
-$BuildLocalesArgs = "ZIP_IN=/builds/tinderbox/Tb-Trunk-l10n/Linux_2.6.18-8.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
@@ -202,7 +202,7 @@ $package_creation_path = "/mail/installer";
 $ssh_version   = "2";
 $ssh_user      = "tbirdbld";
 $ssh_key       = "'$ENV{HOME}/.ssh/tbirdbld_dsa'";
-$ssh_server    = "stage.mozilla.org";
+$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";

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

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

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

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

@@ -33,8 +33,8 @@ $BuildLocales      = 1;
 # Tests
 $CleanProfile             = 1;
 #$ResetHomeDirForTests     = 1;
-$ProductName              = "Thunderbird";
-$VendorName               = 'Mozilla';
+$ProductName              = "Shredder";
+#$VendorName               = 'Mozilla';
 
 #$RunMozillaTests          = 1;  # Allow turning off of all tests if needed.
 #$RegxpcomTest             = 1;
@@ -141,7 +141,7 @@ $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" =>
+	     "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"
 	     );
 $BuildLocalesArgs = "ZIP_IN=/builds/tinderbox/Tb-Trunk-l10n/Darwin_8.8.4_Depend/thunderbird.dmg";
@@ -195,7 +195,7 @@ $package_creation_path = "/mail/installer";
 $mac_bundle_path = "/mail/app";
 $ssh_user      = "tbirdbld";
 $ssh_key       = "'$ENV{HOME}/.ssh/tbirdbld_dsa'";
-$ssh_server    = "stage.mozilla.org";
+$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";

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

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

@@ -13,7 +13,6 @@ 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

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

@@ -140,9 +140,9 @@ $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" =>
+%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://stage.mozilla.org/pub/mozilla.org/thunderbird/nightly/latest-trunk/thunderbird-%version%.en-US.win32.zip" =>
+	      "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");
 
 $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";
@@ -195,7 +195,7 @@ $package_creation_path = "/mail/installer";
 $ssh_version   = "2";
 $ssh_user      = "tbirdbld";
 $ssh_key       = "'$ENV{HOME}/.ssh/tbirdbld_dsa'";
-$ssh_server    = "stage.mozilla.org";
+$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";