From: František Dvořák <valtri@civ.zcu.cz>
Date: Thu, 15 Jul 2010 15:12:33 +0000 (+0000)
Subject: Build branch packages too (good to use --usetimestamp option when building, but not... 
X-Git-Tag: glite-jobid-api-c_R_1_0_5_1~15
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=bfe49c0d451301d7fbfc328c849ccc594a36f162;p=jra1mw.git

Build branch packages too (good to use --usetimestamp option when building, but not necessary).
Workaround 'no value' etics problem (empty build.root).
---

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 '' ? '..' : '../..';