Commit Graph

74 Commits

Author SHA1 Message Date
Anders Broman f8467706ac From Michael Mann:
Make it possible to use TortoiseSVN's SubWCRev.exe to update svnversion.h

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5441

svn path=/trunk/; revision=39842
2011-11-15 07:12:19 +00:00
Gerald Combs 2798ad267a 1.7.0 → 1.7.1.
svn path=/trunk/; revision=39769
2011-11-08 22:35:56 +00:00
Gerald Combs 4fe9563e74 Build 1.7.0.
svn path=/trunk/; revision=39768
2011-11-08 20:02:06 +00:00
Jeff Morriss 14ab9387c1 Revert rev 38340 (which was itself a reversion of 34807): if we can't find the
SVN version, indicate that the SVN version is unknown.  This puts back the fix
for bug 1413.

Add a new version.conf option for make-version which tell is "this is a build
from a release tarball."  When that option is present do not try to use SVN
to determine the SVN version, just use whatever SVN information shipped in the
tarball.

If version.conf is present in the source tree (as it is only in the release
branches), deliver it in the source tarball but only after setting the "this
is a release tarball" option.


All of this means that that builds from release-branch tarballs will report
the SVN version of the release tarball rather than "unknown."  This addresses
the issue reported in
http://ask.wireshark.org/questions/5376/wireshark-161-title-shows-svn-rev-unknown-from-unknown

Builds from trunk (including the source tarballs) will continue to report that
the SVN version is unknown.  (Maybe that, too, should be changed?)

svn path=/trunk/; revision=38933
2011-09-08 01:53:41 +00:00
Stig Bjørlykke 603d7b9cf1 Fetch svn revision using git-svn also when building out-of-tree.
svn path=/trunk/; revision=38875
2011-09-03 14:21:07 +00:00
Chris Maynard 78ef4cdd88 Don't report svn version if not building from svn. Change prompted by http://ask.wireshark.org/questions/5376/wireshark-161-title-shows-svn-rev-unknown-from-unknown.
svn path=/trunk/; revision=38340
2011-08-04 20:20:51 +00:00
Stig Bjørlykke 7bd8379896 Fetch svn revision also when checked out with git-svn.
svn path=/trunk/; revision=37895
2011-07-04 21:14:43 +00:00
Gerald Combs d7d45f8072 1.5.1 → 1.5.2. Reenable Babel.
svn path=/trunk/; revision=36540
2011-04-10 17:03:43 +00:00
Gerald Combs 8b8082442d Build 1.5.1. Temporarily disable the Babel dissector.
svn path=/trunk/; revision=36537
2011-04-10 16:42:10 +00:00
Gerald Combs 1635ef0ddf 1.5.0 → 1.5.1.
svn path=/trunk/; revision=35639
2011-01-24 19:27:38 +00:00
Gerald Combs ee8a2da6a9 Build 1.5.0.
svn path=/trunk/; revision=35637
2011-01-24 18:37:24 +00:00
Chris Maynard ad78dfe2c0 If svn not found, print "Unknown" revision message.
svn path=/trunk/; revision=34807
2010-11-08 17:10:35 +00:00
Gerald Combs e535271512 1.3.5 -> 1.3.6.
svn path=/trunk/; revision=32667
2010-05-05 00:28:24 +00:00
Gerald Combs cfa07ad505 Build 1.3.5.
svn path=/trunk/; revision=32666
2010-05-04 23:03:42 +00:00
Gerald Combs ab71d9d92b 1.3.4 -> 1.3.5.
svn path=/trunk/; revision=32345
2010-03-31 22:54:07 +00:00
Gerald Combs 5968d5220a Build 1.3.4.
svn path=/trunk/; revision=32340
2010-03-31 16:29:45 +00:00
Gerald Combs 7e9faae9d9 1.3.3 -> 1.3.4.
svn path=/trunk/; revision=31865
2010-02-11 16:38:42 +00:00
Gerald Combs 71913d2700 Build 1.3.3.
svn path=/trunk/; revision=31860
2010-02-10 22:53:43 +00:00
Stig Bjørlykke 229d8368bc Set correct locale in make-version.pl instead of in Makefiles.
Added back add_custom_command for svnversion.h.
Removed unnecessary text2pcap_CLEAN_FILES.
Fix indent for ps.c command.

svn path=/trunk/; revision=31525
2010-01-14 15:43:33 +00:00
Stig Bjørlykke a33f717f89 Compare both lines in svnversion.h when checking for update needed.
svn path=/trunk/; revision=31454
2010-01-06 12:24:38 +00:00
Gerald Combs f08e18e9a5 Switch back to normal versioning. Bump the version to 1.3.3.
svn path=/trunk/; revision=31064
2009-11-24 05:57:05 +00:00
Gerald Combs 2076b90455 Build 1.3.2.
svn path=/trunk/; revision=31063
2009-11-24 05:53:36 +00:00
Gerald Combs bcebc020ed Switch back to normal versioning.
svn path=/trunk/; revision=30733
2009-10-27 19:36:31 +00:00
Gerald Combs ef952d025f Build 1.3.1.
svn path=/trunk/; revision=30724
2009-10-27 00:10:52 +00:00
Gerald Combs 5836a7975f Switch back to normal versioning.
svn path=/trunk/; revision=29923
2009-09-15 15:46:44 +00:00
Gerald Combs c7b0b40c9b Build 1.3.0.
svn path=/trunk/; revision=29912
2009-09-14 23:31:02 +00:00
Gerald Combs d574a2450b Don't exit with an error if we can't find the svn executable.
svn path=/trunk/; revision=29288
2009-08-04 00:35:30 +00:00
Gerald Combs 1e93d53b56 Use "svn info" to fetch the version by default. Fetch the repository path as
well. Add the repository path to the version strings.

svn path=/trunk/; revision=29171
2009-07-22 23:59:15 +00:00
Gerald Combs 1c3e3a4a53 Switch back to 1.1.4.
svn path=/trunk/; revision=27810
2009-03-20 23:15:15 +00:00
Gerald Combs ecd732384c Temporarily switch back to building 1.1.3 final.
svn path=/trunk/; revision=27807
2009-03-20 16:17:02 +00:00
Gerald Combs 2d24475011 Move to 1.1.4.
svn path=/trunk/; revision=27767
2009-03-18 05:42:03 +00:00
Gerald Combs 86ea84d2e4 Build 1.1.3.
svn path=/trunk/; revision=27765
2009-03-17 23:26:55 +00:00
Gerald Combs 414d042d2e Change the version to 1.1.3. SVN-stamp the version again.
svn path=/trunk/; revision=27252
2009-01-16 22:35:14 +00:00
Gerald Combs 8c6b59cf9c Build 1.1.2.
svn path=/trunk/; revision=27235
2009-01-15 01:37:52 +00:00
Jaap Keuter 02654c2b4b Clear up the code.
svn path=/trunk/; revision=27111
2008-12-24 16:08:54 +00:00
Gerald Combs 193ad40a59 Switch back to 1.1.2.
svn path=/trunk/; revision=26392
2008-10-09 05:07:24 +00:00
Gerald Combs 57a1c7be61 Try for another 1.1.1 development release.
svn path=/trunk/; revision=26374
2008-10-07 21:29:25 +00:00
Gerald Combs 2ed9fdf00e Switch back to normal versioning. Bump the development version to 1.1.2.
svn path=/trunk/; revision=26259
2008-09-24 03:29:21 +00:00
Gerald Combs 854aa68d8a Build 1.1.1.
svn path=/trunk/; revision=26256
2008-09-23 21:05:00 +00:00
Gerald Combs 6ee6bc0460 Make SVN-stamped versions the default again.
svn path=/trunk/; revision=26171
2008-09-09 23:57:02 +00:00
Gerald Combs e953bf064a Fix U3 packaging. Build 1.1.0 again in order to pick up the new GLib/GTK+
libraries.

svn path=/trunk/; revision=26168
2008-09-09 17:16:41 +00:00
Gerald Combs be3b7d470f Make SVN-stamped versions the default again.
svn path=/trunk/; revision=26137
2008-09-04 20:10:22 +00:00
Gerald Combs 56c7f5b643 Move the trunk to 1.1.0. Temporarily build a non-SVN-stamped package, so
that we can build 1.1.0 packages.

svn path=/trunk/; revision=26136
2008-09-04 19:37:16 +00:00
Gerald Combs 38d6dc43a4 Fix a logic problem.
svn path=/trunk/; revision=25592
2008-06-24 20:54:38 +00:00
Gerald Combs d5de78acd1 Copy over r25535 from /trunk-1.0: When we're run with -p, set
VERSION_BUILD no matter what.

svn path=/trunk/; revision=25552
2008-06-23 21:07:37 +00:00
Gerald Combs e9a197ee94 Have autoconf generate "ustar" tar files by default. This should let us have
paths longer than 99 characters.

svn path=/trunk/; revision=25232
2008-05-05 17:03:22 +00:00
Gerald Combs 7abeb02747 If we have an SVN revision number, use it as the build number under Windows
instead of "0".

svn path=/trunk/; revision=24376
2008-02-18 18:08:14 +00:00
Jörg Mayer 48537a7a65 Next try.
svn path=/trunk/; revision=23749
2007-12-04 11:00:13 +00:00
Jörg Mayer 6f343baf07 Fix for http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1413
Print "SVN Rev unknown" in case the svn command was not found.

svn path=/trunk/; revision=23739
2007-12-04 03:48:05 +00:00
Bill Meier 1d23f6fd83 Handle case of source-dir != build-dir; 2 other minor bug fixes
svn path=/trunk/; revision=22590
2007-08-22 19:36:49 +00:00