You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by ma...@apache.org on 2014/08/13 19:13:48 UTC
[2/2] git commit: Fix glitches in update_version.
Fix glitches in update_version.
This commit will be consolidated into another before merging to master.
Project: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/commit/d9f23825
Tree: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/tree/d9f23825
Diff: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/diff/d9f23825
Branch: refs/heads/prep_0.4.0
Commit: d9f2382539f0ce51c71ddf79ad976c274235b333
Parents: 7059979
Author: Marvin Humphrey <ma...@rectangular.com>
Authored: Wed Aug 13 10:13:07 2014 -0700
Committer: Marvin Humphrey <ma...@rectangular.com>
Committed: Wed Aug 13 10:13:07 2014 -0700
----------------------------------------------------------------------
devel/bin/update_version | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/d9f23825/devel/bin/update_version
----------------------------------------------------------------------
diff --git a/devel/bin/update_version b/devel/bin/update_version
index 6df87b6..ce1f9a8 100755
--- a/devel/bin/update_version
+++ b/devel/bin/update_version
@@ -48,7 +48,7 @@ for my $path ('runtime/common/charmonizer.c', 'runtime/common/charmonizer.main')
$buf = read_file($path);
$buf =~ s/(cfish_version\[\]\s+=\s+)"[\d.]+"/$1"$x_y_z_version"/
or die "no match";
- $buf =~ s/(cfish_major_version\[\]\s+=\s+)"[\d.]+"/$1"$x_y_z_version"/
+ $buf =~ s/(cfish_major_version\[\]\s+=\s+)"[\d.]+"/$1"$x.$y"/
or die "no match";
write_file($path, $buf);
}
@@ -97,7 +97,7 @@ write_file( 'runtime/c/install.sh', $buf );
# Update compiler/python/setup.py
$buf = read_file('compiler/python/setup.py');
-$buf =~ s/(\bversion\s+=\s+)'[\d.]+'/$1'$x_y_z_version/
+$buf =~ s/(\bversion\s+=\s+)'[\d.]+'/$1'$x_y_z_version'/
or die "no match";
write_file( 'compiler/python/setup.py', $buf );