osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity
28,916 Commits 23 Branches 0 Tags 1.3 GiB
Commit Graph

48 Commits

Author SHA1 Message Date
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
Gerald Combs 0bd2bdb7a3 Set our package version even if we're using the SVN client. 
svn path=/trunk/; revision=20500
 2007-01-19 06:34:07 +00:00
Jörg Mayer 6a5e231e27 Adapt the svn info hack to work out of the box for people who 
are using svn 1.4 or newer to automatically switch to svn info.

svn path=/trunk/; revision=20343
 2007-01-08 10:36:28 +00:00
Jaap Keuter e257cd4437 Fix for bug 1195. 
Add preference svn_client to indicate you want to use 'svn info' i.s.o. ugly directory hack.
version.conf format more relaxed.

svn path=/trunk/; revision=20196
 2006-12-22 12:53:49 +00:00
Gerald Combs 28ee885021 Copy over changes from the 0.99.2 branch. 
svn path=/trunk/; revision=18752
 2006-07-17 18:53:40 +00:00
Gerald Combs 8d6c73e567 More ethereal -> wireshark. 
svn path=/trunk/; revision=18292
 2006-05-31 22:34:21 +00:00
Ronnie Sahlberg 89f022b12b name change 
svn path=/trunk/; revision=18197
 2006-05-21 05:12:17 +00:00
Gerald Combs 0d3244a6fe Split the version under Windows into its major, minor, and micro 
components.  Use them to build the VERSION, RC_VERSION, and manifest
versions (the latter two are picky about formatting).  This would
probably be useful on the autoconf side, but I didn't see an obvious
way to implement it.

svn path=/trunk/; revision=17302
 2006-02-14 15:14:41 +00:00
Jörg Mayer 292eb61545 Change SVN version from date to revision 
svn path=/trunk/; revision=16951
 2006-01-05 09:20:08 +00:00
Gerald Combs dacd1736fa Read .svn/entries directly instead of calling "svn info", as suggested by 
Thomas Anders.  This should make things more locale-independent and remove
a dependency on "svn" being present.

svn path=/trunk/; revision=14620
 2005-06-13 16:31:01 +00:00
Gerald Combs e7e26224b2 Fix the handling of "enable: 0" in version.conf. 
svn path=/trunk/; revision=13109
 2005-01-18 16:00:57 +00:00
Gerald Combs a1f2fba1ad If we can't find the "svn" executable in the current path, look in 
"c:/cygwin/lib/subversion/bin/", which is the current default location
for Subversion 1.1.1 under Cygwin.  If we still can't find "svn", simply
return instead of exiting.

svn path=/trunk/; revision=12856
 2004-12-29 15:54:55 +00:00
Gerald Combs f067af6e5d Remove debugging output. 
svn path=/trunk/; revision=12768
 2004-12-17 20:42:35 +00:00
Gerald Combs 9b27ed9bd5 Work around a bug in the strftime() code in the Windows version of Perl. 
svn path=/trunk/; revision=12767
 2004-12-17 20:41:14 +00:00
Gerald Combs 7d7a9ce192 From Thomas Boehne: Fix the version.conf status message and improve code 
readability.

Fix a bug in my previous checkin, so that svnversion.h will be created
even when the ".svn/" directory isn't present.

svn path=/trunk/; revision=12762
 2004-12-16 19:06:52 +00:00
Gerald Combs 84b62c9d4a Add a "pkg_format" option, which is used to format the AM_INIT_AUTOMAKE 
macro in configure.in and the VERSION macro in config.nmake.

Add a "-p/--package-version" command-line flag, which is used to set the
package version.

Add a "%#" format string code, which substitutes the SVN revision number.

Running "make-version.pl -p" will append "-SVN-xxxxx" to Ethereal's
version strings, including the automake tarball and NSIS installer names.

svn path=/trunk/; revision=12755
 2004-12-15 04:25:22 +00:00
Guy Harris 8a8b883450 Set the svn:eol-style property on all text files to "native", so that 
they have LF at the end of the line on UN*X and CR/LF on Windows;
hopefully this means that if a CR/LF version is checked in on Windows,
the CRs will be stripped so that they show up only when checked out on
Windows, not on UN*X.

svn path=/trunk/; revision=11400
 2004-07-18 00:24:25 +00:00
Gerald Combs 8106dc0862 Convert make-version.pl and the associated cvsversion.h and CVSVERSION 
definition to Subversion.  "svn info" prints out the last changed date
of the repository, so we don't have to go hunting through "CVS/Entries"
files anymore.


svn path=/trunk/; revision=11379
 2004-07-15 21:09:33 +00:00
Jörg Mayer ecc42c7717 Andrew Hood: don't rely on last modified date + use numeric compare 
svn path=/trunk/; revision=10302
 2004-03-04 16:19:40 +00:00
Gerald Combs 058dbba4b9 Add support for a "version.conf" file in the main directory which can 
be used to adjust version preferences.  It understands two configuration
directives: "enable", which can be 0 or 1, and "format", which can be any
strftime()-compatible string, e.g. "V12-powered on %A %Y-%m-%d %H:%M:%S".

If no configuration file is present, the configuration defaults to

enable: 1
format: CVS %Y%m%d%H%M%S

svn path=/trunk/; revision=10139
 2004-02-20 20:36:14 +00:00
Olivier Biot 0f6fb86143 Speed up the generation of the CVS version tag, by only looking for directories 
named CVS, and by considering only the most recent Entries file herein.

Get rid of the code assuming that a CVS snapshot generates a "cvsversion" file.

svn path=/trunk/; revision=9944
 2004-02-01 11:32:23 +00:00
Jörg Mayer 4ea271b660 Add a few comments 
svn path=/trunk/; revision=9711
 2004-01-18 05:17:23 +00:00
Olivier Biot 8db6fb47cd Nice rendering of the CVS version as "(cvs 200401181200003000)". 
The make-version.pl script only defines CVSVERSION if this was a build
from CVS.

svn path=/trunk/; revision=9701
 2004-01-18 01:41:14 +00:00
Jörg Mayer 1ae6e43f5d Integrate the "find . -name Entries" into make-version.pl, to make this 
work with nmake too.

svn path=/trunk/; revision=9694
 2004-01-17 13:09:00 +00:00
Jörg Mayer 0ac74ed036 In case of CVS sources, add the date of the last change to the version 
number.

2do: Add support to Makefile.nmake
     Enforce the generation of cvsversion.h on each run of make

svn path=/trunk/; revision=9679
 2004-01-16 20:04:21 +00:00