From 6c9b8bdd74ad3b776f15340267d4173afb1985af Mon Sep 17 00:00:00 2001 From: dkf Date: Sun, 13 Jun 2010 10:24:45 +0000 Subject: * tools/tcltk-man2html.tcl: [Bug 3015327]: Add hack to stop Itcl C docs from interfering with Tcl docs during HTML generation. This is a band-aid since it just prevents the generation of the HTML version of the Itcl C docs (since they're not installed during 'make install') rather than improving the code to not have problems with the clash between two Object.3 files. --- ChangeLog | 44 ++++++++++++++++++++++++++------------------ tools/tcltk-man2html.tcl | 6 +++--- 2 files changed, 29 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index dc812ac..b3866dd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2010-06-13 Donal K. Fellows + + * tools/tcltk-man2html.tcl: [Bug 3015327]: Add hack to stop Itcl C + docs from interfering with Tcl docs during HTML generation. This is a + band-aid since it just prevents the generation of the HTML version of + the Itcl C docs (since they're not installed during 'make install') + rather than improving the code to not have problems with the clash + between two Object.3 files. + 2010-06-09 Andreas Kupries * library/platform/platform.tcl: Added OSX Intel 64bit @@ -7,9 +16,9 @@ 2010-06-09 Jan Nijtmans - * tools/tsdPerf.c: Fix export of symbol Tsdperf_Init, when - using -fvisibility=hidden. Make two functions static, eliminate - some unnecessary type casts. + * tools/tsdPerf.c: Fix export of symbol Tsdperf_Init, when using + -fvisibility=hidden. Make two functions static, eliminate some + unnecessary type casts. * tools/configure.in: Update to Tcl 8.6 * tools/configure: (regenerated) * tools/.cvsignore new file @@ -21,13 +30,12 @@ 2010-06-05 Miguel Sofer - * generic/tclBasic.c: Fix for #3008307: make callerPtr chains - * generic/tclExecute.c: be traversable accross coro - boundaries. Add the special coroutine CallFrame (partially - reverting commit of 2009-12-10), as it is needed for coroutines - that do not push a CF - eg, those with [eval] as command. Thanks - to Colin McCormack (coldstore) and Alexandre Ferrieux for the - hard work on this. + * generic/tclBasic.c: [Bug 3008307]: make callerPtr chains be + * generic/tclExecute.c: traversable accross coro boundaries. Add the + special coroutine CallFrame (partially reverting commit of + 2009-12-10), as it is needed for coroutines that do not push a CF, eg, + those with [eval] as command. Thanks to Colin McCormack (coldstore) + and Alexandre Ferrieux for the hard work on this. 2010-06-03 Alexandre Ferrieux @@ -37,26 +45,26 @@ 2010-06-02 Jan Nijtmans - * generic/tclOO.h BUILD_tcloo is never defined (leftover) - * win/makefile.bc Don't set BUILD_tcloo (leftover) + * generic/tclOO.h: BUILD_tcloo is never defined (leftover) + * win/makefile.bc: Don't set BUILD_tcloo (leftover) See also entry below: 2008-06-01 Joe Mistachkin 2010-06-01 Alexandre Ferrieux - * generic/tclNamesp.c: Fix computation of [uplevel] offsets in TIP 348. + * generic/tclNamesp.c: Fix computation of [uplevel] offsets in TIP 348 * tests/error.test: Only depend on callerPtr chaining now. * tests/result.test: Needed for upcoming coro patch. 2010-05-31 Jan Nijtmans - * generic/tclVar.c Eliminate some casts to (Tcl_HashTable *) - * generic/tclExecute.c - * tests/fileSystem.test Fix filesystem-5.1 test failure on CYGWIN + * generic/tclVar.c: Eliminate some casts to (Tcl_HashTable *) + * generic/tclExecute.c: + * tests/fileSystem.test: Fix filesystem-5.1 test failure on CYGWIN 2010-05-28 Jan Nijtmans - * generic/tclInt.h: [tcl-Patches-3008541] order of TIP #348 fields - in Interp structure + * generic/tclInt.h: [Patch 3008541]: Order of TIP #348 fields in + Interp structure 2010-05-28 Donal K. Fellows diff --git a/tools/tcltk-man2html.tcl b/tools/tcltk-man2html.tcl index fd8a258..b497afb 100755 --- a/tools/tcltk-man2html.tcl +++ b/tools/tcltk-man2html.tcl @@ -18,9 +18,9 @@ package require Tcl 8.6 # Copyright (c) 1995-1997 Roger E. Critchlow Jr # Copyright (c) 2004-2010 Donal K. Fellows # -# CVS: $Id: tcltk-man2html.tcl,v 1.46 2010/02/10 23:17:07 dkf Exp $ +# CVS: $Id: tcltk-man2html.tcl,v 1.47 2010/06/13 10:24:45 dkf Exp $ -regexp {\d+\.\d+} {$Revision: 1.46 $} ::Version +regexp {\d+\.\d+} {$Revision: 1.47 $} ::Version set ::CSSFILE "docs.css" ## @@ -918,7 +918,7 @@ try { "The C functions which a Tcl extended C program may use."] \ [plus-base $build_tk $tkdir/doc/*.3 {Tk Library} TkLib \ "The additional C functions which a Tk extended C program may use."] \ - {*}[plus-pkgs 3 {*}$packageDirNameMap] + {*}[plus-pkgs 3 {*}[dict remove $packageDirNameMap itcl]] } on error {msg opts} { # On failure make sure we show what went wrong. We're not supposed # to get here though; it represents a bug in the script. -- cgit v0.12