diff options
author | Gerald Combs <gerald@wireshark.org> | 2013-03-18 22:17:42 +0000 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2013-03-18 22:17:42 +0000 |
commit | 6bc16a77b0e2fa26f7aae595706ba05cb9ad3225 (patch) | |
tree | 4bb71cc22a1ffebf03216902d1a65d4da6ff664d /make-version.pl | |
parent | a46de56e38ac2f90c19d676e29aa20702c30ccf2 (diff) |
Add a wireshark-version:[] replacement and --sort-and-group-- block
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
Diffstat (limited to 'make-version.pl')
-rwxr-xr-x | make-version.pl | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/make-version.pl b/make-version.pl index d7e705b7ec..c4a5ea2eb0 100755 --- a/make-version.pl +++ b/make-version.pl @@ -367,23 +367,23 @@ sub update_config_nmake print "$filepath has been updated.\n"; } -# Read docbook/release_notes.xml, then write it back out with an updated -# "WiresharkCurrentVersion" line. +# Read docbook/asciidoc.conf, then write it back out with an updated +# wireshark-version replacement line. sub update_release_notes { my $line; my $contents = ""; my $version = ""; - my $filepath = "$srcdir/docbook/release-notes.xml"; + my $filepath = "$srcdir/docbook/asciidoc.conf"; return if (!$set_version); - open(RELNOTES, "< $filepath") || die "Can't read $filepath!"; - while ($line = <RELNOTES>) { - # <!ENTITY WiresharkCurrentVersion "1.7.1"> + open(ADOC_CONF, "< $filepath") || die "Can't read $filepath!"; + while ($line = <ADOC_CONF>) { + # wireshark-version:\[\]=1.9.1 - if ($line =~ /<\!ENTITY\s+WiresharkCurrentVersion\s+.*([\r\n]+)$/) { - $line = sprintf("<!ENTITY WiresharkCurrentVersion \"%d.%d.%d\">$1", + if ($line =~ /^wireshark-version:\\\[\\\]=.*([\r\n]+)$/) { + $line = sprintf("wireshark-version:\\\[\\\]=%d.%d.%d$1", $version_pref{"version_major"}, $version_pref{"version_minor"}, $version_pref{"version_micro"}, @@ -392,9 +392,9 @@ sub update_release_notes $contents .= $line } - open(RELNOTES, "> $filepath") || die "Can't write $filepath!"; - print(RELNOTES $contents); - close(RELNOTES); + open(ADOC_CONF, "> $filepath") || die "Can't write $filepath!"; + print(ADOC_CONF $contents); + close(ADOC_CONF); print "$filepath has been updated.\n"; } |