aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerald Combs <gerald@zing.org>2017-01-02 09:21:37 -0800
committerAnders Broman <a.broman58@gmail.com>2017-01-02 21:43:03 +0000
commitc950ebdd0fe3938c4e8087ef1bce6d365d9de1f6 (patch)
tree4f85da1434eed7918e8ce840e10782f488615c71
parent6f9c4c807e97332b370a012c3b3c286c2b98c6aa (diff)
make-version.pl: Fixup library version updates.
When updating {epan,wiretap}/{Makefile.am,CMakeLists.txt} make sure we use an absolute path to each file and that we preserve the file's line ending style. Change-Id: Iee62a3ef8e89ca1ddae2569df62025805ee9a238 Reviewed-on: https://code.wireshark.org/review/19508 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
-rwxr-xr-xmake-version.pl8
1 files changed, 4 insertions, 4 deletions
diff --git a/make-version.pl b/make-version.pl
index 17ec2a86ed..3b693af0f1 100755
--- a/make-version.pl
+++ b/make-version.pl
@@ -542,14 +542,14 @@ sub update_automake_lib_releases
# changes with *most* releases.
#
# http://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info
- for $filedir ("epan", "wiretap") { # "wsutil"
+ for $filedir ("$srcdir/epan", "$srcdir/wiretap") { # "$srcdir/wsutil"
$contents = "";
$filepath = $filedir . "/Makefile.am";
open(MAKEFILE_AM, "< $filepath") || die "Can't read $filepath!";
while ($line = <MAKEFILE_AM>) {
# libwireshark_la_LDFLAGS = -version-info 2:1:1 -export-symbols
- if ($line =~ /^(lib\w+_la_LDFLAGS.*version-info\s+\d+:)\d+(:\d+.*)/) {
+ if ($line =~ /^(lib\w+_la_LDFLAGS.*version-info\s+\d+:)\d+(:\d+.*[\r\n]+)$/) {
$line = sprintf("$1%d$2\n", $version_pref{"version_micro"});
}
$contents .= $line
@@ -571,14 +571,14 @@ sub update_cmake_lib_releases
my $filedir;
my $filepath;
- for $filedir ("epan", "wiretap") { # "wsutil"
+ for $filedir ("$srcdir/epan", "$srcdir/wiretap") { # "$srcdir/wsutil"
$contents = "";
$filepath = $filedir . "/CMakeLists.txt";
open(CMAKELISTS_TXT, "< $filepath") || die "Can't read $filepath!";
while ($line = <CMAKELISTS_TXT>) {
# set(FULL_SO_VERSION "0.0.0")
- if ($line =~ /^(set\s*\(\s*FULL_SO_VERSION\s+"\d+\.\d+\.)\d+(".*)/) {
+ if ($line =~ /^(set\s*\(\s*FULL_SO_VERSION\s+"\d+\.\d+\.)\d+(".*[\r\n]+)$/) {
$line = sprintf("$1%d$2\n", $version_pref{"version_micro"});
}
$contents .= $line