aboutsummaryrefslogtreecommitdiffstats
path: root/make-version.pl
AgeCommit message (Collapse)AuthorFilesLines
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>
2015-02-04Don't clobber PROJECT_VERSION_EXTENSION.Gerald Combs1-1/+4
PROJECT_VERSION_EXTENSION was updated to match g528a857 config.nmake. Try to preserve it if it's set. Change-Id: I48edfcd149ef5adafff7ece68e0d43a9cdec0b59 Reviewed-on: https://code.wireshark.org/review/6957 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-041.99.2 → 1.99.3.Gerald Combs1-5/+5
Change-Id: Id03d0243f20b33873a92be7444b61952d0b18638 Reviewed-on: https://code.wireshark.org/review/6956 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-04Build 1.99.2.Gerald Combs1-4/+4
Change-Id: If4a4fb9009da61bd67a8577f17c9e0dedcb6de6d Reviewed-on: https://code.wireshark.org/review/6955 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-25Update another comment to reflect reality.Guy Harris1-2/+1
Change-Id: I9747b746ed7c38ed3aa78f19ae20b61e142b94cc Reviewed-on: https://code.wireshark.org/review/6785 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-25Update a comment to reflect reality.Guy Harris1-1/+2
Change-Id: I6376ce5eab43443314e73116161a24111f8c46d7 Reviewed-on: https://code.wireshark.org/review/6784 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-25Remove some references to SVN.Guy Harris1-10/+10
Rename the --get-svn and --set-svn options to --get-vcs and --set-vcs; continue to support --get-svn and --set-svn as aliases, for backwards compatibility. Change variable names as well. Change-Id: If25d81dae747f9825f7e3e5e937749f078f63d27 Reviewed-on: https://code.wireshark.org/review/6783 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-25Replace "GIT" with "VCS" in make-version.pl and files it manipulates.Guy Harris1-18/+18
That makes it more VCS-neutral - apparently some people maintain private versions under VCSes other than Git, and make-version.pl still handles those VCSes. Change-Id: Ie4914b16fea8ce800582729260c5e9b9cf1111f4 Reviewed-on: https://code.wireshark.org/review/6779 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-25Don't say "Git Rev" if the VCS being used isn't Git.Guy Harris1-2/+7
Change-Id: Ibd298b9665214e8af137a05ffb0c0aee67af91bf Reviewed-on: https://code.wireshark.org/review/6777 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-25Get rid of unused is_release preference.Guy Harris1-1/+0
Change-Id: I458f1d398b4eb566dd73e879ea3236a4de67da63 Reviewed-on: https://code.wireshark.org/review/6776 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-25Update some comments to reflect reality.Guy Harris1-11/+14
Change-Id: I230e3914bcd902dd481b59637f5ea21afc496978 Reviewed-on: https://code.wireshark.org/review/6775 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-10make-version.pl updates.Gerald Combs1-30/+41
Set the version variables in CMakeLists.txt directly from make-version.pl instead of pulling them from configure.ac. Use the correct default value for VERSION_EXTRA in config.nmake. wireshark-common.files was removed in g97e1491. We don't need to update it any more. Change-Id: I751b6df9ac16e19090712aa79a68e308397c1d25 Reviewed-on: https://code.wireshark.org/review/6483 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-101.99.1 → 1.99.2.Gerald Combs1-5/+5
Change-Id: Ie2e9e81ce1b1d876ae550fc0c17c4367aaa35d98 Reviewed-on: https://code.wireshark.org/review/5705 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-10Build 1.99.1.Gerald Combs1-4/+4
Change-Id: Ic6dcbfc880817ad4bcc07a21ec88d14c8c92df58 Reviewed-on: https://code.wireshark.org/review/5703 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-071.99.0 → 1.99.1.Gerald Combs1-5/+5
Change-Id: I8580be0bfe88e33df333f0397f51762f4af819f6 Reviewed-on: https://code.wireshark.org/review/4532 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-07Build 1.99.0.Gerald Combs1-4/+4
Change-Id: Idc813297e5e27680b13a6b81adcf18ae4ef4d4e4 Reviewed-on: https://code.wireshark.org/review/4523 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-04Rip out the filetap codeEvan Huus1-3/+3
We decided at sharkfest that this wasn't the right design for file dissection; we have more-or-less settled on way forward, but nobody's shown interest in implementing it. Whether or not that ever happens, this code is effectively dead and should be removed. Change-Id: I14d6086df3204fffb6485228db39d9f407661417 Reviewed-on: https://code.wireshark.org/review/3400 Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-15Add missing --git-dir=$srcdir/.git for ls-remoteStig Bjørlykke1-1/+1
Change-Id: I848b80cd8126d93cbf3ce02a333345f4ea6b4e92 Reviewed-on: https://code.wireshark.org/review/2231 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-06-13Fix package version stamping.Gerald Combs1-1/+1
Change-Id: I1615364071563c4f56b071d7d68e4660dd989296 Reviewed-on: https://code.wireshark.org/review/2198 Reviewed-by: Gerald Combs <gerald@wireshark.org> (cherry picked from commit fd017eeae358fbcbb3f51f2765bd31777aa513d1) Reviewed-on: https://code.wireshark.org/review/2201
2014-06-12From Gisle Vanem on -dev: don't print modelines info when run with -h.Jeff Morriss1-1/+3
Also remove trailing white space. Change-Id: Ic56140f617a2cbf9fa93fb427282eab0b6cff9c6 Reviewed-on: https://code.wireshark.org/review/2113 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-231.11.4 → 1.99.0.Gerald Combs1-2/+2
Change-Id: I5b0f713fdbc63e78f4f52177317c0e536aca3044 Reviewed-on: https://code.wireshark.org/review/1761 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-04-151.11.3 → 1.11.4.Gerald Combs1-5/+5
Change-Id: I0bf8792b9b524ae4d8e1022b234e2510972c7019 Reviewed-on: https://code.wireshark.org/review/1154 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-04-15Build 1.11.3.Gerald Combs1-4/+4
Change-Id: I8c8f1c22a2cba97e69b27e5fb0b4de9981668966 Reviewed-on: https://code.wireshark.org/review/1153 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-04-14Pull in some changes from master-1.10/make-version.pl.Gerald Combs1-19/+11
Matches versioning behavior in stable branches. Change-Id: Ic4d451e7e9941b65d24a76bfaf57de2b4fb58239 Reviewed-on: https://code.wireshark.org/review/1124 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte1-2/+0
(Using sed : sed -i '/^\# \$Id\$/,+1 d') (start with dash) Change-Id: Ia4b5a6c2302f6a531f6a86c1ec3a2f8205c8c2dd Reviewed-on: https://code.wireshark.org/review/881 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-02-08"origin" appears to be a safer bet than "@{upstream}".Gerald Combs1-2/+2
Change-Id: Icd00c62d9b908771bf2b73b8e5b49d519570ff8b Reviewed-on: https://code.wireshark.org/review/142 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-02-07Replace "svn" with "git" all over the place.Gerald Combs1-57/+65
Rename "SVNPATH" to "GITBRANCH" since that seems more appropriate. Rename "svnversion.h" to "version.h" as Evan suggested. Update some URLs. In make-version.pl, make sure we don't set an improper upstream branch name. Use the number of commits + short hash from `git describe` for package names by default. Change-Id: I922bba8d83eabdf49284a119f55b4076bc469b96 Reviewed-on: https://code.wireshark.org/review/139 Reviewed-by: Gerald Combs <gerald@wireshark.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 20:47:35 +0000