aboutsummaryrefslogtreecommitdiffstats
path: root/make-version.pl
AgeCommit message (Collapse)AuthorFilesLines
2017-06-022.3.0 → 2.5.0.Gerald Combs1-1/+1
Change-Id: I83ecbff82b23702f40ce1bae45be23e3336ff2c4 Reviewed-on: https://code.wireshark.org/review/21905 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-01-05More make-version.pl fixups.Gerald Combs1-13/+14
Don't add extra \n's. Change ".*([\r\n]+)$" matches to ".*?([\r\n]+)$" so that we don't greedily match the wrong line ending. Change-Id: I916ee49207eaac17e1e4c4f677558f7be13a099a Reviewed-on: https://code.wireshark.org/review/19541 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-01-02make-version.pl: Fixup library version updates.Gerald Combs1-4/+4
When updating {epan,wiretap}/{Makefile.am,CMakeLists.txt} make sure we use an absolute path to each file and that we preserve the file's line ending style. Change-Id: Iee62a3ef8e89ca1ddae2569df62025805ee9a238 Reviewed-on: https://code.wireshark.org/review/19508 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-11-25Fix git description for out-of-tree builds from a tarballPetr Sumbera1-3/+5
version.conf is to be found in the source dir after unpacking. Bug: 13163 Change-Id: Ib8308e341b771d991ab48b48553f8d92b0b0621c Reviewed-on: https://code.wireshark.org/review/18923 Reviewed-by: João Valverde <j@v6e.pt> Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-11AsciiDoc: Create an include file for attributes.Gerald Combs1-9/+9
Move the replacement definitions in asciidoc.conf to attributes.asciidoc. This makes the markup a bit cleaner and is more compatible with AsciiDoctor. Use a standard naming scheme for URLs. Change-Id: Ica73aaadb013be2a4e6a3963fb54e6db6e02e98f Reviewed-on: https://code.wireshark.org/review/18655 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-11-03autotools: propagate git version info to distribution tarballPeter Wu1-8/+21
Store the git describe output in the distribution tarball (make dist) and ensure that this version is always used for builds from this tarball. This will prevent the useless "Git Rev Unknown from unknown" output in tar-based builds. It will also prevent git from being invoked in tarball builds. Remove the git branch name since the commit ID (and git tag) in the git describe output is sufficient to identify the source tree. (In SVN, a revision ID had to be paired with a branch name to identify the source tree, in git this is no longer the case.) Change-Id: Iffe142b6efd81e857802eb604d6310cfd301d207 Reviewed-on: https://code.wireshark.org/review/18415 Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2016-11-02make-version.pl: fix --print-vcs outputPeter Wu1-13/+17
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@v6e.pt> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-28make-version: Clean up handling of VCSVERSIONJoão Valverde1-17/+8
Change-Id: If8228267da4a9290f5abf99c5ac518c3dec0a283 Reviewed-on: https://code.wireshark.org/review/18443 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-08-14make-version.pl: make it work with git worktreesPeter Wu1-2/+2
When using git worktrees, the .git file is a regular file pointing to the original git repository. Accept this case too. Also ignore the fact that the original repo could be a git-svn repo, that is very unlikely. Example workflow (requires git 2.5): # Assume work in progress in current tree. Goal is to quickly do a # fix in another branch and publish the changes without interfering # with the WIP and without marking all files out of date (which # slows down re-compilation). git worktree add /tmp/wireshark-2.2 master-2.2 pushd /tmp/wireshark-2.2 # go to temporary tree git cherry-pick -x COMMIT # backport the fix git review # submit for review popd # go back to original tree rm -rf /tmp/wireshark-2.2 && git worktree prune # cleanup # now continue working where you left work Change-Id: Iba3c723142d9cbd8b07e76647594b5699ecafc67 Reviewed-on: https://code.wireshark.org/review/17002 Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-212.1.2 → 2.3.0.Gerald Combs1-2/+2
Change-Id: I133af2d3d05ae77c1030cf35812bb1f969f6a68b Reviewed-on: https://code.wireshark.org/review/16575 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-07-14More 2.1.1 → 2.1.2 changesPascal Quantin1-1/+1
Change-Id: If1a7f1232bbb23b27063d4ef618c2059293ff0c4 Reviewed-on: https://code.wireshark.org/review/16441 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-07-142.1.1 → 2.1.2.Gerald Combs1-4/+4
Change-Id: If03589159cbf7c1a0de97fd50edd06d1cd0e63bd Reviewed-on: https://code.wireshark.org/review/16440 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-07-14Build 2.1.1.Gerald Combs1-4/+4
Change-Id: I2895d29415bb191bf2d7fc0a4468f085085bd4d9 Reviewed-on: https://code.wireshark.org/review/16437 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-06-15Remove Nmake build systemPascal Quantin1-57/+5
Change-Id: I3bd474f3cda9667dec66426b5729449953df3e61 Reviewed-on: https://code.wireshark.org/review/15777 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jörg Mayer <jmayer@loplof.de> Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2016-06-12CMake: Make PROJECT_VERSION_EXTENSION code simplerJoão Valverde1-5/+2
The intent was to allow all sorts of overrides but, ugly. I don't think we need $cmake_package_string either, at least with these changes. Follow-up to 7c6e859ccf210a45e1cc0f6da17692845e6b5a23. (And bdec712166ba924a2cdeaaca8ae580c343eaf02c). Change-Id: I808b6bd3a3c64d2a67165344e8fe23e8314c27db Reviewed-on: https://code.wireshark.org/review/15835 Reviewed-by: João Valverde <j@v6e.pt>
2016-06-082.1.0 → 2.1.1.Gerald Combs1-5/+5
Change-Id: Ib8aab341be406d3c6e9139ae670489bd9e3edcc5 Reviewed-on: https://code.wireshark.org/review/15785 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-06-08Build 2.1.0.Gerald Combs1-4/+4
Change-Id: I3fe4a2bc580b5788462f832abf62b53afb5d8ae1 Reviewed-on: https://code.wireshark.org/review/15782 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-06-08Switch some AsciiDoc replacements to attributes.Gerald Combs1-2/+2
Many of our AsciiDoc "macros" are simple string replacements. Start converting them to attributes. Update the release notes. Change-Id: I23d9ffd311f13a34c16cde3b4898b7f7bb8ba638 Reviewed-on: https://code.wireshark.org/review/15778 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-04-29make-version.pl: Preserve line endings.Gerald Combs1-2/+2
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>
2016-04-29Print version variables in make-version.plGerald Combs1-2/+7
Print our various version variables when we set versions. Change-Id: I9212369c17f3d2a040e83900945eb57670d4992d Reviewed-on: https://code.wireshark.org/review/15156 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-04-28Execute svn info in the sourcedirAndersBroman1-1/+1
Change-Id: I6b77c919e92af83c48bf02c49d865523f0a97d83 Reviewed-on: https://code.wireshark.org/review/15141 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-21Add "-git" tag to versionJoão Valverde1-4/+4
Add a static "-git" extra version tag for VCS snapshot builds, to be replaced when running 'make-version -r'. Change-Id: If29fca04029ed3129aa2332492dc536091049955 Reviewed-on: https://code.wireshark.org/review/15032 Reviewed-by: João Valverde <j@v6e.pt>
2016-04-21Add option to disable version.hJoão Valverde1-2/+21
If the file '.git/wireshark-disable-versioning' exists then version.h will be commented out. Change-Id: If481b673463408a69c2ecf7c2e66d08c5855537f Reviewed-on: https://code.wireshark.org/review/14932 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-04-17Move $set_version tests to update_versioned_files().Guy Harris1-12/+6
That makes it clearer what of the stuff we do for -v is also done, and what of it is not done, for -r. Change-Id: I23e8e8510f879e7430d2387a772691530fbd2f46 Reviewed-on: https://code.wireshark.org/review/14965 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-04-17Another help message update.Guy Harris1-1/+1
Change-Id: I017a11e03ac705b3fe24c34b70105c51c4e18a49 Reviewed-on: https://code.wireshark.org/review/14962 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-04-17Update the help message to reflect current reality.Guy Harris1-5/+9
Replace tabs with spaces in that message while we're at it. Change-Id: I33354e6d1c3b4a6bbba232fe2270a5a6728cc889 Reviewed-on: https://code.wireshark.org/review/14960 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-29make-version: Don't emit one common warning to stderrJoão Valverde1-1/+3
git rev-parse @{upstream} will (obviously) fail if there is no upstream set for the current branch. This is fairly common and not problematic. Don't emit an error message to stderr when it fails. Change-Id: I4989fb19b25fefff83335061151e360c78652e88 Reviewed-on: https://code.wireshark.org/review/14151 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-02-04make-version: Silence one diagnostic message with a verbose optionJoão Valverde1-3/+10
Change-Id: If8b9d7e356ebfe2cbb263a4cb67b18bafdd1b8ee Reviewed-on: https://code.wireshark.org/review/13690 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-27Allow make-version.pl to use git when missing from pathChristian Tellefsen1-7/+15
This change allows make-version.pl to run correctly on Windows without having the git binary dir in PATH. This prevents problems when installing "Git for Windows" with default settings (git only available via the bundled shell (bash). Details: * Add Git to the list of packages to be looked up by CMake. * If Git is found by CMake, pass the full path to make-version.pl * make-version.pl: Test whether git is available, and display a warning if git is missing. On Unix-type systems this should have no impact. Tested on Windows Server 2012 R2 and Ubuntu 15.04. Change-Id: I7f7be2035c262658801586cb24c82b912848e31d Reviewed-on: https://code.wireshark.org/review/13111 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-11-22Quote the source directory in Git commands.Guy Harris1-3/+3
It may contain spaces (it does on my Windows 7 VM), so it must be quoted. (There are probably other places where it needs to be quoted in this script.) Change-Id: If363691b0f94bbe75755072fd5245266566c3360 Reviewed-on: https://code.wireshark.org/review/12043 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-19make-version.pl: no need for git-ls-remotePeter Wu1-13/+8
In subversion, the URL was needed to find the branch. This is not needed for git where a 'git branch' command suffices. Remove the unused URL handling from git, this fixes a warning during cmake on RHEL6 and avoids a fallback to SVN: Version configuration file version.conf not found. Using defaults. usage: git ls-remote [--heads] [--tags] [-u <exec> | --upload-pack <exec>] <repository> <refs>... Unable to open ./.svn/entries #define VCSVERSION "v2.1.0rc0-69-g2eb7e87" #define VCSBRANCH "master" Print the SVN warning to stderr, this avoids a compilation failure due to a syntax error in version.h. Change-Id: Idb28e74b7a9bf592686b45349cf5e81f85f6c358 Reviewed-on: https://code.wireshark.org/review/11041 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-19Don't fallback to thinking we have SVN; say Git if we didn't find a VCS.Jeff Morriss1-2/+4
The 2.0.0rc0 Gtk+ GUI, when built from a source tarball, currently puts the version in the title bar with the string "SVN Rev Unknown". This changes it to say "Git Rev Unknown". (I think there's a Better Way but that will come later.) Change-Id: I04c903f20554cf681bac09a51a3ef46bb41696f1 Reviewed-on: https://code.wireshark.org/review/10984 Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-05Initialize 2.1.Gerald Combs1-3/+3
Change-Id: I515c53bb56cf82d1911b58f2cb2103afd0e597a5 Reviewed-on: https://code.wireshark.org/review/10810 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-09-021.99.9 → 1.99.10.Gerald Combs1-5/+5
Change-Id: I924be5b0e3c73a0bb8ae1361fa518ec10139e13d Reviewed-on: https://code.wireshark.org/review/10363 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-09-02Build 1.99.9.Gerald Combs1-4/+4
Change-Id: I6892f8ae21e927a6ab9281d952b96a54da94781e Reviewed-on: https://code.wireshark.org/review/10358 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-08-26cmake: rework version.h handling to treat it like config.hJoerg Mayer1-5/+17
It wasn't working on my system: I kept seeing the old git revision in '...shark -v' even after deleting version.h Change-Id: I75f41a7afcee4b9384f33a56014e4af6b527fec5 Reviewed-on: https://code.wireshark.org/review/10265 Petri-Dish: Jörg Mayer <jmayer@loplof.de> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-07-241.99.8 → 1.99.9.Gerald Combs1-5/+5
Change-Id: I014399c332136a10b1c560d4c68be5b8bab97552 Reviewed-on: https://code.wireshark.org/review/9780 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-24Build 1.99.8.Gerald Combs1-4/+4
Change-Id: I30b5797579335e414295be3996878a30aaef7d6b Reviewed-on: https://code.wireshark.org/review/9772 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-181.99.7 → 1.99.8Gerald Combs1-5/+5
Change-Id: I3423fd2959b1031480f15504ce38336ce3475b17 Reviewed-on: https://code.wireshark.org/review/8979 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-18Build 1.99.7.Gerald Combs1-4/+4
Change-Id: Ia990ad2c9a56ef41b1ed82509afe18079bdc451f Reviewed-on: https://code.wireshark.org/review/8978 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-281.99.6 → 1.99.7.Gerald Combs1-5/+5
Change-Id: I8c431f162d199c8507ba57d84e496dce5f5a0933 Reviewed-on: https://code.wireshark.org/review/8677 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-28Build 1.99.6.Gerald Combs1-4/+4
Change-Id: I8db40aea6c208d0badfc7d178b642328264e6c10 Reviewed-on: https://code.wireshark.org/review/8676 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-201.99.5 → 1.99.6.Gerald Combs1-5/+5
Change-Id: Iff642606bdb9858dc54b90abe02bf1572f44fc25 Reviewed-on: https://code.wireshark.org/review/7766 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-19Build 1.99.5.Gerald Combs1-4/+4
Change-Id: I50505b48db1f14523f36a19a5e8232caff1e712a Reviewed-on: https://code.wireshark.org/review/7765 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-191.99.4 → 1.99.5.Gerald Combs1-5/+5
Change-Id: Ifa1a57ac2db5d921d9b53dbe997cfa1916720c26 Reviewed-on: https://code.wireshark.org/review/7759 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-19Build 1.99.4.Gerald Combs1-4/+4
Change-Id: Id2d98cc5def03fd54d69c54db4565c6ecd27c552 Reviewed-on: https://code.wireshark.org/review/7755 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-12CMake: Add a top-level nsis_package target.Gerald Combs1-1/+4
Add packaging/nsis/CMakeLists.txt and use it to generate each NSIS include file. Add macros to generate packaging-related targets and invoke them from the top-level CMakeLists.txt. Add a top-level "plugins" target. Copy plugins to "plugins" in each of our staging directories instead of "plugins/$VERSION". Add missing files to the copy_data_files and copy_cli_dlls targets. Add all files in the NSIS package from the staging directory. Drop a bunch of no-longer-needed defines, e.g. MSVC_VARIANT. Change-Id: Ib1079260d164c65118050f1431af8e582cd577fa Reviewed-on: https://code.wireshark.org/review/6459 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-051.99.3 → 1.99.4.Gerald Combs1-5/+5
Change-Id: I96953b6ca34140972a783c3066614399981ca1e2 Reviewed-on: https://code.wireshark.org/review/7549 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-05Build 1.99.3.Gerald Combs1-4/+4
Change-Id: Ibf1ee5a11adb907c0d749763117fe291d92c47c7 Reviewed-on: https://code.wireshark.org/review/7548 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-04Add CMake SOVERSIONs to make-version.pl.Gerald Combs1-2/+34
Change-Id: Ifd011288ca23263738ca50842d59a23cc25e7952 Reviewed-on: https://code.wireshark.org/review/7532 Reviewed-by: Gerald Combs <gerald@wireshark.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-23 20:15:31 +0000