diff options
| author | Gerald Combs <gerald@wireshark.org> | 2019-01-10 09:22:45 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2019-01-15 19:20:27 +0000 |
| commit | 1f2f25342482a4c474809dc61d4d2b4ef74d1619 (patch) | |
| tree | 06e168e456badab4d8d66e5874803582824c8eee /appveyor.yml | |
| parent | 8348b7bf5bb03733864907b265edd1000f86f2fe (diff) | |
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@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'appveyor.yml')
| -rw-r--r-- | appveyor.yml | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/appveyor.yml b/appveyor.yml index ea3b19230b..349618086d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -41,9 +41,7 @@ build: project: build\Wireshark.sln before_build: - # Write ASCII (not UTF-16). Cannot use cmd due to repeated '%' unescapes. - - ps: echo "pkg_format=-%#-AppVeyor" | Out-File -Encoding ASCII version.conf - - perl tools/make-version.pl --set-release + - perl tools/make-version.pl --set-release --untagged-version-extra=-{vcsinfo}-AppVeyor --tagged-version-extra=-AppVeyor - mkdir build - cd build - cmake -E time cmake -G "%CMAKE_GENERATOR%" .. |