print scalar(localtime()),": buildfarm run for $animal:$branch starting\n"
if $verbose;
+# Allow commandline overrides of conf variables
+foreach my $arg ( @{$EximBuild::Options::overrides} )
+{
+ if (my ($key,$val) = split '=', $arg)
+ {
+ $EximBuild::conf{$key} = $val;
+ printf "Commandline override: '$key' = '%s'\n", $EximBuild::conf{$key}
+ if $verbose;
+ }
+}
+
if (ref($force_every) eq 'HASH')
{
$force_every = $force_every->{$branch} || $force_every->{default};
sub display_features
{
+ return unless step_wanted('features');
my @out = `cd $exim
src/build-*/exim -C test/confs/0000 -bV `;
my $status = $? >>8;
my $env = $EximBuild::conf{makefile_set};
my $add = $EximBuild::conf{makefile_add};
- my $features = $EximBuild::conf{config_features};
+ my $features = $EximBuild::conf{makefile_regex};
my $envstr = "";
while (my ($key,$val) = each %$env)
push @confout, @tmp;
@tmp = `cd $exim && perl -pi -e 's/^EXIM_MONITOR=(.*)/# EXIM_MONITOR=\$1/' $local_conf`;
push @confout, @tmp;
- for my $feature ( @$features )
+ for my $regex ( @$features )
{
@tmp = `cd $exim
- perl -pi -e '$feature' $local_conf 2>&1
- echo "Changed feature: $feature" `;
+ perl -pi -e '$regex' $local_conf 2>&1
+ echo "Used regex: $regex" `;
push @confout, @tmp;
}
# Add the final build file to the display output
orig_env => $orig_env,
};
delete $conf->{secret};
+ $Data::Dumper::Sortkeys = 1;
return Data::Dumper->Dump([$conf],['Script_Config']);
}