diff options
| author | Gerald Combs <gerald@wireshark.org> | 2018-06-06 12:01:44 -0700 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-06-07 04:01:37 +0000 |
| commit | 9031281672206803c4344a68a7f1c2f3b230fa56 (patch) | |
| tree | edf2f0586af505b1305bf92f09845b201d5e9132 /make-version.pl | |
| parent | 6bb5a7af6621e8c020a8856466079c3a10d21602 (diff) | |
CMake: Get rid of FULL_SO_VERSION
gd2e0724afc moved our library versions into their own variables named
FULL_SO_VERSION. They're no longer used and interfere with
tools/release-update-debian-soversions.sh so remove them.
Fix some shellcheck warnings in release-update-debian-soversions.sh
while we're here.
Bug: 14778
Change-Id: I0eb0bb4ab4c482bdb8a94f8c18aa04c6c83c781b
Reviewed-on: https://code.wireshark.org/review/28068
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'make-version.pl')
| -rwxr-xr-x | make-version.pl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/make-version.pl b/make-version.pl index dc24716c17..7bed6ac0a9 100755 --- a/make-version.pl +++ b/make-version.pl @@ -526,9 +526,9 @@ sub update_cmake_lib_releases $filepath = $filedir . "/CMakeLists.txt"; open(CMAKELISTS_TXT, "< $filepath") || die "Can't read $filepath!"; while ($line = <CMAKELISTS_TXT>) { - # set(FULL_SO_VERSION "0.0.0") + # VERSION "0.0.0" SOVERSION 0 - if ($line =~ /^(set\s*\(\s*FULL_SO_VERSION\s+"\d+\.\d+\.)\d+(".*[\r\n]+)$/) { + if ($line =~ /^(\s*VERSION\s+"\d+\.\d+\.)\d+(".*[\r\n]+)$/) { $line = sprintf("$1%d$2", $version_pref{"version_micro"}); } $contents .= $line |