Browse Source

tools/release: Handle v1.0.0.201106090707-r-NN-gdeadbeef

The 1.0.0 release tags have a new suffix.
Account for this.

Change-Id: Ic6f260b6a5ba353af3b312b722f576155208eaa0
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
stable-1.2
Shawn O. Pearce 14 years ago
parent
commit
8d88a842da
  1. 2
      tools/version.sh

2
tools/version.sh

@ -82,7 +82,7 @@ case "$V" in
*-[1-9]*-g[0-9a-f]*) *-[1-9]*-g[0-9a-f]*)
POM_V=$(echo "$V" | perl -pe 's/-(\d+-g.*)$/.$1/') POM_V=$(echo "$V" | perl -pe 's/-(\d+-g.*)$/.$1/')
OSGI_V=$(perl -e ' OSGI_V=$(perl -e '
$ARGV[0] =~ /^(\d+)(?:\.(\d+)(?:\.(\d+))?)?-(\d+)-g(.*)$/; die unless $ARGV[0] =~ /^(\d+)(?:\.(\d+)(?:\.(\d+))?(?:\.\d{12}-r)?)?-(\d+)-g(.*)$/;
my ($a, $b, $c, $p, $r) = ($1, $2, $3, $4, $5); my ($a, $b, $c, $p, $r) = ($1, $2, $3, $4, $5);
$b = '0' unless defined $b; $b = '0' unless defined $b;
$c = '0' unless defined $c; $c = '0' unless defined $c;

Loading…
Cancel
Save