diff options
| author | Wayne Davison <wayned@samba.org> | 2015-04-26 17:30:15 -0700 |
|---|---|---|
| committer | Wayne Davison <wayned@samba.org> | 2015-05-01 14:26:21 -0700 |
| commit | 461086bbe7af30177ab6f9e1958125c383892a7c (patch) | |
| tree | 350812cc6f30ddc028e7f291de770b52e54d89c3 | |
| parent | 00694610a6ecb1bb345639b523b2fce42826eec5 (diff) | |
| download | android_external_rsync-461086bbe7af30177ab6f9e1958125c383892a7c.tar.gz android_external_rsync-461086bbe7af30177ab6f9e1958125c383892a7c.tar.bz2 android_external_rsync-461086bbe7af30177ab6f9e1958125c383892a7c.zip | |
Handle configure's new version style.
| -rwxr-xr-x | packaging/nightly-rsync | 4 | ||||
| -rwxr-xr-x | packaging/release-rsync | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/packaging/nightly-rsync b/packaging/nightly-rsync index 44e85587..6e888bea 100755 --- a/packaging/nightly-rsync +++ b/packaging/nightly-rsync @@ -59,13 +59,13 @@ if ($make_tar) { my $confversion; open(IN, '<', 'configure.ac') or die "Unable to open configure.ac: $!\n"; while (<IN>) { - if (/^RSYNC_VERSION=(.*)/) { + if (/^AC_INIT\(\[rsync\],\s+\[(\d.+?)\]/) { $confversion = $1; last; } } close IN; - die "Unable to find RSYNC_VERSION in configure.ac\n" unless defined $confversion; + die "Unable to find AC_INIT with version in configure.ac\n" unless defined $confversion; open(IN, '<', 'OLDNEWS') or die "Unable to open OLDNEWS: $!\n"; $_ = <IN>; diff --git a/packaging/release-rsync b/packaging/release-rsync index b15aae1f..5f77c2e8 100755 --- a/packaging/release-rsync +++ b/packaging/release-rsync @@ -67,13 +67,13 @@ check_git_state($master_branch, 1, 1); my $confversion; open(IN, '<', 'configure.ac') or die $!; while (<IN>) { - if (/^RSYNC_VERSION=(.*)/) { + if (/^AC_INIT\(\[rsync\],\s+\[(\d.+?)\]/) { $confversion = $1; last; } } close IN; -die "Unable to find RSYNC_VERSION in configure.ac\n" unless defined $confversion; +die "Unable to find AC_INIT with version in configure.ac\n" unless defined $confversion; open(IN, '<', 'OLDNEWS') or die $!; $_ = <IN>; @@ -202,8 +202,8 @@ foreach my $fn (@tweak_files) { undef $/; $_ = <IN>; $/ = "\n"; close IN; if ($fn =~ /configure/) { - s/^RSYNC_VERSION=.*/RSYNC_VERSION=$version/m - or die "Unable to update RSYNC_VERSION in $fn\n"; + s/^(AC_INIT\(\[rsync\],\s+\[)\d.+?(\])/$1$version$2/m + or die "Unable to update AC_INIT with version in $fn\n"; } elsif ($fn =~ /\.spec/) { while (my($str, $val) = each %specvars) { s/^\Q$str\E .*/$str $val/m |