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

Build 2.1.0, second try. 

Remove the "-git" version extra default in CMakeLists.txt and
configure.ac, otherwise we end up with wireshark-2.1.0-git.tar.bz2,
Wireshark-win64-2.1.0-git.exe, etc.

Change-Id: I89b9beaa87ac475950e24a3111cf09e878a33ff7
Reviewed-on: https://code.wireshark.org/review/15784
Reviewed-by: Gerald Combs <gerald@wireshark.org>
This commit is contained in:
Gerald Combs 2016-06-08 13:33:55 -07:00
parent b46351fb5d
commit 46f9217c25
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -186,7 +186,7 @@ if(NOT DEFINED PROJECT_VERSION_EXTENSION)
if (DEFINED ENV{WIRESHARK_VERSION_EXTRA})
set(PROJECT_VERSION_EXTENSION "$ENV{WIRESHARK_VERSION_EXTRA}")
else()
set(PROJECT_VERSION_EXTENSION "-git")
set(PROJECT_VERSION_EXTENSION "")
endif()
endif()

2
configure.ac
View File

@ -9,7 +9,7 @@ m4_define([version_major], [2])
m4_define([version_minor], [1])
m4_define([version_micro], [0])
dnl Updated by make-version.pl
m4_define([version_extra], [-git])
m4_define([version_extra], [])
m4_define([version_micro_extra], m4_join([], version_micro, version_extra))
AC_INIT(Wireshark, [version_major.version_minor.version_micro_extra], http://bugs.wireshark.org/, , http://www.wireshark.org/)