aboutsummaryrefslogtreecommitdiffstats
path: root/make-version.pl
AgeCommit message (Collapse)AuthorFilesLines
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>
2014-02-05use the right src dir in git command for svnversion.hdidier1-5/+5
make-version.pl wasn't using the right source dir for git commands when not compiling from inside source tree. add --git-dir=$srcdir/.git parameter. Change-Id: I45ca4874d96abaed1c559c022d0ace66239652c8 Reviewed-on: https://code.wireshark.org/review/122 Reviewed-by: Evan Huus <eapache@gmail.com> Tested-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-01-29We have a usable tag now. There's no need to fake a version number.Gerald Combs1-8/+2
Change-Id: Ic6a704013b38e9be130be40098e9293e9196bfec
2014-01-15Make it more clear that we're faking a git description for now.Gerald Combs1-0/+1
svn path=/trunk/; revision=54810
2014-01-15Copy over recent changes from trunk-1.8 along with some localGerald Combs1-5/+83
modifications. ------------------------------------------------------------------------ r54807 | gerald | 2014-01-14 16:35:34 -0800 (Tue, 14 Jan 2014) | 2 lines Start using the output of 'git describe'. ------------------------------------------------------------------------ r54805 | gerald | 2014-01-14 15:38:16 -0800 (Tue, 14 Jan 2014) | 2 lines Start adding support for plain git. ------------------------------------------------------------------------ svn path=/trunk/; revision=54809
2014-01-08TFShark (Terminal Fileshark) v.001. Bug 9607 ↵Michael Mann1-3/+3
(https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9607) This is a VERY PRELIMINARY version of tfshark. It's an attempt to jumpstart FileShark and its architecture. Right now it's mostly just a very stripped down version of tshark with all of the necessary build modifications (including now building filetap library since tfshark depends on it) This code has helped me identify what I believe to be all of the necessary layers for a complete fileshark architecture. And those layers will slowly be added in time (patches always welcome!). svn path=/trunk/; revision=54646
2013-11-181.11.2 → 1.11.3.Gerald Combs1-5/+5
svn path=/trunk/; revision=53412
2013-11-18Build 1.11.2.Gerald Combs1-4/+4
svn path=/trunk/; revision=53411
2013-11-151.11.1 → 1.11.2.Gerald Combs1-5/+5
svn path=/trunk/; revision=53346
2013-11-15Build 1.11.1.Gerald Combs1-4/+4
svn path=/trunk/; revision=53344
2013-10-151.11.0 → 1.11.1.Gerald Combs1-5/+5
svn path=/trunk/; revision=52629
2013-10-15Try building 1.11.0.Gerald Combs1-4/+4
svn path=/trunk/; revision=52628
2013-08-28svn version 1.7.11 no longer has local .svn directories,Jörg Mayer1-1/+1
just one at the top level. So on my system, /trunk no longer contains a .svn directory. Check in parent directory as well. svn path=/trunk/; revision=51566
2013-04-221.9.3 → 1.11.0.Gerald Combs1-2/+2
svn path=/trunk/; revision=48972
2013-03-281.9.2 → 1.9.3.Gerald Combs1-6/+6
svn path=/trunk/; revision=48627
2013-03-28Build 1.9.2.Gerald Combs1-4/+4
svn path=/trunk/; revision=48625
2013-03-18Add a wireshark-version:[] replacement and --sort-and-group-- blockGerald Combs1-11/+11
definition to asciidoc.conf. Add support for asciidoc.conf to make-version.pl. Set some SVN keywords. Fill in the new protocol list. svn path=/trunk/; revision=48405
2013-03-121.9.1 → 1.9.2.Gerald Combs1-5/+5
svn path=/trunk/; revision=48271
2013-03-12Build 1.9.1.Gerald Combs1-4/+4
svn path=/trunk/; revision=48270
2013-02-201.9.0 → 1.9.1.Gerald Combs1-5/+5
svn path=/trunk/; revision=47771
2013-02-20Build 1.9.0.Gerald Combs1-4/+4
svn path=/trunk/; revision=47770
2013-02-10If we're using git, try pulling the SVN revision out of the commit body.Gerald Combs1-16/+23
svn path=/trunk/; revision=47619
2012-09-24Add back extra packaging information if it's present.Gerald Combs1-6/+8
svn path=/trunk/; revision=45112
2012-09-18Update configure.ac modifications to reflect r44986.Gerald Combs1-9/+7
svn path=/trunk/; revision=44990
2012-09-15Add support for bzr checkouts (similar to git checkouts) to make-version.pl.Evan Huus1-1/+35
Also, add modelines. svn path=/trunk/; revision=44920
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-28 05:20:31 +0000