From 326402fec7c97ad8329348d751c5678589573e80 Mon Sep 17 00:00:00 2001 From: "mattwillis%gmail.com" Date: Thu, 1 Feb 2007 23:17:30 +0000 Subject: [PATCH] Spinning Sunbird 0.3.1 RC1 --- tools/tinderbox-configs/sunbird/linux/CLOBBER | 4 +++- tools/tinderbox-configs/sunbird/linux/mozconfig | 6 +++--- .../tinderbox-configs/sunbird/linux/tinder-config.pl | 4 ++-- tools/tinderbox-configs/sunbird/macosx/CLOBBER | 3 ++- tools/tinderbox-configs/sunbird/macosx/mozconfig | 6 ++++-- .../tinderbox-configs/sunbird/macosx/tinder-config.pl | 11 ++++++----- tools/tinderbox-configs/sunbird/win32/CLOBBER | 3 ++- tools/tinderbox-configs/sunbird/win32/mozconfig | 6 +++--- .../tinderbox-configs/sunbird/win32/tinder-config.pl | 6 +++--- 9 files changed, 28 insertions(+), 21 deletions(-) diff --git a/tools/tinderbox-configs/sunbird/linux/CLOBBER b/tools/tinderbox-configs/sunbird/linux/CLOBBER index c88de7679519..4bb5744a115c 100644 --- a/tools/tinderbox-configs/sunbird/linux/CLOBBER +++ b/tools/tinderbox-configs/sunbird/linux/CLOBBER @@ -1,3 +1,5 @@ +Edit this file and include an explanation of why you're respinning. - #build 2007-01-23 00:55 UTC - Moving tinderboxes to SUNBIRD_0_3_BRANCH for 0.3.1 maintenance release. 2007-01-23 15:13 UTC - Tinders were building from SUNBIRD_0_3_RELEASE rather than SUNBIRD_0_3_BRANCH -2007-30-01 20:20 UTC - Respin 0.3.1pre builds for testday to pickup fix for bug 368709 +2007-01-30 20:20 UTC - Respin 0.3.1pre builds for testday to pickup fix for bug 368709 +2007-02-01 23:13 UTC - Respin for 0.3.1 first RC diff --git a/tools/tinderbox-configs/sunbird/linux/mozconfig b/tools/tinderbox-configs/sunbird/linux/mozconfig index 51dbefe7f025..f28159815d6e 100644 --- a/tools/tinderbox-configs/sunbird/linux/mozconfig +++ b/tools/tinderbox-configs/sunbird/linux/mozconfig @@ -5,8 +5,8 @@ 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:cltbld@cvs.mozilla.org:/l10n +mk_add_options MOZ_CO_LOCALES=all +mk_add_options LOCALES_CVSROOT=:ext:cltbld@cvs.mozilla.org:/l10n mk_add_options MOZ_MAKE_FLAGS="-j6" mk_add_options JS_READLINE=1 @@ -24,4 +24,4 @@ ac_add_options --disable-tests ac_add_options --enable-default-toolkit=gtk2 # SVG now requires Cairo, so disable it for now. ac_add_options --disable-svg -#ac_add_options --enable-official-branding +ac_add_options --enable-official-branding diff --git a/tools/tinderbox-configs/sunbird/linux/tinder-config.pl b/tools/tinderbox-configs/sunbird/linux/tinder-config.pl index 513d337e67c8..6877dbd09c09 100644 --- a/tools/tinderbox-configs/sunbird/linux/tinder-config.pl +++ b/tools/tinderbox-configs/sunbird/linux/tinder-config.pl @@ -44,7 +44,7 @@ $UseTimeStamp = 0; # Use the CVS 'pull-by-timestamp' option, or not #$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 = 1; # Do l10n packaging? +$BuildLocales = 1; # Do l10n packaging? # Tests $CleanProfile = 1; @@ -165,7 +165,7 @@ $BuildNameExtra = 'Sb-Release'; # Configure only, don't build. #$ConfigureOnly = 0; %WGetFiles = ( - "http://stage.mozilla.org/pub/mozilla.org/calendar/sunbird/nightly/latest-trunk/sunbird-0.3.en-US.linux-i686.tar.bz2" => + "http://stage.mozilla.org/pub/mozilla.org/calendar/sunbird/nightly/latest-trunk/sunbird-0.3.1.en-US.linux-i686.tar.bz2" => "/builds/tinderbox/Sb-Trunk/Linux_2.4.21-32.0.1.EL_Depend/sunbird.tar.bz2" ); diff --git a/tools/tinderbox-configs/sunbird/macosx/CLOBBER b/tools/tinderbox-configs/sunbird/macosx/CLOBBER index b0ed3165ea20..e13aeb4a9008 100644 --- a/tools/tinderbox-configs/sunbird/macosx/CLOBBER +++ b/tools/tinderbox-configs/sunbird/macosx/CLOBBER @@ -2,4 +2,5 @@ copied files from carbon to cocoa widgets, this always messes up tinderboxes. cl 2007-01-23 00:55 UTC - Moving tinderboxes to SUNBIRD_0_3_BRANCH for 0.3.1 maintenance release. 2007-01-23 14:00 UTC - Unifying failed due to readme.txt crap. Respinning to get useable nightly. 2007-01-23 15:13 UTC - Tinders were building from SUNBIRD_0_3_RELEASE rather than SUNBIRD_0_3_BRANCH -2007-30-01 20:20 UTC - Respin 0.3.1pre builds for testday to pickup fix for bug 368709 +2007-01-30 20:20 UTC - Respin 0.3.1pre builds for testday to pickup fix for bug 368709 +2007-02-01 23:13 UTC - Respin for 0.3.1 first RC diff --git a/tools/tinderbox-configs/sunbird/macosx/mozconfig b/tools/tinderbox-configs/sunbird/macosx/mozconfig index 16fcd6b1f765..1d95570906a6 100755 --- a/tools/tinderbox-configs/sunbird/macosx/mozconfig +++ b/tools/tinderbox-configs/sunbird/macosx/mozconfig @@ -8,8 +8,8 @@ mk_add_options MOZ_CO_PROJECT="calendar" mk_add_options MOZ_MAKE_FLAGS="-j6" #mk_add_options MOZ_CO_MODULE="mozilla/tools/update-packaging" -#mk_add_options MOZ_CO_LOCALES=all -#mk_add_options LOCALES_CVSROOT=:ext:cltbld@cvs.mozilla.org:/l10n +mk_add_options MOZ_CO_LOCALES=all +mk_add_options LOCALES_CVSROOT=:ext:cltbld@cvs.mozilla.org:/l10n mk_add_options JS_READLINE=1 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../build @@ -30,3 +30,5 @@ ac_add_options --enable-default-toolkit=mac # SVG now requires Cairo, so disable it for now. ac_add_options --disable-svg + +ac_add_options --enable-official-branding diff --git a/tools/tinderbox-configs/sunbird/macosx/tinder-config.pl b/tools/tinderbox-configs/sunbird/macosx/tinder-config.pl index d243dcf51f8b..8ee96afce353 100755 --- a/tools/tinderbox-configs/sunbird/macosx/tinder-config.pl +++ b/tools/tinderbox-configs/sunbird/macosx/tinder-config.pl @@ -45,14 +45,15 @@ $UseTimeStamp = 0; # Use the CVS 'pull-by-timestamp' option, or not #$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? +$BuildLocales = 1; # Do l10n packaging? # Tests $CleanProfile = 1; #$ResetHomeDirForTests = 1; -#$ProductName = "Sunbird"; -$ProductName = 'Calendar'; -$MacOSProductName = 'Calendar'; +$ProductName = 'Sunbird'; +$MacOSProductName = 'Sunbird'; +#$ProductName = 'Calendar'; +#$MacOSProductName = 'Calendar'; $VendorName = ""; #$RunMozillaTests = 1; # Allow turning off of all tests if needed. @@ -165,7 +166,7 @@ $BuildNameExtra = 'Sb-Release'; # Configure only, don't build. #$ConfigureOnly = 0; %WGetFiles = ( - "http://stage.mozilla.org/pub/mozilla.org/calendar/sunbird/nightly/latest-trunk/sunbird-0.3.en-US.mac.dmg" => + "http://stage.mozilla.org/pub/mozilla.org/calendar/sunbird/nightly/latest-trunk/sunbird-0.3.1.en-US.mac.dmg" => "/builds/tinderbox/Sb-Trunk/Darwin_8.8.4_Depend/sunbird.dmg" ); diff --git a/tools/tinderbox-configs/sunbird/win32/CLOBBER b/tools/tinderbox-configs/sunbird/win32/CLOBBER index d43d132045a4..a974a55e3a7e 100644 --- a/tools/tinderbox-configs/sunbird/win32/CLOBBER +++ b/tools/tinderbox-configs/sunbird/win32/CLOBBER @@ -2,4 +2,5 @@ Edit this file and include an explanation of why you're respinning. - #build 2007-01-09 05:54 UTC - cvs conflict on mozilla/LICENSE is causing burnination. 2007-01-23 00:55 UTC - Moving tinderboxes to SUNBIRD_0_3_BRANCH for 0.3.1 maintenance release. 2007-01-23 15:13 UTC - Tinders were building from SUNBIRD_0_3_RELEASE rather than SUNBIRD_0_3_BRANCH -2007-30-01 20:20 UTC - Respin 0.3.1pre builds for testday to pickup fix for bug 368709 +2007-01-30 20:20 UTC - Respin 0.3.1pre builds for testday to pickup fix for bug 368709 +2007-02-01 23:13 UTC - Respin for 0.3.1 first RC diff --git a/tools/tinderbox-configs/sunbird/win32/mozconfig b/tools/tinderbox-configs/sunbird/win32/mozconfig index bc5454df0fe6..56f19c6f29a6 100644 --- a/tools/tinderbox-configs/sunbird/win32/mozconfig +++ b/tools/tinderbox-configs/sunbird/win32/mozconfig @@ -6,8 +6,8 @@ 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:cltbld@cvs.mozilla.org:/l10n +mk_add_options MOZ_CO_LOCALES=all +mk_add_options LOCALES_CVSROOT=:ext:cltbld@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 @@ -27,4 +27,4 @@ ac_add_options --disable-tests # SVG now requires Cairo, so disable it for now. ac_add_options --disable-svg #ac_add_options --enable-codesighs -#ac_add_options --enable-official-branding +ac_add_options --enable-official-branding diff --git a/tools/tinderbox-configs/sunbird/win32/tinder-config.pl b/tools/tinderbox-configs/sunbird/win32/tinder-config.pl index c2f3ae1146a9..0179efa1227d 100644 --- a/tools/tinderbox-configs/sunbird/win32/tinder-config.pl +++ b/tools/tinderbox-configs/sunbird/win32/tinder-config.pl @@ -55,7 +55,7 @@ $UseTimeStamp = 0; # Use the CVS 'pull-by-timestamp' option, or not #$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 = 1; # Do l10n packaging? +$BuildLocales = 1; # Do l10n packaging? # Tests $CleanProfile = 1; @@ -176,9 +176,9 @@ $BuildNameExtra = 'Sb-Nightly'; # Configure only, don't build. #$ConfigureOnly = 0; %WGetFiles = ( - "http://stage.mozilla.org/pub/mozilla.org/calendar/sunbird/nightly/latest-trunk/sunbird-0.3.en-US.win32.zip" => + "http://stage.mozilla.org/pub/mozilla.org/calendar/sunbird/nightly/latest-trunk/sunbird-0.3.1.en-US.win32.zip" => "/cygdrive/d/builds/tinderbox/Sunbird-Trunk/WINNT_5.2_Depend/sunbird.zip", - "http://stage.mozilla.org/pub/mozilla.org/calendar/sunbird/nightly/latest-trunk/sunbird-0.3.en-US.win32.installer.exe" => + "http://stage.mozilla.org/pub/mozilla.org/calendar/sunbird/nightly/latest-trunk/sunbird-0.3.1.en-US.win32.installer.exe" => "/cygdrive/d/builds/tinderbox/Sunbird-Trunk/WINNT_5.2_Depend/sunbird-installer.exe" );