summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordas <das>2003-03-18 13:38:21 (GMT)
committerdas <das>2003-03-18 13:38:21 (GMT)
commitdcfb2e5557e33d2ffc3f05df4f3dd0e94209d6ed (patch)
tree5b6f6b2381392db28254235c12ac5340c3000b2d
parentb9fc074fd6e4e600d78808c7bb874bc30a7b5d08 (diff)
downloadtcl-dcfb2e5557e33d2ffc3f05df4f3dd0e94209d6ed.zip
tcl-dcfb2e5557e33d2ffc3f05df4f3dd0e94209d6ed.tar.gz
tcl-dcfb2e5557e33d2ffc3f05df4f3dd0e94209d6ed.tar.bz2
* tools/tcltk-man2html.tcl: added support for building 'make html'
from inside distribution directories named with 8.x.x version numbers. tcltk-man2html now uses the latest tcl8.x.x resp. tk8.x.x directories found inside its --srcdir argument.
-rw-r--r--ChangeLog21
-rwxr-xr-xtools/tcltk-man2html.tcl28
2 files changed, 23 insertions, 26 deletions
diff --git a/ChangeLog b/ChangeLog
index 1851c91..cea8c18 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-03-18 Daniel Steffen <das@users.sourceforge.net>
+
+ * tools/tcltk-man2html.tcl: added support for building 'make html'
+ from inside distribution directories named with 8.x.x version
+ numbers. tcltk-man2html now uses the latest tcl8.x.x resp. tk8.x.x
+ directories found inside its --srcdir argument.
+
2003-03-17 Mo DeJong <mdejong@users.sourceforge.net>
* tests/format.test: Renumber tests, a bunch of
@@ -66,14 +73,14 @@
[return] and [continue] exceptions. All other behavior should
remain compatible. [RFE 536831,684982] [Bug 685106]
- * generic/tcl.h: Removed TCL_PREFIX_IDENT and TCL_DEBUG_IDENT
- * win/tclWinPipe.c: from tcl.h -- they are not part of Tcl's
- public interface. Put them in win/tclWinPipe.c where they are used.
+ * generic/tcl.h: Removed TCL_PREFIX_IDENT and TCL_DEBUG_IDENT
+ * win/tclWinPipe.c: from tcl.h -- they are not part of Tcl's
+ public interface. Put them in win/tclWinPipe.c where they are used.
- * generic/tclInterp.c (Tcl_InterpObjCmd): Corrected and added
- * tests/interp.test (interp-2.13): test for option
- parsing beyond objc for [interp create --]. Thanks to Marco Maggi.
- [Bug 702383]
+ * generic/tclInterp.c (Tcl_InterpObjCmd): Corrected and added
+ * tests/interp.test (interp-2.13): test for option
+ parsing beyond objc for [interp create --]. Thanks to Marco Maggi.
+ [Bug 702383]
2003-03-11 Kevin Kenny <kennykb@users.sourceforge.net>
diff --git a/tools/tcltk-man2html.tcl b/tools/tcltk-man2html.tcl
index c5bd2a6..42f0e58 100755
--- a/tools/tcltk-man2html.tcl
+++ b/tools/tcltk-man2html.tcl
@@ -1,8 +1,8 @@
#!/bin/sh
# The next line is executed by /bin/sh, but not tcl \
-exec tclsh8.2 "$0" ${1+"$@"}
+exec tclsh8.4 "$0" ${1+"$@"}
-package require Tcl 8.2
+package require Tcl 8.4
# Convert Ousterhout format man pages into highly crosslinked
# hypertext.
@@ -65,7 +65,7 @@ package require Tcl 8.2
# Oct 24, 1997 - moved from 8.0b1 to 8.0 release
#
-set Version "0.30"
+set Version "0.31"
proc parse_command_line {} {
global argv Version
@@ -80,10 +80,6 @@ proc parse_command_line {} {
set tcldir {}
set webdir ../html
- # Directory names for Tcl and Tk, in priority order.
- set tclDirList {tcl8.4 tcl8.3 tcl8.2 tcl8.1 tcl8.0 tcl}
- set tkDirList {tk8.4 tk8.3 tk8.2 tk8.1 tk8.0 tk}
-
# Handle arguments a la GNU:
# --version
# --help
@@ -124,28 +120,22 @@ proc parse_command_line {} {
}
# Find Tcl.
- foreach dir $tclDirList {
- if {[file isdirectory $tcltkdir/$dir]} then {
- set tcldir $dir
- break
- }
- }
+ 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 Tk.
- foreach dir $tkDirList {
- if {[file isdirectory $tcltkdir/$dir]} then {
- set tkdir $dir
- break
- }
- }
+ 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"
# the title for the man pages overall
global overall_title