diff options
| -rw-r--r-- | epan/CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | make-version.pl | 36 | ||||
| -rw-r--r-- | wiretap/CMakeLists.txt | 2 |
3 files changed, 36 insertions, 4 deletions
diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt index 4e91853f22..b502fd13fb 100644 --- a/epan/CMakeLists.txt +++ b/epan/CMakeLists.txt @@ -1724,7 +1724,7 @@ add_library(epan ${LINK_MODE_LIB} ${CMAKE_BINARY_DIR}/image/libwireshark.rc ) -set(FULL_SO_VERSION "0.0.0") +set(FULL_SO_VERSION "0.0.3") set_target_properties(epan PROPERTIES COMPILE_DEFINITIONS "WS_BUILD_DLL") set_target_properties(epan PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") diff --git a/make-version.pl b/make-version.pl index d53eeb8245..d88578b633 100755 --- a/make-version.pl +++ b/make-version.pl @@ -542,7 +542,7 @@ sub update_debian_changelog } # Read Makefile.am for each library, then write back out an updated version. -sub update_lib_releases +sub update_automake_lib_releases { my $line; my $contents = ""; @@ -579,6 +579,37 @@ sub update_lib_releases } } +# Read CMakeLists.txt for each library, then write back out an updated version. +sub update_cmake_lib_releases +{ + my $line; + my $contents = ""; + my $version = ""; + my $filedir; + my $filepath; + + return if (!$set_version); + + for $filedir ("epan", "wiretap") { # "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+(".*)/) { + $line = sprintf("$1%d$2\n", $version_pref{"version_micro"}); + } + $contents .= $line + } + + open(CMAKELISTS_TXT, "> $filepath") || die "Can't write $filepath!"; + print(CMAKELISTS_TXT $contents); + close(CMAKELISTS_TXT); + print "$filepath has been updated.\n"; + } +} + # Update distributed files that contain any version information sub update_versioned_files { @@ -587,7 +618,8 @@ sub update_versioned_files &update_config_nmake; &update_release_notes; &update_debian_changelog; - &update_lib_releases; + &update_automake_lib_releases; + &update_cmake_lib_releases; } # Print the version control system's version to $version_file. diff --git a/wiretap/CMakeLists.txt b/wiretap/CMakeLists.txt index b04e0d567c..b1578d0605 100644 --- a/wiretap/CMakeLists.txt +++ b/wiretap/CMakeLists.txt @@ -109,7 +109,7 @@ add_library(wiretap ${LINK_MODE_LIB} ${CMAKE_BINARY_DIR}/image/wiretap.rc ) -set(FULL_SO_VERSION "0.0.0") +set(FULL_SO_VERSION "0.0.3") set_target_properties(wiretap PROPERTIES COMPILE_DEFINITIONS "WS_BUILD_DLL" |