From: Jeremy Harris <jgh@wizmail.org>
Date: Sat, 4 Mar 2017 16:21:36 +0000 (+0000)
Subject: Make alternate placement of standard directory layout simpler
X-Git-Url: https://git.exim.org/buildfarm-client.git/commitdiff_plain/9c12053783e5164e03b5dc644e8d64e20ac8082b?ds=sidebyside

Make alternate placement of standard directory layout simpler
---

diff --git a/build-farm.conf.template b/build-farm.conf.template
index 869eedb..eb13152 100644
--- a/build-farm.conf.template
+++ b/build-farm.conf.template
@@ -17,6 +17,9 @@ use warnings;
 
 my $branch = $::branch;
 
+# This could be changed to use the startdard layout but in a different place
+my $basedir = $ENV{HOME};
+
 # This template assumes that the user running the buildfarm process is "farm"
 my $farm_user_name = getpwuid($<) // die "$0: can't get user name from uid $<: $!\n";
 
@@ -41,9 +44,9 @@ our %conf =(
     tar_log_cmd => undef,
     # If running multiple animals, an explicit common directory for
     # the lockfile so that runs do not conflict. Otherwise, leave unset.
-    global_lock_dir => $ENV{HOME},
+    global_lock_dir => $basedir,
     # this directory must exist before anything will work
-    build_root => "$ENV{HOME}/buildfarm",
+    build_root => "$basedir/buildfarm",
     # set true to do vpath builds
     use_vpath => undef,
 
@@ -119,7 +122,7 @@ our %conf =(
     build_env =>{
         # use a dedicated cache for the build farm. this should give us
         # very high hit rates and slightly faster cache searching.
-        CCACHE_DIR => "$ENV{HOME}/buildfarm/ccache/$branch",
+        CCACHE_DIR => "$basedir/buildfarm/ccache/$branch",
 
         ### set this if you need a proxy setting for the
         # outbound web transaction that reports the results