diff --git a/CMakeLists.txt b/CMakeLists.txt index c04f6f7b5b..5f7a479657 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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}" diff --git a/codecs/CMakeLists.txt b/codecs/CMakeLists.txt index 2f446f6648..6a54001870 100644 --- a/codecs/CMakeLists.txt +++ b/codecs/CMakeLists.txt @@ -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" ) diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt index 067bf8bfba..d40121f5bc 100644 --- a/epan/CMakeLists.txt +++ b/epan/CMakeLists.txt @@ -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) 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 = ) { - # 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 diff --git a/tools/release-update-debian-soversions.sh b/tools/release-update-debian-soversions.sh index 7c8f368053..fb2b8895cc 100755 --- a/tools/release-update-debian-soversions.sh +++ b/tools/release-update-debian-soversions.sh @@ -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 diff --git a/wiretap/CMakeLists.txt b/wiretap/CMakeLists.txt index 3bfc5870b1..b0aebf04e8 100644 --- a/wiretap/CMakeLists.txt +++ b/wiretap/CMakeLists.txt @@ -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" ) diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt index 1980641fcd..698bc5bfbd 100644 --- a/wsutil/CMakeLists.txt +++ b/wsutil/CMakeLists.txt @@ -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" )