diff --git a/webtools/build/config.cgi b/webtools/build/config.cgi index f2a3e4e769af..da565cf8327e 100755 --- a/webtools/build/config.cgi +++ b/webtools/build/config.cgi @@ -32,6 +32,20 @@ $chrome_color = '#F0A000'; $CVSROOT = ':pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot'; $ENV{PATH} = "$ENV{PATH}:/opt/cvs-tools/bin:/usr/local/bin"; # for cvs & m4 +%defaults = ( + 'MOZ_CO_MODULE', 'SeaMonkeyEditor', + 'MOZ_CO_BRANCH', 'HEAD', + 'MOZ_OBJDIR', '@TOPSRCDIR@', + 'MOZ_CVS_FLAGS', '-q -z 3', + 'MOZ_CO_FLAGS', '-P' +); + +# Set up pull by date +# +use POSIX qw(strftime); +($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time); +$pull_date = strftime("%d %b %Y %H:%M %Z",$sec,$min,$hour,$mday,$mon,$year); + if ($query->param()) { &parse_params; @@ -53,9 +67,9 @@ print "Content-type: text/html\n\n"; ######################################################### sub parse_params { - if ($query->param('MOZ_OBJDIR') eq '@TOPSRCDIR@') { - $query->param(-name=>'MOZ_OBJDIR', - -values=>['']); + if ($query->param('pull_by_date') eq 'on') { + my $pull_date = $query->param('pull_date'); + $query->param(-name=>'MOZ_CO_DATE', -values=>[ $pull_date ]); } } @@ -173,9 +187,8 @@ sub print_script { my $value = $query->param($param); $value =~ s/\s+$//; $value =~ s/^\s+//; - next if $value eq ''; - next if $param eq 'MOZ_CO_MODULE' and $value eq 'SeaMonkeyEditor'; - next if $param eq 'MOZ_CO_BRANCH' and $value eq 'HEAD'; + next if $value eq $defaults{$param}; + $value = "\"$value\"" if $value =~ /\s/; print "# Options for client.mk.\n" if not $have_client_mk_options; print "mk_add_options $param=".$value."\n"; $have_client_mk_options = 1; @@ -210,7 +223,7 @@ sub print_configure_form { Mozilla Unix Build Configurator - +
@@ -252,14 +265,28 @@ sub print_configure_form { Check out options:
- @@ -268,7 +295,7 @@ sub print_configure_form { Object Directory:
+
Check out module - +
Check out branch - + +
+ CVS flags + + cvs  + +  co  + +
+   + Pull by date + +
- + mozilla Build in the source tree. (default)
mozilla/obj-`config.guess` (e.g. mozilla/obj-i686-pc-linux-gnu)