From bfe49c0d451301d7fbfc328c849ccc594a36f162 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Thu, 15 Jul 2010 15:12:33 +0000 Subject: [PATCH] Build branch packages too (good to use --usetimestamp option when building, but not necessary). Workaround 'no value' etics problem (empty build.root). --- org.glite.lb/configure | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/org.glite.lb/configure b/org.glite.lb/configure index 41ccf40..49d448d 100755 --- a/org.glite.lb/configure +++ b/org.glite.lb/configure @@ -686,20 +686,20 @@ sub mode_etics { my $conf; my $conftag; + $dwpath = "path = \${projectName}/\${moduleName}/\${version}/\${platformName}/\${packageName}-\${version}-\${age}.tar.gz\n"; if ($branch) { $conf = "$conf_prefix{$subsys}${subsys}-${module}_$branch"; - $conftag = $branch; - $dwpath = ""; } + $conftag = $branch; + $age = '0dev'; } else { $conf = "$conf_prefix{$subsys}$subsys-${module}_R_${major}_${minor}_${rev}_${age}"; # XXX: gridsite hack - $conftag = $subsys eq 'gridsite' ? "$conf_prefix{$subsys}$subsys-${module}_R_${major}_${minor}_${rev}" : $conf; - $dwpath = "path = \${projectName}/\${moduleName}/\${version}/\${platformName}/\${packageName}-\${version}-\${age}.tar.gz\n"; } + $conftag = $subsys eq 'gridsite' ? "$conf_prefix{$subsys}$subsys-${module}_R_${major}_${minor}_${rev}" : $conf; } my $file = $output ? $output : "$conf.ini"; open C,">$file" or die "$file: $!\n"; - my $buildroot = "build.root = " . $buildroot{"$subsys.$module"}; + my $buildroot = $buildroot{"$subsys.$module"} eq '' ? '#no build.root' : "build.root = " . $buildroot{"$subsys.$module"}; my $confdir = $buildroot{"$subsys.$module"} eq '' ? '..' : '../..'; -- 1.8.2.3