[3/3] git commit: refs/heads/prep_0.4.0 - Adapt update_version for recent changes.

[ma...@apache.org]

Adapt update_version for recent changes.


Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/cd0dfde9
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/cd0dfde9
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/cd0dfde9

Branch: refs/heads/prep_0.4.0
Commit: cd0dfde9c1df83aac0bc3c29bc0e620172c76484
Parents: 049ae73
Author: Marvin Humphrey <ma...@rectangular.com>
Authored: Thu Aug 14 16:35:41 2014 -0700
Committer: Marvin Humphrey <ma...@rectangular.com>
Committed: Thu Aug 14 18:11:25 2014 -0700

----------------------------------------------------------------------
 devel/bin/update_version | 60 +++++++++++++++++++++++++++++++++++--------
 1 file changed, 49 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucy/blob/cd0dfde9/devel/bin/update_version
----------------------------------------------------------------------
diff --git a/devel/bin/update_version b/devel/bin/update_version
index 2860c3f..0cc0f8c 100755
--- a/devel/bin/update_version
+++ b/devel/bin/update_version
@@ -28,29 +28,40 @@ my $usage = "$0 version\n";
 my $version = shift(@ARGV) or die $usage;
 
 # standardize version strings
-my $x_y_z_version    = "";
-my $x_yyyzzz_version = "";
+my ( $x, $y, $z );
 if ( $version =~ m/^(\d+)\.(\d+)\.(\d+)$/ ) {
-    $x_yyyzzz_version = sprintf( "%d.%03d%03d", $1, $2, $3 );
-    $x_y_z_version = $version;
+    ( $x, $y, $z ) = ( $1, $2, $3 );
 }
 elsif ( $version =~ m/^(\d+)\.(\d\d\d)(\d\d\d)$/ ) {
-    $x_y_z_version = sprintf( "%d.%d.%d", $1, $2, $3 );
-    $x_yyyzzz_version = $version;
+    ( $x, $y, $z ) = ( int($1), int($2), int($3) );
 }
 else {
     die "Unknown version syntax. Try X.Y.Z or X.YYYZZZ\n";
 }
+my $x_y_z_version    = sprintf( "%d.%d.%d",    $x, $y, $z );
+my $x_yyyzzz_version = sprintf( "%d.%03d%03d", $x, $y, $z );
 
 print "Using version: $x_y_z_version ( $x_yyyzzz_version )\n";
 
 my $buf;
 
+# Update charmonizer.
+for my $path ('common/charmonizer.c', 'common/charmonizer.main') {
+    $buf = read_file($path);
+    $buf =~ s/(lucy_version\[\]\s+=\s+)"[\d.]+"/$1"$x_y_z_version"/
+        or die "no match";
+    $buf =~ s/(lucy_major_version\[\]\s+=\s+)"[\d.]+"/$1"$x.$y"/
+        or die "no match";
+    $buf =~ s/(cfish_lib_name\s+=\s+)"cfish-[\d.]+"/$1"cfish-$x.$y"/
+        or die "no match";
+    write_file($path, $buf);
+}
+
 # Update Lucy.pm.
 $buf = read_file('perl/lib/Lucy.pm');
 $buf =~ s/(our \$VERSION\ +=\ +)'.+?'/$1'$x_yyyzzz_version'/g
     or die "no match";
-$buf =~ s/XSLoader::load\( 'Lucy', '(.+?)'/XSLoader::load\( 'Lucy', '$x_y_z_version'/
+$buf =~ s/(bootstrap\s+Lucy\s+)'[\d\.]+'/$1'$x_y_z_version'/
     or die "no match";
 write_file( 'perl/lib/Lucy.pm', $buf );
 
@@ -66,17 +77,35 @@ $buf =~ s/(dist_version\ +=>\ +)'.+?'/$1'$x_y_z_version'/
     or die "no match";
 write_file( 'perl/Build.PL', $buf );
 
+# Update ruby/apache_lucy.gemspec
+$buf = read_file('ruby/apache_lucy.gemspec');
+$buf =~ s/(spec\.version\s+=\s+)'.+?'/$1'$x_y_z_version'/
+    or die "no match";
+write_file( 'ruby/apache_lucy.gemspec', $buf );
+
+# Update ruby/lib/apache_lucy.rb
+$buf = read_file('ruby/lib/apache_lucy.rb');
+$buf =~ s/(VERSION\s+=\s+)'.+?'/$1'$x_y_z_version'/
+    or die "no match";
+write_file( 'ruby/lib/apache_lucy.rb', $buf );
+
 # Update Lucy.cfp.
 $buf = read_file('core/Lucy.cfp');
 $buf =~ s/("version":\s+)"v\d+\.\d+\.\d+"/$1"v$x_y_z_version"/
     or die "no match";
+$buf =~ s/("Clownfish":\s+)"v\d+\.\d+\.\d+"/$1"v$x_y_z_version"/
+    or die "no match";
 write_file( 'core/Lucy.cfp', $buf );
 
-# Update temporary hack in CFCParcel.
-$buf = read_file('clownfish/src/CFCParcel.c');
-$buf =~ s/"v\d\.\d\.\d"/"v$x_y_z_version"/
+# Update TestLucy.cfp
+$buf = read_file('core/TestLucy.cfp');
+$buf =~ s/("version":\s+)"v\d+\.\d+\.\d+"/$1"v$x_y_z_version"/
+    or die "no match";
+$buf =~ s/("Clownfish":\s+)"v\d+\.\d+\.\d+"/$1"v$x_y_z_version"/
+    or die "no match";
+$buf =~ s/("Lucy":\s+)"v\d+\.\d+\.\d+"/$1"v$x_y_z_version"/
     or die "no match";
-write_file( 'clownfish/src/CFCParcel.c', $buf );
+write_file( 'core/TestLucy.cfp', $buf );
 
 # Update all other Perl modules.
 find sub {
@@ -89,6 +118,14 @@ find sub {
     write_file($name, $buf);
 }, 'perl';
 
+# Update c/install.sh
+$buf = read_file('c/install.sh');
+$buf =~ s/\bversion=[\d.]+/version=$x_y_z_version/
+    or die "no match";
+$buf =~ s/\bmajor_version=[\d.]+/major_version=$x.$y/
+    or die "no match";
+write_file( 'c/install.sh', $buf );
+
 # utility functions
 sub read_file {
     my ($file) = @_;
@@ -106,6 +143,7 @@ sub write_file {
     close(F) or die "Cannot close $file: $!\n";
 }
 
+print "Done.  Consider running git grep to search for the old version.\n";
 exit();
 
 __END__