diff options
author | lenz@mysql.com <> | 2003-07-11 18:24:13 +0200 |
---|---|---|
committer | lenz@mysql.com <> | 2003-07-11 18:24:13 +0200 |
commit | 9a9d7c6bc122058c34dc3f7559a079fea3d0d9f5 (patch) | |
tree | fcec6be7a324927732677d92243fcde3d4de0371 /Build-tools/Bootstrap | |
parent | fbebac9a484bf08a6f557c40bd502045db6d2356 (diff) | |
download | mariadb-git-9a9d7c6bc122058c34dc3f7559a079fea3d0d9f5.tar.gz |
- fixed a bug in Bootstrap script: simply searching for the last tagged
ChangeSet was not sufficient to get the full ChangeLog between two
released versions (when using "--changelog=last") as merging between
trees also merges the BK tags. Now we explicitely search for the last
tagged ChangeSet that matches our major+minor version number, which
should match the last ChangeSet used for the previous release.
Diffstat (limited to 'Build-tools/Bootstrap')
-rwxr-xr-x | Build-tools/Bootstrap | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Build-tools/Bootstrap b/Build-tools/Bootstrap index 9f5fc37736d..b16218cfc3b 100755 --- a/Build-tools/Bootstrap +++ b/Build-tools/Bootstrap @@ -43,6 +43,7 @@ $opt_test= undef; $opt_skip_check= undef; $opt_skip_manual= undef; $version= "unknown"; +$major=$minor=$release=0; GetOptions( "build-command|b=s", @@ -149,6 +150,7 @@ if (!$opt_dry_run) { m/^AM_INIT_AUTOMAKE\(mysql, ([1-9]\.[0-9]{1,2}\.[0-9]{1,2}.*)\)/; $version= $1; + ($major, $minor, $release) = split(/\./,$version); } &logger("Found version string: $version"); @@ -218,7 +220,7 @@ if (defined $opt_changelog) { if (!$opt_revision) { - $revision= `bk changes -t -d':REV:' -n $REPO | head -1`; + $revision= `bk changes -t -d':REV:::TAG:' -n $REPO | grep mysql-$major-$minor | head -1 | cut -f1 -d ":"`; } else { |