diff options
| author | Gerald Combs <gerald@zing.org> | 2016-04-28 17:55:46 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2016-04-29 01:45:13 +0000 |
| commit | f7f92578cddfbc3889d91d5a1b63e9079efbe603 (patch) | |
| tree | a89b20584676ca205ed20198975bb7781965e9ec /make-version.pl | |
| parent | 3553df24640422f2d2368035956714683e63f498 (diff) | |
| download | wireshark-f7f92578cddfbc3889d91d5a1b63e9079efbe603.tar.gz wireshark-f7f92578cddfbc3889d91d5a1b63e9079efbe603.tar.bz2 wireshark-f7f92578cddfbc3889d91d5a1b63e9079efbe603.zip | |
make-version.pl: Preserve line endings.
Make sure we replace a line using the same line endings.
Change-Id: I73b07a773bc39b05ba7a73b3c3c984a73c545a48
Reviewed-on: https://code.wireshark.org/review/15157
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
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 f1fc8466a1..c392116596 100755 --- a/make-version.pl +++ b/make-version.pl @@ -421,8 +421,8 @@ sub update_cmakelists_txt $line = sprintf("set(PROJECT_MINOR_VERSION %d)$1", $version_pref{"version_minor"}); } elsif ($line =~ /^set *\( *PROJECT_PATCH_VERSION .*([\r\n]+)$/) { $line = sprintf("set(PROJECT_PATCH_VERSION %d)$1", $version_pref{"version_micro"}); - } elsif ($line =~ /^set *\( *PROJECT_VERSION_EXTENSION\b.*\) *$/) { - $line = sprintf("set(PROJECT_VERSION_EXTENSION \"%s\")\n", $cmake_package_string); + } elsif ($line =~ /^set *\( *PROJECT_VERSION_EXTENSION\b.*\) *([\r\n]+)$/) { + $line = sprintf("set(PROJECT_VERSION_EXTENSION \"%s\")$1", $cmake_package_string); } $contents .= $line } |