From: Todd Lyons Date: Mon, 21 Oct 2013 14:39:49 +0000 (-0700) Subject: Changed conf option name X-Git-Url: https://git.exim.org/buildfarm-client.git/commitdiff_plain/1131fe476a4939252a01601c619d4aedea73bcc7 Changed conf option name --- diff --git a/build-farm.conf.template b/build-farm.conf.template index f169992..abf972e 100644 --- a/build-farm.conf.template +++ b/build-farm.conf.template @@ -26,7 +26,8 @@ my $branch; # This template assumes that the user running the buildfarm process is "farm" %conf =( scm => 'git', - scmrepo => 'git://git.exim.org/exim.git', # default is community repo for either type + # default is github mirror of Exim + scmrepo => 'https://github.com/mrballcb/exim.git', # Wishlist for future, track and build from multiple repos. # Doesn't do anything yet. repos => { @@ -130,7 +131,7 @@ my $branch; makefile_set =>{ # comment out if not using ccache CC => 'ccache gcc', - # Other examples. Could use regex in config_features instead. + # Other examples. Could use makefile_regex instead. #SUPPORT_TLS => 'yes', #TLS_LIBS => '-lssl -lcrypto', }, @@ -147,8 +148,8 @@ my $branch; # Another way to enable things in the Local/Makefile. # Use a simple regex to change a default to what you want. - config_features=>[ - q(s/^# EXPERIMENTAL_PRDR.*/EXPERIMENTAL_PRDR=yes/), + makefile_regex =>[ + #q(s/^# EXPERIMENTAL_PRDR.*/EXPERIMENTAL_PRDR=yes/), ], # The user compiled as the master exim username. diff --git a/run_build.pl b/run_build.pl index 2383c99..e4d833e 100755 --- a/run_build.pl +++ b/run_build.pl @@ -1073,7 +1073,7 @@ sub configure 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) @@ -1130,11 +1130,11 @@ sub configure 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