From c950ebdd0fe3938c4e8087ef1bce6d365d9de1f6 Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Mon, 2 Jan 2017 09:21:37 -0800 Subject: 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 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman --- make-version.pl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'make-version.pl') 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 = ) { # 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 = ) { # 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 -- cgit v1.2.1