Wireshark-commits: [Wireshark-commits] master-2.2 8b87a52: make-version.pl: fix --print-vcs output

Date Prev · Date Next · Thread Prev · Thread Next
Date Index · Thread Index · Other Months · All Mailing Lists
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Wed, 2 Nov 2016 15:30:17 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=8b87a5263cbcc5ef28046ba1e5b10ecc58d4695e
Submitter: João Valverde (j@xxxxxx)
Changed: branch: master-2.2
Repository: wireshark

Commits:

8b87a52 by Peter Wu (peter@xxxxxxxxxxxxx):

    make-version.pl: fix --print-vcs output
    
    Detect earlier whether to write VCSVERSION to version.h such that the
    --vcs-version output matches the contents of version.h.
    
    Change-Id: I5c05087679bb7861cd5884426b39fa362bf23a16
    Fixes: v2.1.0rc0-2770-geeded81 ("Add option to disable version.h")
    Reviewed-on: https://code.wireshark.org/review/18599
    Reviewed-by: João Valverde <j@xxxxxx>
    Petri-Dish: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    (cherry picked from commit 27bd013970476b21ab55ff67eda88cd3228860fe)
    Reviewed-on: https://code.wireshark.org/review/18628
    

Actions performed:

    from  43a324e   make-version: Clean up handling of VCSVERSION
    adds  8b87a52   make-version.pl: fix --print-vcs output


Summary of changes:
 make-version.pl |   30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)