Commits

Ville Suoranta authored 6b386c2566a
Add CASA_VARIANT
No tags

code/install/resolvegitrevision.pl

Modified
8 8 #if (branch =~ ".*release/[A-Za-z].*") {
9 9 # println "A: " + branch
10 10 #}
11 11
12 12 #if (branch =~ /.*release\/\d+\.\d+\.\d+/) {
13 13 # println "B: " + branch
14 14 #}
15 15
16 16 $casaBranchHint = $ENV{'CASABRANCHHINT'};
17 17 $tagMatcher="-mas-";
18 +$casaVariant="";
18 19 #$tagid="mas";
19 20
20 21 $debug=$ARGV[0];
21 22 print "tagMatcher: $tagMatcher\n" if $debug;
22 23 #print "tagId: $tagid\n" if $debug;
23 24
24 25 # Get the hint from an environment variable. This is used for detached head builds
25 26 # Default grep is master
26 27
27 28 # The "default" Casa release that is not tied to any instrument
83 84 }
84 85 chomp ($branchTag);
85 86 $casaVersionDesc = "ID $headCommit";
86 87 chomp($casaVersionDesc);
87 88 print "needsId: $needsId\n" if $debug;
88 89 print "branchTag: $branchTag\n" if $debug;
89 90 print "casaVersionDesc: $casaVersionDesc\n" if $debug;
90 91 @splat = split '-', $branchTag;
91 92 if ($needsId) {
92 93 if ($tagMatcher eq "rel" || $tagMatcher eq "mas" || $tagMatcher =~ /^release-/) {
93 - print "$splat[-1];$casaVersionDesc\n"
94 + if ($tagMatcher =~ /^release-/) {
95 + @mComp = split '-', $tagMatcher;
96 + $casaVariant = uc $mComp[1];
97 + }
98 + print "$splat[-1];$casaVersionDesc;$casaVariant\n"
94 99 }
95 100 else {
96 - print ";$casaVersionDesc\n"
101 + print ";$casaVersionDesc;$casaVariant\n"
97 102 }
98 103 }
99 104 else {
100 105 if ($tagMatcher eq "rel" || $tagMatcher eq "mas" || $tagMatcher =~ /^release-/) {
101 - print "$splat[-1];\n"
106 + if ($tagMatcher =~ /^release-/) {
107 + @mComp = split '-', $tagMatcher;
108 + $casaVariant = uc $mComp[1];
109 + }
110 + print "$splat[-1];;$casaVariant\n"
102 111 } else {
103 - print ";$branchTag\n"
112 + print ";$branchTag;$casaVariant\n"
104 113 }
105 114 }

Everything looks good. We'll let you know here if there's anything you should know about.

Add shortcut