diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rwxr-xr-x | tools/tcltk-man2html.tcl | 41 | ||||
| -rw-r--r-- | unix/Makefile.in | 6 |
3 files changed, 32 insertions, 19 deletions
@@ -1,5 +1,9 @@ 2005-06-02 Jeff Hobbs <jeffh@ActiveState.com> + * unix/Makefile.in (html): add BUILD_HTML_FLAGS optional var + * tools/tcltk-man2html.tcl: add a --useversion to prevent + confusion when multiple Tcl source dirs exist. + * changes: updated for 8.4.10 release (porter) 2005-05-31 Zoran Vasiljevic <vasiljevic@users.sourceforge.net> diff --git a/tools/tcltk-man2html.tcl b/tools/tcltk-man2html.tcl index b9c8280..f1b1b33 100755 --- a/tools/tcltk-man2html.tcl +++ b/tools/tcltk-man2html.tcl @@ -81,9 +81,12 @@ proc parse_command_line {} { set webdir ../html set build_tcl 0 set build_tk 0 + # Default search version is a glob pattern + set useversion {{,[8-9].[0-9]{,.[0-9]}}} # Handle arguments a la GNU: # --version + # --useversion=<version> # --help # --srcdir=/path # --htmldir=/path @@ -103,6 +106,7 @@ proc parse_command_line {} { puts " --htmldir=DIR put generated HTML in DIR" puts " --tcl build tcl help" puts " --tk build tk help" + puts " --useversion version of tcl/tk to search for" exit 0 } @@ -116,6 +120,11 @@ proc parse_command_line {} { set webdir [string range $option 10 end] } + --useversion=* { + # length of "--useversion=" is 13 + set useversion [string range $option 13 end] + } + --tcl { set build_tcl 1 } @@ -134,25 +143,25 @@ proc parse_command_line {} { if {!$build_tcl && !$build_tk} {set build_tcl 1; set build_tk 1} if {$build_tcl} { - # Find Tcl. - set tcldir [lindex [lsort [glob -nocomplain -tails -type d \ - -directory $tcltkdir {tcl{,[8-9].[0-9]{,.[0-9]}}}]] end] - if {$tcldir == ""} then { - puts stderr "tcltk-man-html: couldn't find Tcl below $tcltkdir" - exit 1 - } - puts "using Tcl source directory $tcldir" + # Find Tcl. + set tcldir [lindex [lsort [glob -nocomplain -tails -type d \ + -directory $tcltkdir tcl$useversion]] end] + if {$tcldir == ""} then { + puts stderr "tcltk-man-html: couldn't find Tcl below $tcltkdir" + exit 1 + } + puts "using Tcl source directory $tcldir" } if {$build_tk} { - # Find Tk. - set tkdir [lindex [lsort [glob -nocomplain -tails -type d \ - -directory $tcltkdir {tk{,[8-9].[0-9]{,.[0-9]}}}]] end] - if {$tkdir == ""} then { - puts stderr "tcltk-man-html: couldn't find Tk below $tcltkdir" - exit 1 - } - puts "using Tk source directory $tkdir" + # Find Tk. + set tkdir [lindex [lsort [glob -nocomplain -tails -type d \ + -directory $tcltkdir tk$useversion]] end] + if {$tkdir == ""} then { + puts stderr "tcltk-man-html: couldn't find Tk below $tcltkdir" + exit 1 + } + puts "using Tk source directory $tkdir" } # the title for the man pages overall diff --git a/unix/Makefile.in b/unix/Makefile.in index 53169e6..552b343 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -5,7 +5,7 @@ # "autoconf" program (constructs like "@foo@" will get replaced in the # actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.121.2.13 2005/05/24 04:20:08 das Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.121.2.14 2005/06/02 22:52:51 hobbs Exp $ VERSION = @TCL_VERSION@ MAJOR_VERSION = @TCL_MAJOR_VERSION@ @@ -1362,7 +1362,7 @@ allpatch: dist # This target creates the HTML folder for Tcl & Tk and places it # in DISTDIR/html. It uses the tcltk-man2html.tcl tool from # the Tcl group's tool workspace. It depends on the Tcl & Tk being -# in directories called tcl8.3 & tk8.3 up two directories from the +# in directories called tcl8.* & tk8.* up two directories from the # TOOL_DIR. # @@ -1380,7 +1380,7 @@ BUILD_HTML = \ @@LD_LIBRARY_PATH_VAR@=`pwd`:$${@LD_LIBRARY_PATH_VAR@}; export @LD_LIBRARY_PATH_VAR@; \ TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ ./tclsh $(TOOL_DIR)/tcltk-man2html.tcl --htmldir=$(HTML_INSTALL_DIR) \ - --srcdir=$(TOP_DIR)/.. + --srcdir=$(TOP_DIR)/.. $(BUILD_HTML_FLAGS) # # Target to create a Macintosh version of the distribution. This will |