Wireshark · Wireshark-commits: [Wireshark-commits] master 1f2f253: make-version.pl updates.

[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=1f2f25342482a4c474809dc61d4d2b4ef74d1619
Submitter: "Gerald Combs <gerald@xxxxxxxxxxxxx>"
Changed: branch: master
Repository: wireshark

Commits:

1f2f253 by Gerald Combs (gerald@xxxxxxxxxxxxx):

    make-version.pl updates.
    
    Read our major, minor, and micro versions from CMakeLists.txt.
    
    Add the ability to set our extra version information differently if our
    Git commit is tagged or untagged. Change our extra version placeholder
    from "%#" to "{vcsinfo}".
    
    Add --tagged-version-extra (-t) and --untagged-version-extra (-u)
    arguments for specifying the tagged and untagged extra formats. Add
    --force-extra (-f) so that we can force one format or the other.
    
    Require the major.minor.micro version to be specified when using
    --set-version (-v).
    
    Update appveyor.yml and the Developer's Guide to match the new behavior.
    
    Change-Id: I6e5d55470aff7e7c61e75f208e24c4105276905a
    Reviewed-on: https://code.wireshark.org/review/31479
    Petri-Dish: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    

Actions performed:

    from  8348b7b   NR-RRC: upgrade dissector to v15.4.0
     add  1f2f253   make-version.pl updates.


Summary of changes:
 appveyor.yml                                   |   4 +-
 docbook/wsdg_src/WSDG_chapter_sources.asciidoc |  18 +-
 tools/make-version.pl                          | 337 ++++++++++++++-----------
 3 files changed, 198 insertions(+), 161 deletions(-)