Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
David Goulet
Tor
Commits
eeb753e8
Commit
eeb753e8
authored
Mar 11, 2015
by
cypherpunks
Committed by
Nick Mathewson
Mar 14, 2015
Browse files
Make `check-docs` work from out-of-tree builds.
parent
e656a88f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Makefile.am
View file @
eeb753e8
...
...
@@ -109,8 +109,8 @@ check-spaces:
$(top_srcdir)
/src/tools/
*
.[ch]
\
$(top_srcdir)
/src/tools/tor-fw-helper/
*
.[ch]
check-docs
:
$(
top_src
dir)
/scripts/maint/checkOptionDocs.pl
check-docs
:
all
$(
PERL)
$(top_build
dir)
/scripts/maint/checkOptionDocs.pl
check-logs
:
$(top_srcdir)
/scripts/maint/checkLogs.pl
\
...
...
configure.ac
View file @
eeb753e8
...
...
@@ -215,6 +215,8 @@ AC_PROG_CPP
AC_PROG_MAKE_SET
AC_PROG_RANLIB
AC_PATH_PROG([PERL], [perl])
dnl autoconf 2.59 appears not to support AC_PROG_SED
AC_CHECK_PROG([SED],[sed],[sed],[/bin/false])
...
...
@@ -1661,6 +1663,7 @@ AC_CONFIG_FILES([
contrib/dist/tor.service
src/config/torrc.sample
src/config/torrc.minimal
scripts/maint/checkOptionDocs.pl
])
if test x$asciidoc = xtrue && test "$ASCIIDOC" = "none" ; then
...
...
scripts/maint/checkOptionDocs.pl
→
scripts/maint/checkOptionDocs.pl
.in
100755 → 100644
View file @
eeb753e8
...
...
@@ -7,7 +7,7 @@ my %torrcSampleOptions = ();
my
%manPageOptions
=
();
# Load the canonical list as actually accepted by Tor.
open
(
F
,
"
.
/src/or/tor --list-torrc-options |
")
or
die
;
open
(
F
,
"
@abs_top_builddir
@
/src/or/tor --list-torrc-options |
")
or
die
;
while
(
<
F
>
)
{
next
if
m!\[notice\] Tor v0\.!
;
if
(
m!^([A-Za-z0-9_]+)!
)
{
...
...
@@ -34,12 +34,12 @@ sub loadTorrc {
0
;
}
loadTorrc
("
.
/src/config/torrc.sample.in
",
\
%torrcSampleOptions
);
loadTorrc
("
@abs_top_srcdir
@
/src/config/torrc.sample.in
",
\
%torrcSampleOptions
);
# Try to figure out what's in the man page.
my
$considerNextLine
=
0
;
open
(
F
,
"
.
/doc/tor.1.txt
")
or
die
;
open
(
F
,
"
@abs_top_srcdir
@
/doc/tor.1.txt
")
or
die
;
while
(
<
F
>
)
{
if
(
m!^(?:\[\[([A-za-z0-9_]+)\]\] *)?\*\*([A-Za-z0-9_]+)\*\*!
)
{
$manPageOptions
{
$
2
}
=
1
;
...
...
@@ -67,5 +67,3 @@ subtractHashes("Orphaned in torrc.sample.in", \%torrcSampleOptions, \%options);
subtractHashes
("
Not in man page
",
\
%options
,
\
%manPageOptions
);
subtractHashes
("
Orphaned in man page
",
\
%manPageOptions
,
\
%options
);
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment