osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
42,873 Commits 26 Branches 0 Tags 795 MiB
Commit Graph

94 Commits

Author SHA1 Message Date
Gerald Combs 196dbce3d2 Add back extra packaging information if it's present. 
svn path=/trunk/; revision=45112
 2012-09-24 21:57:52 +00:00
Gerald Combs 52746c60a0 Update configure.ac modifications to reflect r44986. 
svn path=/trunk/; revision=44990
 2012-09-18 22:14:12 +00:00
Evan Huus 37f0380998 Add support for bzr checkouts (similar to git checkouts) to make-version.pl. 
Also, add modelines.

svn path=/trunk/; revision=44920
 2012-09-15 16:09:07 +00:00
Alexis La Goutte 8f4a2e5f28 Update svnversion.h with (short) SHA-1 commit id and branch when use git repository 
svn path=/trunk/; revision=44850
 2012-09-10 16:00:58 +00:00
Jörg Mayer fcb0307fae The name configure.in has been deprecated for many years. 
Use configure.ac instead.

svn path=/trunk/; revision=44630
 2012-08-23 11:11:24 +00:00
Gerald Combs 77883a8668 Don't clobber PACKAGE_URL or PACKAGE_BUGREPORT. 
svn path=/trunk/; revision=44523
 2012-08-15 17:31:48 +00:00
Gerald Combs f1cf70fc10 1.7.2 → 1.9.0. 
svn path=/trunk/; revision=43120
 2012-06-05 16:21:47 +00:00
Gerald Combs e5cd6c087e 1.7.1 → 1.7.2. 
svn path=/trunk/; revision=41971
 2012-04-06 17:27:20 +00:00
Gerald Combs b20527cb7f Build 1.7.1. 
svn path=/trunk/; revision=41970
 2012-04-06 16:28:33 +00:00
Jakub Zawadzki 12c1667881 For some broken environments we need also set LC_ALL. 
svn path=/trunk/; revision=41957
 2012-04-05 17:36:32 +00:00
Gerald Combs 4defd2a34e Copy over updates from the 1.6 branch. 
svn path=/trunk/; revision=40437
 2012-01-11 17:03:54 +00:00
Gerald Combs c95e2e88ce Try to preserve native line endings when we rewrite files. 
svn path=/trunk/; revision=39938
 2011-11-18 16:51:40 +00:00
Gerald Combs d7bb2160f6 Use the source directory argument. 
svn path=/trunk/; revision=39926
 2011-11-18 01:35:58 +00:00
Gerald Combs 873e0bdd71 Maybe it's not a good idea to modify configure.in or config.nmake during 
compilation. Add a "--set-svn" option which only affects svnversion.h and
make it the default behavior.

svn path=/trunk/; revision=39923
 2011-11-18 01:17:31 +00:00
Gerald Combs f6603bc947 Don't clobber release information in configure.in. 
svn path=/trunk/; revision=39921
 2011-11-18 00:33:14 +00:00
Gerald Combs a8cc73a4e5 Update some comments. 
svn path=/trunk/; revision=39913
 2011-11-17 20:09:07 +00:00
Gerald Combs b17a3c7c75 Make sure we terminate WiresharkCurrentVersion so we won't have to 
reapply r39907.

svn path=/trunk/; revision=39908
 2011-11-17 17:15:51 +00:00
Gerald Combs 3a2b8d4425 Don't clobber release information for now. 
svn path=/trunk/; revision=39893
 2011-11-17 01:37:14 +00:00
Gerald Combs 5624924e4a Create/update svnversion.h unless we're only running with --get-*. 
svn path=/trunk/; revision=39892
 2011-11-17 00:48:21 +00:00
Gerald Combs 3f12c48ace Add an SVN_REVISION variable to config.nmake. This can be used to 
retrieve our SVN revision in releases.

Use make-version.pl to set all version information. Be more explicit
about the tasks it performs:

  - Fetching the SVN revision which corresponds to our code. The
    revision can be fetched via "svn info", "git svn info", SubWCRev",
    config.nmake, or by prodding .svn.

  - Setting the version numbers (the "major.minor.micro" triplet).

  - Setting the release information (revision/build number, local build
    identifier)

Remove the "is_release" configuration option and dist-hook target.

When run with a "--set-*" option or no options make sure we leave a
valid svnversion.h behind.


svn path=/trunk/; revision=39891
 2011-11-17 00:19:03 +00:00
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