From: František Dvořák Date: Fri, 3 Sep 2010 12:46:18 +0000 (+0000) Subject: Support ETICS HEAD configurations too. X-Git-Tag: merge_21_head_src~1 X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=bec17ac1af70404eae4fed30f9530f966eb34804;p=jra1mw.git Support ETICS HEAD configurations too. --- diff --git a/org.glite.lb/configure b/org.glite.lb/configure index 0022b05..31ffa2c 100755 --- a/org.glite.lb/configure +++ b/org.glite.lb/configure @@ -667,7 +667,8 @@ sub mode_etics { if ($branch) { $conf = "$conf_prefix{$subsys}${subsys}-${module}_$branch"; $conftag = $branch; - $age = '0dev'; } + # forced low age number + $age = $branch eq 'HEAD' ? '0head' : '0dev'; } else { $conf = "$conf_prefix{$subsys}$subsys-${module}_R_${major}_${minor}_${rev}_${age}"; @@ -734,6 +735,13 @@ sub mode_etics { $defprops .= $p . ' = ' . $platform_properties{"$subsys.$module"}->{default}->{$p} . "\n"; } + my $checkoutcmd; + if ($conftag eq 'HEAD') { + $checkoutcmd = "cvs -d \${vcsroot} co -A \${moduleName}"; + } else { + $checkoutcmd = "cvs -d \${vcsroot} co -r \${tag} \${moduleName}"; + } + print STDERR "Writing $file\n"; print C qq{ [Configuration-$conf] @@ -753,7 +761,7 @@ description = None tag = cvs -d \${vcsroot} tag -R \${tag} \${moduleName} branch = None commit = None -checkout = cvs -d \${vcsroot} co -r \${tag} \${moduleName} +checkout = $checkoutcmd [Platform-default:BuildCommand] postpublish = None @@ -898,6 +906,8 @@ General options (defaults in []): --thrflavour=flavour --nothrflavour=flavour threaded and non-treaded flavours [gcc64dbgpthr,gcc64dbg] --listmodules=subsys list modules of a subsystem + --version=maj.min.rev-age specify version here instead of reading version.properties + --branch=branch CVS branch/etics name suffix (HEAD, branch_2_1, ...) --libdir=libdir typically [lib,lib64] postfix Mode of operation: