From 41ce8d2ef4f71531bb9309db67f2274dbf15ea06 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Tue, 24 Apr 2012 14:50:02 +0000 Subject: [PATCH] Polishing ETICS branch configurations. --- org.glite.lb/configure | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/org.glite.lb/configure b/org.glite.lb/configure index bcb1531..47ddec3 100755 --- a/org.glite.lb/configure +++ b/org.glite.lb/configure @@ -1552,6 +1552,8 @@ sub mode_etics { $conftag = $branch; # forced low age number $age = $branch eq 'HEAD' ? '0head' : '0dev'; + # add project major version number + $age .= '.'.$project_version; push @copts, '--version ${version}-${age}'; } else { @@ -1564,11 +1566,13 @@ sub mode_etics { if ($project eq 'emi' and $project_version == 1) { $age = $age - 1; } - } - # emi1 suffix for older packaging + # '.emi1' suffix for older packaging + if ($project eq 'emi' and $project_version == 1) { + $age = $age.'.'.$project.$project_version; + } + } if ($project eq 'emi' and $project_version == 1) { - $age = $age.$project.$project_version; $conf = $conf.$project.$project_version; } @@ -1868,7 +1872,7 @@ $output}; `diff -b "$file" "$file.new"`; if ($? == 0) { - print STDERR "($file not changed)\n"; + print STDERR "($file not changed)\n" if ($debug); unlink "$file.new"; } else { print STDERR "Writing $file\n"; -- 1.8.2.3