summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--tools/feather.bmpbin0 -> 2102 bytes
-rw-r--r--tools/man2help.tcl16
-rw-r--r--tools/man2help2.tcl8
-rw-r--r--win/makefile.vc32
4 files changed, 34 insertions, 22 deletions
diff --git a/tools/feather.bmp b/tools/feather.bmp
new file mode 100644
index 0000000..23aa02e
--- /dev/null
+++ b/tools/feather.bmp
Binary files differ
diff --git a/tools/man2help.tcl b/tools/man2help.tcl
index 0d9bb02..9f3d7fe 100644
--- a/tools/man2help.tcl
+++ b/tools/man2help.tcl
@@ -6,7 +6,7 @@
#
# Copyright (c) 1996 by Sun Microsystems, Inc.
#
-# RCS: @(#) $Id: man2help.tcl,v 1.9 2002/03/28 02:42:40 davygrvy Exp $
+# RCS: @(#) $Id: man2help.tcl,v 1.10 2002/03/28 21:45:24 davygrvy Exp $
#
#
@@ -108,14 +108,19 @@ proc doDir dir {
# process command line arguments
if {$argc < 3} {
- puts stderr "usage: $argv0 projectName version manFiles..."
+ puts stderr "usage: $argv0 \[options\] projectName version manFiles..."
exit 1
}
-set baseName [lindex $argv 0]
-set version [lindex $argv 1]
+set arg 0
+
+if {![string compare [lindex $argv $arg] "-bitmap"]} {
+ set bitmap [lindex $argv [incr arg]]
+}
+puts [set baseName [lindex $argv [incr arg]]]
+puts [set version [lindex $argv [incr arg]]]
set files {}
-foreach i [lrange $argv 2 end] {
+foreach i [lrange $argv [incr arg] end] {
set i [file join $i]
if {[file isdir $i]} {
foreach f [lsort [glob -directory $i "*.\[13n\]"]] {
@@ -125,7 +130,6 @@ foreach i [lrange $argv 2 end] {
lappend files $i
}
}
-
source [file join [file dirname [info script]] index.tcl]
generateContents $baseName $version $files
source [file join [file dirname [info script]] man2help2.tcl]
diff --git a/tools/man2help2.tcl b/tools/man2help2.tcl
index 82aa664..aef5f61 100644
--- a/tools/man2help2.tcl
+++ b/tools/man2help2.tcl
@@ -9,7 +9,7 @@
# See the file "license.terms" for information on usage and redistribution
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
#
-# RCS: @(#) $Id: man2help2.tcl,v 1.7 2001/11/10 02:34:57 hobbs Exp $
+# RCS: @(#) $Id: man2help2.tcl,v 1.8 2002/03/28 21:45:24 davygrvy Exp $
#
# Global variables used by these scripts:
@@ -826,7 +826,7 @@ proc TPmacro {argList} {
# argList - List of arguments to the .TH macro.
proc THmacro {argList} {
- global file curPkg curSect curID id_keywords state curVer
+ global file curPkg curSect curID id_keywords state curVer bitmap
if {[llength $argList] != 5} {
set args [join $argList " "]
@@ -864,6 +864,10 @@ proc THmacro {argList} {
tab
text $curSect
font R
+ if {[info exist bitmap]} {
+ # a right justified bitmap
+ puts $file "\\\{bmrt $bitmap\\\}"
+ }
puts $file "\\fs20"
set state(breakPending) -1
}
diff --git a/win/makefile.vc b/win/makefile.vc
index d8f5f00..7bddf6b 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -12,7 +12,7 @@
# Copyright (c) 2001-2002 David Gravereaux.
#
#------------------------------------------------------------------------------
-# RCS: @(#) $Id: makefile.vc,v 1.86 2002/03/28 02:42:51 davygrvy Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.87 2002/03/28 21:45:36 davygrvy Exp $
#------------------------------------------------------------------------------
!if "$(MSVCDIR)" == ""
@@ -303,6 +303,7 @@ TCLSTUBOBJS = $(TMP_DIR)\tclStubLib.obj
### The following paths CANNOT have spaces in them.
COMPATDIR = $(ROOT)\compat
+DOCDIR = $(ROOT)\doc
GENERICDIR = $(ROOT)\generic
TOOLSDIR = $(ROOT)\tools
WINDIR = $(ROOT)\win
@@ -488,8 +489,8 @@ genstubs:
!if !exist($(TCLSH))
@echo Build tclsh first!
!else
- $(TCLSH) $(TOOLSDIR)\genStubs.tcl $(GENERICDIR) \
- $(GENERICDIR)\tcl.decls $(GENERICDIR)\tclInt.decls
+ $(TCLSH) $(TOOLSDIR:\=/)\genStubs.tcl $(GENERICDIR:\=/) \
+ $(GENERICDIR:\=/)/tcl.decls $(GENERICDIR:\=/)/tclInt.decls
!endif
@@ -501,8 +502,7 @@ depend:
!if !exist($(TCLSH))
@echo Build tclsh first!
!else
- echo $(TCL_INCLUDES)
- $(TCLSH) $(TOOLSDIR)\mkdepend.tcl -vc32 -out:"$(OUT_DIR)\depend.mk" \
+ $(TCLSH) $(TOOLSDIR:\=/)/mkdepend.tcl -vc32 -out:"$(OUT_DIR)\depend.mk" \
-passthru:"-DBUILD_tcl $(TCL_INCLUDES:"="")" $(GENERICDIR) \
$(COMPATDIR) $(WINDIR) @<<
$(TCLOBJS)
@@ -522,6 +522,8 @@ HELPRTF = $(DOCTMP_DIR)\$(PROJECT).rtf
MAN2HELP = $(DOCTMP_DIR)\man2help.tcl
MAN2HELP2 = $(DOCTMP_DIR)\man2help2.tcl
INDEX = $(DOCTMP_DIR)\index.tcl
+BMP = $(DOCTMP_DIR)\feather.bmp
+BMP_NOPATH = feather.bmp
MAN2TCL = $(DOCTMP_DIR)\man2tcl.exe
winhelp: docsetup $(HELPFILE)
@@ -529,16 +531,17 @@ winhelp: docsetup $(HELPFILE)
docsetup:
@if not exist $(DOCTMP_DIR)\nul mkdir $(DOCTMP_DIR)
-$(MAN2HELP) $(MAN2HELP2) $(INDEX): $(TOOLSDIR)\$$(@F)
+$(MAN2HELP) $(MAN2HELP2) $(INDEX) $(BMP): $(TOOLSDIR)\$$(@F)
copy $(TOOLSDIR)\$(@F) $(@D)
-$(HELPFILE): $(HELPRTF)
+$(HELPFILE): $(HELPRTF) $(BMP)
cd $(DOCTMP_DIR)
start /wait hcrtf.exe -x <<$(PROJECT).hpj
[OPTIONS]
COMPRESS=12 Hall Zeck
LCID=0x409 0x0 0x0 ; English (United States)
TITLE=Tcl/Tk Reference Manual
+BMROOT=.
CNT=$(@B).cnt
HLP=$(@B).hlp
@@ -546,23 +549,24 @@ HLP=$(@B).hlp
$(PROJECT).rtf
[WINDOWS]
-main="Tcl/Tk Reference Manual",,0
+main="Tcl/Tk Reference Manual",,27648,(r15263976),(r65535)
[CONFIG]
BrowseButtons()
-CreateButton(1, "Main Web Site", ExecFile("http://www.tcl.tk"))
-CreateButton(2, "Sourceforge", ExecFile("http://sf.net/projects/tcl"))
+CreateButton(1, "Web", ExecFile("http://www.tcl.tk"))
+CreateButton(2, "SF", ExecFile("http://sf.net/projects/tcl"))
CreateButton(3, "Wiki", ExecFile("http://wiki.tcl.tk"))
+CreateButton(4, "FAQ", ExecFile("http://www.purl.org/NET/Tcl-FAQ/"))
<<
cd $(MAKEDIR)
copy "$(DOCTMP_DIR)\$(@B).hlp" "$(OUT_DIR)"
copy "$(DOCTMP_DIR)\$(@B).cnt" "$(OUT_DIR)"
-$(MAN2TCL):
- $(cc32) -nologo -G4 -ML -O2 $(TOOLSDIR)\man2tcl.c -link -out:$@
+$(MAN2TCL): $(TOOLSDIR)\$$(@B).c
+ $(cc32) -nologo -G4 -ML -O2 -Fo$(@D)\ $(TOOLSDIR)\$(@B).c -link -out:$@
-$(HELPRTF): $(TCLSH) $(MAN2TCL) $(MAN2HELP) $(MAN2HELP2) $(INDEX)
- $(TCLSH) $(MAN2HELP) $(PROJECT) $(VERSION) $(ROOT)/doc
+$(HELPRTF): $(MAN2TCL) $(MAN2HELP) $(MAN2HELP2) $(INDEX)
+ $(TCLSH) $(MAN2HELP:\=/) -bitmap $(BMP_NOPATH) $(PROJECT) $(VERSION) $(DOCDIR:\=/)
install-docs:
!if exist($(HELPFILE))
generated by cgit v0.12 at 2024-08-20 12:45:02 (GMT)