diff options
| author | Gerald Combs <gerald@wireshark.org> | 2016-11-01 14:35:29 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2016-11-11 17:18:25 +0000 |
| commit | 65ab2a97018877ec3a8664d7422c3ee4662e97ca (patch) | |
| tree | f6068d14ae9493c400eca66019dedbb76a2c42f4 /make-version.pl | |
| parent | aba4d3a3a7d8c7f97290621085a8fb7a33942847 (diff) | |
AsciiDoc: Create an include file for attributes.
Move the replacement definitions in asciidoc.conf to
attributes.asciidoc. This makes the markup a bit cleaner and is more
compatible with AsciiDoctor. Use a standard naming scheme for URLs.
Change-Id: Ica73aaadb013be2a4e6a3963fb54e6db6e02e98f
Reviewed-on: https://code.wireshark.org/review/18655
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'make-version.pl')
| -rwxr-xr-x | make-version.pl | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/make-version.pl b/make-version.pl index facae0157b..35a3d4143c 100755 --- a/make-version.pl +++ b/make-version.pl @@ -471,25 +471,25 @@ sub update_configure_ac print "$filepath has been updated.\n"; } -# Read docbook/asciidoc.conf, then write it back out with an updated +# Read docbook/attributes.asciidoc, then write it back out with an updated # wireshark-version replacement line. -sub update_release_notes +sub update_attributes_asciidoc { my $line; my $contents = ""; my $version = ""; - my $filepath = "$srcdir/docbook/asciidoc.conf"; + my $filepath = "$srcdir/docbook/attributes.asciidoc"; open(ADOC_CONF, "< $filepath") || die "Can't read $filepath!"; while ($line = <ADOC_CONF>) { - # wireshark-version:\[\]=1.9.1 + # :wireshark-version: 2.3.1 - if ($line =~ /^wireshark-version=.*([\r\n]+)$/) { - $line = sprintf("wireshark-version=%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"}, - ); + ); } $contents .= $line } @@ -602,7 +602,7 @@ sub update_versioned_files &update_cmakelists_txt; &update_configure_ac; if ($set_version) { - &update_release_notes; + &update_attributes_asciidoc; &update_debian_changelog; &update_automake_lib_releases; &update_cmake_lib_releases; @@ -753,7 +753,7 @@ make-version.pl [options] [source directory] --print-vcs Print the vcs version to standard output --set-version, -v Set the major, minor, and micro versions in the top-level CMakeLists.txt, configure.ac, - docbook/asciidoc.conf, debian/changelog, + docbook/attributes.asciidoc, debian/changelog, the Makefile.am for all libraries, and the CMakeLists.txt for all libraries. Resets the release information when used by |