Skip to content

Commit 08d5b3c

Browse files
[Ticket 7c7f946046]: Pull in exclusion information from the installer
configuration, and use it to exclude the associated man-pages from generation.
1 parent d1e2054 commit 08d5b3c

File tree

2 files changed

+39
-31
lines changed

2 files changed

+39
-31
lines changed

ChangeLog

+7
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
2013-11-07 Andreas Kupries <[email protected]>
2+
3+
* support/devel/sak/localdoc/localdoc.tcl (::sak::localdoc::run):
4+
[Ticket 7c7f946046]: Pull in exclusion information from the
5+
installer configuration, and use it to exclude the associated
6+
man-pages from generation.
7+
18
2013-11-07 Andreas Kupries <[email protected]>
29

310
* support/installation/man.macros: [Ticket 369f67aeee] Updated to

support/devel/sak/localdoc/localdoc.tcl

+32-31
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,16 @@ proc ::sak::localdoc::run {} {
2626
getpackage doctools::idx doctools/docidx.tcl
2727
getpackage dtplite dtplite/dtplite.tcl
2828

29+
# Read installation information. Need the list of excluded
30+
# modules to suppress them here in the doc generation as well.
31+
global excluded modules apps guide
32+
source support/installation/modules.tcl
33+
34+
foreach e $excluded {
35+
puts "Excluding $e ..."
36+
lappend baseconfig -exclude */modules/$e/*
37+
}
38+
2939
set nav ../../../../home
3040

3141
puts "Reindex the documentation..."
@@ -38,13 +48,14 @@ proc ::sak::localdoc::run {} {
3848
file mkdir embedded/www
3949

4050
puts "Generating manpages..."
41-
dtplite::do \
42-
[list \
43-
-exclude {*/doctools/tests/*} \
44-
-exclude {*/support/*} \
45-
-ext n \
46-
-o embedded/man \
47-
nroff .]
51+
set config $baseconfig
52+
lappend config -exclude {*/doctools/tests/*}
53+
lappend config -exclude {*/support/*}
54+
lappend config -ext n
55+
lappend config -o embedded/man
56+
lappend config nroff .
57+
58+
dtplite::do $config
4859

4960
# Note: Might be better to run them separately.
5061
# Note @: Or we shuffle the results a bit more in the post processing stage.
@@ -61,32 +72,22 @@ proc ::sak::localdoc::run {} {
6172
set cats [string map $map [fileutil::cat support/devel/sak/doc/toc_cats.txt]]
6273

6374
puts "Generating HTML... Pass 1, draft..."
64-
dtplite::do \
65-
[list \
66-
-toc $toc \
67-
-nav {Tcllib Home} $nav \
68-
-post+toc Categories $cats \
69-
-post+toc Modules $mods \
70-
-post+toc Applications $apps \
71-
-exclude {*/doctools/tests/*} \
72-
-exclude {*/support/*} \
73-
-merge \
74-
-o embedded/www \
75-
html .]
75+
set config $baseconfig
76+
lappend config -exclude {*/doctools/tests/*}
77+
lappend config -exclude {*/support/*}
78+
lappend config -toc $toc
79+
lappend config -nav {Tcllib Home} $nav
80+
lappend config -post+toc Categories $cats
81+
lappend config -post+toc Modules $mods
82+
lappend config -post+toc Applications $apps
83+
lappend config -merge
84+
lappend config -o embedded/www
85+
lappend config html .
86+
87+
dtplite::do $config
7688

7789
puts "Generating HTML... Pass 2, resolving cross-references..."
78-
dtplite::do \
79-
[list \
80-
-toc $toc \
81-
-nav {Tcllib Home} $nav \
82-
-post+toc Categories $cats \
83-
-post+toc Modules $mods \
84-
-post+toc Applications $apps \
85-
-exclude {*/doctools/tests/*} \
86-
-exclude {*/support/*} \
87-
-merge \
88-
-o embedded/www \
89-
html .]
90+
dtplite::do $config
9091

9192
return
9293
}

0 commit comments

Comments
 (0)