Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Tor
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Container Registry
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
The Tor Project
Core
Tor
Commits
eeb753e8
Commit
eeb753e8
authored
10 years ago
by
cypherpunks
Committed by
Nick Mathewson
10 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Make `check-docs` work from out-of-tree builds.
parent
e656a88f
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Makefile.am
+2
-2
2 additions, 2 deletions
Makefile.am
configure.ac
+3
-0
3 additions, 0 deletions
configure.ac
scripts/maint/checkOptionDocs.pl.in
+3
-5
3 additions, 5 deletions
scripts/maint/checkOptionDocs.pl.in
with
8 additions
and
7 deletions
Makefile.am
+
2
−
2
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
\
...
...
This diff is collapsed.
Click to expand it.
configure.ac
+
3
−
0
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
...
...
This diff is collapsed.
Click to expand it.
scripts/maint/checkOptionDocs.pl
→
scripts/maint/checkOptionDocs.pl
.in
100755 → 100644
+
3
−
5
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
);
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment