Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
Tor
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
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
Benjamin J. Thompson
Tor
Commits
66a15013
Commit
66a15013
authored
5 years ago
by
rl1987
Browse files
Options
Downloads
Patches
Plain Diff
Allow excluding documentation from the build
parent
319ce225
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
changes/ticket19381
+4
-0
4 additions, 0 deletions
changes/ticket19381
configure.ac
+8
-0
8 additions, 0 deletions
configure.ac
doc/include.am
+19
-4
19 additions, 4 deletions
doc/include.am
with
31 additions
and
4 deletions
changes/ticket19381
0 → 100644
+
4
−
0
View file @
66a15013
o Minor features (build system):
- Add --disable-manpage and --disable-html-manual options to configure
script. This will enable shortening build times by not building
documentation. Resolves issue 19381.
This diff is collapsed.
Click to expand it.
configure.ac
+
8
−
0
View file @
66a15013
...
...
@@ -105,6 +105,12 @@ if test "$enable_memory_sentinels" = "no"; then
[Defined if we're turning off memory safety code to look for bugs])
fi
AC_ARG_ENABLE(manpage,
AS_HELP_STRING(--disable-manpage, [Disable manpage generation.]))
AC_ARG_ENABLE(html-manual,
AS_HELP_STRING(--disable-html-manual, [Disable HTML documentation.]))
AC_ARG_ENABLE(asciidoc,
AS_HELP_STRING(--disable-asciidoc, [don't use asciidoc (disables building of manpages)]),
[case "${enableval}" in
...
...
@@ -299,6 +305,8 @@ AC_PATH_PROG([ASCIIDOC], [asciidoc], none)
AC_PATH_PROGS([A2X], [a2x a2x.py], none)
AM_CONDITIONAL(USE_ASCIIDOC, test "x$asciidoc" = "xtrue")
AM_CONDITIONAL(BUILD_MANPAGE, [test "x$enable_manpage" != "xno"])
AM_CONDITIONAL(BUILD_HTML_DOCS, [test "x$enable_html_manual" != "xno"])
AM_PROG_CC_C_O
AC_PROG_CC_C99
...
...
This diff is collapsed.
Click to expand it.
doc/include.am
+
19
−
4
View file @
66a15013
...
...
@@ -15,17 +15,32 @@
all_mans = doc/tor doc/tor-gencert doc/tor-resolve doc/torify doc/tor-print-ed-signing-cert
if USE_ASCIIDOC
nodist_man1_MANS = $(all_mans:=.1)
doc_DATA = $(all_mans:=.html)
txt_in = $(all_mans:=.1.txt)
if BUILD_HTML_DOCS
html_in = $(all_mans:=.html.in)
doc_DATA = $(all_mans:=.html)
else
html_in =
doc_DATA =
endif
if BUILD_MANPAGE
nodist_man1_MANS = $(all_mans:=.1)
man_in = $(all_mans:=.1.in)
txt_in = $(all_mans:=.1.txt)
else
nodist_man1_MANS =
man_in =
endif
else
html_in =
doc_DATA =
man_in =
txt_in =
nodist_man1_MANS =
doc_DATA =
endif
EXTRA_DIST+= doc/asciidoc-helper.sh \
...
...
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