Changed conf option name

diff --git a/build-farm.conf.template b/build-farm.conf.template
index f1699920dd0e315249c4c9dea5b01d389458f4f4..abf972e87bb2b0bea879b0c571e8f4a258c76d23 100644 (file)
--- 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',
 # 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 => {
     # 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',
     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',
     },
         #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.
 
     # 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.
     ],
 
     # The user compiled as the master exim username.

diff --git a/run_build.pl b/run_build.pl
index 2383c997ffe62c295194ca5ab302c2409214788b..e4d833ee582f26d68703b7ceec84deed0493aa5a 100755 (executable)
--- 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 $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)
 
     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;
         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
         {
             @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
             push @confout, @tmp;
         }
         # Add the final build file to the display output