osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Add CMake SOVERSIONs to make-version.pl. 

Change-Id: Ifd011288ca23263738ca50842d59a23cc25e7952
Reviewed-on: https://code.wireshark.org/review/7532
Reviewed-by: Gerald Combs <gerald@wireshark.org>
This commit is contained in:
Gerald Combs 2015-03-04 12:32:25 -08:00
parent afc8589cd5
commit fb03d49fca
3 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/CMakeLists.txt
View File

@ -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}")

36
make-version.pl
View File

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

2
wiretap/CMakeLists.txt
View File

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