From e838bdf0780956d1a38698d488f40b5262dc457e Mon Sep 17 00:00:00 2001
From: dkf <donal.k.fellows@manchester.ac.uk>
Date: Wed, 9 Apr 2008 21:44:57 +0000
Subject: Added 'make html' support for people on Windows, inspired by Pat
Thoyts.
---
ChangeLog | 152 ++++++++++++++++++++++++++++----------------------------
win/Makefile.in | 18 ++++++-
2 files changed, 93 insertions(+), 77 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index f5ef0ba..f45ebcf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,17 +1,21 @@
+2008-04-09 Donal K. Fellows <dkf@users.sf.net>
+
+ * win/Makefile.in (html): Added target for doing convenient
+ documentation builds, mirroring the one from unix/Makefile.
+
2008-04-09 Andreas Kupries <andreask@activestate.com>
* tests/chanio.test (chan-io-52.5): Removed '-size -1' from test,
- * tests/io.test (io-52.5): does not seem to have any bearing, and
- was an illegal value. Test case is not affected by the value of
- -size, test flag restoration and that evrything was properly
- copied.
-
- * generic/tclIOCmd.c (Tcl_FcopyObjCmd): Added checking of -size
- * tests/ioCmd.test (iocmd-15.{13,14}): value to reject negative
- values, and values overflowing 32-bit signed. [Bug 1557855]. Basic
- patch by Alexandre Ferrieux <ferrieux@users.sourceforge.net>, with
- modifications from me to separate overflow from true negative
- value. Extended testsuite.
+ * tests/io.test (io-52.5): does not seem to have any bearing, and was
+ an illegal value. Test case is not affected by the value of -size,
+ test flag restoration and that evrything was properly copied.
+
+ * generic/tclIOCmd.c (Tcl_FcopyObjCmd): Added checking of -size value
+ * tests/ioCmd.test (iocmd-15.{13,14}): to reject negative values, and
+ values overflowing 32-bit signed. [Bug 1557855]. Basic patch by
+ Alexandre Ferrieux <ferrieux@users.sourceforge.net>, with
+ modifications from me to separate overflow from true negative value.
+ Extended testsuite.
2008-04-09 Daniel Steffen <das@users.sourceforge.net>
@@ -20,9 +24,9 @@
2008-04-08 Miguel Sofer <msofer@users.sf.net>
- * generic/tclExecute.c: added comments to the alignment macros
- used in GrowEvaluationStack() and friends.
-
+ * generic/tclExecute.c: added comments to the alignment macros used in
+ GrowEvaluationStack() and friends.
+
2008-04-08 Daniel Steffen <das@users.sourceforge.net>
* tools/genStubs.tcl: revert erroneous 2008-04-02 change marking
@@ -36,18 +40,17 @@
2008-04-07 Andreas Kupries <andreask@activestate.com>
- * tests/io.test (io-53.10): Testcase for bi-directionaly fcopy.
+ * tests/io.test (io-53.10): Testcase for bi-directional fcopy.
* tests/chanio.test:
- * generic/tclIO.c: Additional changes to data structures for fcopy
- * generic/tclIO.h: and channels to perform proper cleanup in case
- of a channel having two background copy operations running as is
- now possible.
-
- * generic/tclIO.c (BUSY_STATE, CheckChannelErrors,
- TclCopyChannel): New macro, and the places using it. This change
- allows for bi-directional fcopy on channels. [Bug 1350564]. Thanks
- to Alexandre Ferrieux <ferrieux@users.sourceforge.net> for the
- patch.
+ * generic/tclIO.c: Additional changes to data structures for fcopy and
+ * generic/tclIO.h: channels to perform proper cleanup in case of a
+ channel having two background copy operations running as is now
+ possible.
+
+ * generic/tclIO.c (BUSY_STATE, CheckChannelErrors, TclCopyChannel):
+ New macro, and the places using it. This change allows for
+ bi-directional fcopy on channels. [Bug 1350564]. Thanks to Alexandre
+ Ferrieux <ferrieux@users.sourceforge.net> for the patch.
2008-04-07 Reinhard Max <max@suse.de>
@@ -56,47 +59,43 @@
* tests/format.test: Add a test for '% d' and '%+d'.
2008-04-05 Kevin B. Kenny <kennykb@acm.org>
-
- * win/tclWinFile.c: (WinSymLinkDirectory): Fixed a problem that
- Tcl was creating an NTFS junction point (IO_REPARSE_TAG_MOUNT_POINT)
- but filling in the union member for a Vista symbolic link.
- We had gotten away with this error because the union member
- (SymbolicLinkReparseBuffer) was misdefined in this file
- and in the 'winnt.h' in early versions of MinGW. MinGW 3.4.2
- has the correct definition of SymbolicLinkReparseBuffer, exposing
- the mismatch, and making tests cmdAH-19.4.1, fCmd-28.*, and
- filename-11.* fail.
+
+ * win/tclWinFile.c: (WinSymLinkDirectory): Fixed a problem that Tcl
+ was creating an NTFS junction point (IO_REPARSE_TAG_MOUNT_POINT) but
+ filling in the union member for a Vista symbolic link. We had gotten
+ away with this error because the union member
+ (SymbolicLinkReparseBuffer) was misdefined in this file and in the
+ 'winnt.h' in early versions of MinGW. MinGW 3.4.2 has the correct
+ definition of SymbolicLinkReparseBuffer, exposing the mismatch, and
+ making tests cmdAH-19.4.1, fCmd-28.*, and filename-11.* fail.
* tests/chanio.test (chan-io-53.9):
- * tests/io.test (io-53.9): Made test cleanup robust against
- the possibility of slow process shutdown on Windows.
+ * tests/io.test (io-53.9): Made test cleanup robust against the
+ possibility of slow process shutdown on Windows.
- * win/tcl.m4: Added -D_CRT_SECURE_NO_DEPRECATE and
- -DCRT_NONSTDC_NO_DEPRECATE to the MSVC compilation flags
- so that the compilation doesn't barf on perfectly reasonable
- Posix system calls.
- * win/configure: Manually patched (don't have the right autoconf
- to hand).
+ * win/tcl.m4: Added -D_CRT_SECURE_NO_DEPRECATE and
+ -DCRT_NONSTDC_NO_DEPRECATE to the MSVC compilation flags so that the
+ compilation doesn't barf on perfectly reasonable Posix system calls.
+ * win/configure: Manually patched (don't have the right autoconf to
+ hand).
2008-04-04 Andreas Kupries <andreask@activestate.com>
* tests/io.test (io-53.9): Added testcase for [Bug 780533], based
- * tests/chanio.test: on Alexandre's test script. Also fixed
- problem with timer in preceding test, was not canceled properly in
- the ok case.
+ * tests/chanio.test: on Alexandre's test script. Also fixed problem
+ with timer in preceding test, was not canceled properly in the ok case
2008-04-04 Andreas Kupries <andreask@activestate.com>
- * generic/tclIORChan.c (ReflectOutput): Allow zero return from
- write when input was zero-length anyway. Otherwise keept it an
- error, and separate the message from 'written too much'.
+ * generic/tclIORChan.c (ReflectOutput): Allow zero return from write
+ when input was zero-length anyway. Otherwise keept it an error, and
+ separate the message from 'written too much'.
- * tests/ioCmd.test (iocmd-24.6): Testcase updated for changed
- message.
+ * tests/ioCmd.test (iocmd-24.6): Testcase updated for changed message.
- * generic/tclIORChan.c (ReflectClose): Added missing removal of
- the now closed channel from the reflection map. Before we could
- crash the system by invoking 'chan postevent' on a closed
- reflected channel, dereferencing the dangling pointer in the map.
+ * generic/tclIORChan.c (ReflectClose): Added missing removal of the
+ now closed channel from the reflection map. Before we could crash the
+ system by invoking 'chan postevent' on a closed reflected channel,
+ dereferencing the dangling pointer in the map.
* tests/ioCmd.test (iocmd-31.8): Testcase for the above.
@@ -111,7 +110,7 @@
* generic/tcl.decls: remove 'export' declarations of symbols now
only in libtclstub and no longer in libtcl.
-
+
* generic/tclStubLib.c: make symbols in libtclstub.a MODULE_SCOPE to
* tools/genStubs.tcl: avoid exporting them from libraries that link
with -ltclstub; constify tcl*StubsPtr and stub
@@ -126,16 +125,17 @@
2008-04-02 Andreas Kupries <andreask@activestate.com>
- * generic/tclIO.c (CopyData): Applied patch for fcopy problem
- [Bug 780533], with many thanks to Alexandre Ferrieux
+ * generic/tclIO.c (CopyData): Applied patch for fcopy problem [Bug
+ 780533], with many thanks to Alexandre Ferrieux
<ferrieux@users.sourceforge.net> for tracking it down and providing a
- solution. Still have to convert his test script into a proper test case
+ solution. Still have to convert his test script into a proper test
+ case.
2008-04-01 Andreas Kupries <andreask@activestate.com>
- * generic/tclStrToD.c: Applied patch for [Bug 1839067] (fp
- * unix/tcl.m4: rounding setup on solaris x86, native cc), provided
- by Michael Schlenker.
+ * generic/tclStrToD.c: Applied patch for [Bug 1839067] (fp rounding
+ * unix/tcl.m4: setup on solaris x86, native cc), provided by
+ Michael Schlenker.
2008-04-01 Don Porter <dgp@users.sourceforge.net>
@@ -163,7 +163,7 @@
* generic/tclBasic.c: Revised stubs-generation tool and interp
* tools/genStubs.tcl: creation so that "tclStubsPtr" is not present
- * unix/Makefile.in: in libtcl.so, but is present only in
+ * unix/Makefile.in: in libtcl.so, but is present only in
* win/Makefile.in: libtclstub.a. This tightens up the rules for
* win/makefile.bc: users of the stubs interfaces. [Bug 1819422]
* win/makefile.vc:
@@ -177,20 +177,20 @@
2008-03-30 Kevin Kenny <kennykb@acm.org>
* generic/tclInt.h (TclIsNaN):
- * unix/configure.in: Added code to the configurator to check for
- a standard isnan() macro and use it if one
- is found. This change avoids bugs where
- the test of ((d) != (d)) is optimized away
- by an overaggressive compiler. [Bug 1783544]
- * generic/tclObj.c: Added missing #include <math.h> needed to
- locate isnan() after the above change.
-
+ * unix/configure.in: Added code to the configurator to check for a
+ standard isnan() macro and use it if one is
+ found. This change avoids bugs where the test of
+ ((d) != (d)) is optimized away by an
+ overaggressive compiler. [Bug 1783544]
+ * generic/tclObj.c: Added missing #include <math.h> needed to locate
+ isnan() after the above change.
+
* unix/configure: autoconf-2.61
-
- * tests/mathop.test (mathop-25.9, mathop-25.14): Modified tests
- to deal with (slightly buggy) math libraries in which pow()
- returns an incorrectly rounded result. [Bug 1808174]
-
+
+ * tests/mathop.test (mathop-25.9, mathop-25.14): Modified tests to
+ deal with (slightly buggy) math libraries in which pow() returns an
+ incorrectly rounded result. [Bug 1808174]
+
2008-03-26 Don Porter <dgp@users.sourceforge.net>
*** 8.5.2 TAGGED FOR RELEASE ***
diff --git a/win/Makefile.in b/win/Makefile.in
index 7d71edf..6bd5e39 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -4,7 +4,7 @@
# "./configure", which is a configuration script generated by the "autoconf"
# program (constructs like "@foo@" will get replaced in the actual Makefile.
#
-# RCS: @(#) $Id: Makefile.in,v 1.125 2008/04/02 04:25:14 dgp Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.126 2008/04/09 21:44:58 dkf Exp $
VERSION = @TCL_VERSION@
@@ -747,3 +747,19 @@ genstubs:
"$(GENERIC_DIR_NATIVE)\tcl.decls" \
"$(GENERIC_DIR_NATIVE)\tclInt.decls" \
"$(GENERIC_DIR_NATIVE)\tclTomMath.decls"
+
+#
+# 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.* &
+# tk8.* up two directories from the TOOL_DIR.
+#
+
+TOOL_DIR=$(ROOT_DIR)/tools
+HTML_INSTALL_DIR=$(ROOT_DIR)/html
+html:
+ $(MAKE) shell SCRIPT="$(TOOL_DIR)/tcltk-man2html.tcl --htmldir=$(HTML_INSTALL_DIR) --srcdir=$(ROOT_DIR)/.. $(BUILD_HTML_FLAGS)"
+html-tcl: $(TCLSH)
+ $(MAKE) shell SCRIPT="$(TOOL_DIR)/tcltk-man2html.tcl --htmldir=$(HTML_INSTALL_DIR) --srcdir=$(ROOT_DIR)/.. $(BUILD_HTML_FLAGS) --tcl"
+html-tk: $(TCLSH)
+ $(MAKE) shell SCRIPT="$(TOOL_DIR)/tcltk-man2html.tcl --htmldir=$(HTML_INSTALL_DIR) --srcdir=$(ROOT_DIR)/.. $(BUILD_HTML_FLAGS) --tk"
--
cgit v0.12