From a35051f7914af66732ea2db9f9c871086d8f8472 Mon Sep 17 00:00:00 2001 From: "mattwillis%gmail.com" Date: Tue, 6 Feb 2007 15:00:49 +0000 Subject: [PATCH] Turning off l10n builds now that bug 340845 is getting resolved --- tools/tinderbox-configs/sunbird/linux/mozconfig | 2 -- .../sunbird/linux/tinder-config.pl | 14 +------------- tools/tinderbox-configs/sunbird/macosx/mozconfig | 2 -- .../sunbird/macosx/tinder-config.pl | 14 +------------- tools/tinderbox-configs/sunbird/win32/mozconfig | 2 -- .../sunbird/win32/tinder-config.pl | 14 +------------- 6 files changed, 3 insertions(+), 45 deletions(-) diff --git a/tools/tinderbox-configs/sunbird/linux/mozconfig b/tools/tinderbox-configs/sunbird/linux/mozconfig index f28159815d6e..0d5527a9dd99 100644 --- a/tools/tinderbox-configs/sunbird/linux/mozconfig +++ b/tools/tinderbox-configs/sunbird/linux/mozconfig @@ -5,8 +5,6 @@ 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_MAKE_FLAGS="-j6" mk_add_options JS_READLINE=1 diff --git a/tools/tinderbox-configs/sunbird/linux/tinder-config.pl b/tools/tinderbox-configs/sunbird/linux/tinder-config.pl index c38776bbc894..0978d8ea71bf 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 = 0; # Do l10n packaging? # Tests $CleanProfile = 1; @@ -182,18 +182,6 @@ $BuildLocalesArgs = "ZIP_IN=/builds/tinderbox/Sb-Trunk/Linux_2.4.21-32.0.1.EL_De #- change to the tree you're actually building $BuildTree = 'Sunbird'; -#- If you're building locales and would like locale messages reported to a -#- tree other than $BuildTree-ab-CD, define the tree here. -ab-CD will be -#- appended for you. -$LocaleTree = 'Mozilla-l10n'; - -#- By default, locale builds delete the wget-ed en-US build from the local -#- stage directory before rsyncing the freshly baked l10n builds up to the -#- FTP server. This prevents the rsync from accidentally overwriting the -#- already existing en-US build on the FTP server. This behaviour is most -#- useful when building en-US and the other locales on different machines. -$DeleteEnUsOnLocalesUpload = 0; - #$BuildName = ''; $BuildTag = 'SUNBIRD_0_3_BRANCH'; #$BuildConfigDir = 'mozilla/config'; diff --git a/tools/tinderbox-configs/sunbird/macosx/mozconfig b/tools/tinderbox-configs/sunbird/macosx/mozconfig index 6486910f0e2c..c94233384600 100755 --- a/tools/tinderbox-configs/sunbird/macosx/mozconfig +++ b/tools/tinderbox-configs/sunbird/macosx/mozconfig @@ -8,8 +8,6 @@ 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 JS_READLINE=1 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../build/universal diff --git a/tools/tinderbox-configs/sunbird/macosx/tinder-config.pl b/tools/tinderbox-configs/sunbird/macosx/tinder-config.pl index 1fe100d7bb89..8ca7991877c4 100755 --- a/tools/tinderbox-configs/sunbird/macosx/tinder-config.pl +++ b/tools/tinderbox-configs/sunbird/macosx/tinder-config.pl @@ -45,7 +45,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 = 0; # Do l10n packaging? # Tests $CleanProfile = 1; @@ -183,18 +183,6 @@ $BuildLocalesArgs = "ZIP_IN=/builds/tinderbox/Sb-Trunk/Darwin_8.8.4_Depend/sunbi #- change to the tree you're actually building $BuildTree = 'Sunbird'; -#- If you're building locales and would like locale messages reported to a -#- tree other than $BuildTree-ab-CD, define the tree here. -ab-CD will be -#- appended for you. -$LocaleTree = 'Mozilla-l10n'; - -#- By default, locale builds delete the wget-ed en-US build from the local -#- stage directory before rsyncing the freshly baked l10n builds up to the -#- FTP server. This prevents the rsync from accidentally overwriting the -#- already existing en-US build on the FTP server. This behaviour is most -#- useful when building en-US and the other locales on different machines. -$DeleteEnUsOnLocalesUpload = 0; - #$BuildName = ''; $BuildTag = 'SUNBIRD_0_3_BRANCH'; #$BuildConfigDir = 'mozilla/config'; diff --git a/tools/tinderbox-configs/sunbird/win32/mozconfig b/tools/tinderbox-configs/sunbird/win32/mozconfig index 56f19c6f29a6..320937f805e3 100644 --- a/tools/tinderbox-configs/sunbird/win32/mozconfig +++ b/tools/tinderbox-configs/sunbird/win32/mozconfig @@ -6,8 +6,6 @@ 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_MAKE_FLAGS="-j6" mk_add_options JS_READLINE=1 # mk_add_options MOZ_INSTALLER_USE_7ZIP=1 diff --git a/tools/tinderbox-configs/sunbird/win32/tinder-config.pl b/tools/tinderbox-configs/sunbird/win32/tinder-config.pl index 7004cd4951b9..906502e8d113 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 = 0; # Do l10n packaging? # Tests $CleanProfile = 1; @@ -194,18 +194,6 @@ $BuildLocalesArgs = "ZIP_IN=/cygdrive/d/builds/tinderbox/Sunbird-Trunk/WINNT_5.2 #- change to the tree you're actually building $BuildTree = 'Sunbird'; -#- If you're building locales and would like locale messages reported to a -#- tree other than $BuildTree-ab-CD, define the tree here. -ab-CD will be -#- appended for you. -$LocaleTree = 'Mozilla-l10n'; - -#- By default, locale builds delete the wget-ed en-US build from the local -#- stage directory before rsyncing the freshly baked l10n builds up to the -#- FTP server. This prevents the rsync from accidentally overwriting the -#- already existing en-US build on the FTP server. This behaviour is most -#- useful when building en-US and the other locales on different machines. -$DeleteEnUsOnLocalesUpload = 0; - #$BuildName = ''; $BuildTag = 'SUNBIRD_0_3_BRANCH'; #$BuildConfigDir = 'mozilla/config';