osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Gerald Combs 2018-06-06 12:01:44 -07:00 committed by Anders Broman
parent 6bb5a7af66
commit 9031281672
7 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -3015,6 +3015,7 @@ if(SHELLCHECK_EXECUTABLE)
COMMAND shellcheck --external-sources
tools/fuzz-test.sh
tools/randpkt-test.sh
tools/release-update-debian-soversions.sh
tools/test-captures.sh
tools/valgrind-wireshark.sh
WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"

4
codecs/CMakeLists.txt
View File

@ -54,13 +54,11 @@ add_library(wscodecs
${CMAKE_BINARY_DIR}/image/libwscodecs.rc
)
set(FULL_SO_VERSION "0.0.0")
set_target_properties(wscodecs PROPERTIES
PREFIX "lib"
COMPILE_DEFINITIONS "WS_BUILD_DLL"
LINK_FLAGS "${WS_LINK_FLAGS}"
VERSION ${FULL_SO_VERSION} SOVERSION 0
VERSION "0.0.0" SOVERSION 0
FOLDER "DLLs"
)

4
epan/CMakeLists.txt
View File

@ -306,12 +306,10 @@ add_library(epan
add_dependencies(epan version)
set(FULL_SO_VERSION "0.0.0")
set_target_properties(epan PROPERTIES
COMPILE_DEFINITIONS "WS_BUILD_DLL"
LINK_FLAGS "${WS_LINK_FLAGS}"
VERSION ${FULL_SO_VERSION} SOVERSION 0
VERSION "0.0.0" SOVERSION 0
)
if(ENABLE_APPLICATION_BUNDLE)

4
make-version.pl
View File

@ -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

8
tools/release-update-debian-soversions.sh
View File

@ -15,9 +15,9 @@
set -e
for i in wireshark wiretap wscodecs wsutil; do
NEW_VERSION=$(grep SOVERSION $(grep -l lib${i} */CMakeLists.txt) | sed 's/.*SOVERSION \([0-9]*\).*/\1/')
rename "s/0\./${NEW_VERSION}./" debian/lib${i}0.*
for i in codecs wireshark wiretap wsutil; do
NEW_VERSION=$(grep SOVERSION "$(grep -l lib${i} ./*/CMakeLists.txt)" | sed 's/.*SOVERSION \([0-9]*\).*/\1/')
rename "s/0\\./${NEW_VERSION}./" debian/lib${i}0.*
grep -l -R "lib${i}0" debian/ | xargs sed -i "s/lib${i}0/lib${i}${NEW_VERSION}/"
grep -l -R "lib${i}\.so\.0" debian/ | xargs sed -i "s/lib${i}\.so\.0/lib${i}.so.${NEW_VERSION}/"
grep -l -R "lib${i}\\.so\\.0" debian/ | xargs sed -i "s/lib${i}\\.so\\.0/lib${i}.so.${NEW_VERSION}/"
done

4
wiretap/CMakeLists.txt
View File

@ -117,13 +117,11 @@ add_library(wiretap
add_dependencies(wiretap version)
set(FULL_SO_VERSION "0.0.0")
set_target_properties(wiretap PROPERTIES
PREFIX "lib"
COMPILE_DEFINITIONS "WS_BUILD_DLL"
LINK_FLAGS "${WS_LINK_FLAGS}"
VERSION ${FULL_SO_VERSION} SOVERSION 0
VERSION "0.0.0" SOVERSION 0
FOLDER "DLLs"
)

4
wsutil/CMakeLists.txt
View File

@ -258,13 +258,11 @@ add_library(wsutil
${CMAKE_BINARY_DIR}/image/libwsutil.rc
)
set(FULL_SO_VERSION "0.0.0")
set_target_properties(wsutil PROPERTIES
PREFIX "lib"
COMPILE_DEFINITIONS "WS_BUILD_DLL"
LINK_FLAGS "${WS_LINK_FLAGS}"
VERSION ${FULL_SO_VERSION} SOVERSION 0
VERSION "0.0.0" SOVERSION 0
FOLDER "DLLs"
)