# TDBC

Check-in [396b663a38]
Bounty program for improvements to Tcl and certain Tcl packages.

Overview
Comment: Make tdbc work in combination with trunk (Tcl 9.0) Tarball | ZIP archive | SQL archive family | ancestors | descendants | both | files | file ages | folders 396b663a388f2718efaf492fe5ef859ab7943cc12f1d15b768538bf06c767e3e jan.nijtmans 2019-09-19 19:20:44
Context
 2019-09-29 13:55 Update latest rules.vc check-in: f620d57ff5 user: jan.nijtmans tags: trunk 2019-09-19 19:20 Make tdbc work in combination with trunk (Tcl 9.0) check-in: 396b663a38 user: jan.nijtmans tags: trunk 2019-08-30 12:58 Make tdbc run when it's compiled with a C++ compiler. Also remove end-of-line spacings. check-in: 1fe4cd73a5 user: jan.nijtmans tags: trunk
Changes

Changes to configure.

 3685 3686 3687 3688 3689 3690 3691 3692 3693 3694 3695 3696 3697 3698 3699  fi else TCLOO_CFLAGS="" fi fi # Announce what versions of Tcl (and TclOO) are needed TCL_VERSION_REQ=8.5; TCL_VERSION_DESIRED=8.6; TCLOO_VERSION_REQ=0.6; #----------------------------------------------------------------------- # Handle the --prefix=... option by defaulting to what Tcl gave. # Must be called after TEA_LOAD_TCLCONFIG and before TEA_SETUP_COMPILER. #-----------------------------------------------------------------------   |  3685 3686 3687 3688 3689 3690 3691 3692 3693 3694 3695 3696 3697 3698 3699  fi else TCLOO_CFLAGS="" fi fi # Announce what versions of Tcl (and TclOO) are needed TCL_VERSION_REQ=8.5-; TCL_VERSION_DESIRED=8.6; TCLOO_VERSION_REQ=0.6; #----------------------------------------------------------------------- # Handle the --prefix=... option by defaulting to what Tcl gave. # Must be called after TEA_LOAD_TCLCONFIG and before TEA_SETUP_COMPILER. #----------------------------------------------------------------------- 

Changes to configure.ac.

 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77   TEA_PATH_CONFIG(tcloo) TEA_LOAD_CONFIG(tcloo) else TCLOO_CFLAGS="" fi fi # Announce what versions of Tcl (and TclOO) are needed TCL_VERSION_REQ=8.5; AC_SUBST(TCL_VERSION_REQ) TCL_VERSION_DESIRED=8.6; AC_SUBST(TCL_VERSION_DESIRED) TCLOO_VERSION_REQ=0.6; AC_SUBST(TCLOO_VERSION_REQ) #----------------------------------------------------------------------- # Handle the --prefix=... option by defaulting to what Tcl gave. # Must be called after TEA_LOAD_TCLCONFIG and before TEA_SETUP_COMPILER. #-----------------------------------------------------------------------   |  63 64 65 66 67 68 69 70 71 72 73 74 75 76 77   TEA_PATH_CONFIG(tcloo) TEA_LOAD_CONFIG(tcloo) else TCLOO_CFLAGS="" fi fi # Announce what versions of Tcl (and TclOO) are needed TCL_VERSION_REQ=8.5-; AC_SUBST(TCL_VERSION_REQ) TCL_VERSION_DESIRED=8.6; AC_SUBST(TCL_VERSION_DESIRED) TCLOO_VERSION_REQ=0.6; AC_SUBST(TCLOO_VERSION_REQ) #----------------------------------------------------------------------- # Handle the --prefix=... option by defaulting to what Tcl gave. # Must be called after TEA_LOAD_TCLCONFIG and before TEA_SETUP_COMPILER. #----------------------------------------------------------------------- 

Changes to tests/all.tcl.

 5 6 7 8 9 10 11 12 13 14 15 16 17  # in this directory. # # Copyright (c) 1998-2000 by Scriptics Corporation. # All rights reserved. # # RCS: @(#) $Id$ package require Tcl 8.5 package require tcltest 2.2 ::tcltest::configure \ -testdir [file dirname [file normalize [info script]]] \ {*}$argv ::tcltest::runAllTests   |  5 6 7 8 9 10 11 12 13 14 15 16 17  # in this directory. # # Copyright (c) 1998-2000 by Scriptics Corporation. # All rights reserved. # # RCS: @(#)$Id$package require Tcl 8.5- package require tcltest 2.2 ::tcltest::configure \ -testdir [file dirname [file normalize [info script]]] \ {*}$argv ::tcltest::runAllTests 

Changes to tools/tdbc-man2html.tcl.

 1 2 3 4 5 6 7 8 9 10 11 12  #!/bin/sh # The next line is executed by /bin/sh, but not tcl \ exec tclsh8.4 "$0"${1+"[email protected]"} package require Tcl 8.5 # Convert Ousterhout format man pages into highly crosslinked hypertext. # # Along the way detect many unmatched font changes and other odd things. # # Note well, this program is a hack rather than a piece of software # engineering. In that sense it's probably a good example of things   | |  1 2 3 4 5 6 7 8 9 10 11 12  #!/bin/sh # The next line is executed by /bin/sh, but not tcl \ exec tclsh "$0"${1+"[email protected]"} package require Tcl 8.5- # Convert Ousterhout format man pages into highly crosslinked hypertext. # # Along the way detect many unmatched font changes and other odd things. # # Note well, this program is a hack rather than a piece of software # engineering. In that sense it's probably a good example of things 

Changes to win/makefile.vc.

 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31  # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # #------------------------------------------------------------------------------ PROJECT = tdbc RCFILE = tdbc.rc # Tcl 8.6 etc. compile with /DUNICODE. TDBC pre-nmake reform compiled # without -DUNICODE using explicit W suffixes on wide character calls. # Keep that behaviour for now. USE_WIDECHAR_API = 0 !include "rules-ext.vc" !if [echo REM = This file is generated from Makefile.vc > versions.vc] !endif !if [echo TCL_VERSION_REQ = \>> versions.vc] \ && [nmakehlp -V ..\configure.ac TCL_VERSION_REQ >> versions.vc]   < < < <  14 15 16 17 18 19 20 21 22 23 24 25 26 27  # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # #------------------------------------------------------------------------------ PROJECT = tdbc RCFILE = tdbc.rc !include "rules-ext.vc" !if [echo REM = This file is generated from Makefile.vc > versions.vc] !endif !if [echo TCL_VERSION_REQ = \>> versions.vc] \ && [nmakehlp -V ..\configure.ac TCL_VERSION_REQ >> versions.vc] 

Changes to win/rules.vc.

 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 ... 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 .... 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 .... 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 .... 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 .... 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 .... 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 .... 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 .... 1718 1719 1720 1721 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 .... 1736 1737 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747 1748 1749 1750 .... 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 1782 1783 1784 1785  # some Tcl interfaces that are not publicly exposed. # # The fragment will set the following macros: # ROOT - root of this module sources # COMPATDIR - source directory that holds compatibility sources # DOCDIR - source directory containing documentation files # GENERICDIR - platform-independent source directory # WINDIR - Windows-specific source directory # TESTDIR - directory containing test files # TOOLSDIR - directory containing build tools # _TCLDIR - root of the Tcl installation OR the Tcl sources. Not set # when building Tcl itself. # _INSTALLDIR - native form of the installation path. For Tcl # this will be the root of the Tcl installation. For extensions # this will be the lib directory under the root. ................................................................................ !ifndef DEMODIR !if exist("$(LIBDIR)\demos") DEMODIR =$(LIBDIR)\demos !else DEMODIR = $(ROOT)\demos !endif !endif # ifndef DEMODIR # Do NOT enclose WINDIR in a !ifndef because Windows always defines # WINDIR env var to point to c:\windows! # TBD - This is a potentially dangerous conflict, rename WINDIR to # something else WINDIR =$(ROOT)\win !ifndef RCDIR !if exist("$(WINDIR)\rc") RCDIR =$(WINDIR)\rc !else RCDIR = $(WINDIR) !endif !endif RCDIR =$(RCDIR:/=\) # The target directory where the built packages and binaries will be installed. # INSTALLDIR is the (optional) path specified by the user. # _INSTALLDIR is INSTALLDIR using the backslash separator syntax ................................................................................ # The name of the stubs library for the project being built STUBPREFIX = $(PROJECT)stub # Set up paths to various Tcl executables and libraries needed by extensions !if$(DOING_TCL) TCLSHNAME = $(PROJECT)sh$(TCL_VERSION)$(SUFX).exe TCLSH =$(OUT_DIR)\$(TCLSHNAME) TCLIMPLIB =$(OUT_DIR)\$(PROJECT)$(VERSION)$(SUFX).lib TCLLIBNAME =$(PROJECT)$(VERSION)$(SUFX).$(EXT) TCLLIB =$(OUT_DIR)\$(TCLLIBNAME) TCLSTUBLIBNAME =$(STUBPREFIX)$(VERSION).lib TCLSTUBLIB =$(OUT_DIR)\$(TCLSTUBLIBNAME) TCL_INCLUDES = -I"$(WINDIR)" -I"$(GENERICDIR)" !else # !$(DOING_TCL) !if $(TCLINSTALL) # Building against an installed Tcl # When building extensions, we need to locate tclsh. Depending on version # of Tcl we are building against, this may or may not have a "t" suffix. # Try various possibilities in turn. TCLSH =$(_TCLDIR)\bin\tclsh$(TCL_VERSION)$(SUFX).exe !if !exist("$(TCLSH)") &&$(TCL_THREADS) TCLSH = $(_TCLDIR)\bin\tclsh$(TCL_VERSION)t$(SUFX).exe !endif !if !exist("$(TCLSH)") TCLSH = $(_TCLDIR)\bin\tclsh$(TCL_VERSION)$(SUFX:t=).exe !endif TCLSTUBLIB =$(_TCLDIR)\lib\tclstub$(TCL_VERSION).lib TCLIMPLIB =$(_TCLDIR)\lib\tcl$(TCL_VERSION)$(SUFX).lib # When building extensions, may be linking against Tcl that does not add # "t" suffix (e.g. 8.5 or 8.7). If lib not found check for that possibility. !if !exist("$(TCLIMPLIB)") TCLIMPLIB =$(_TCLDIR)\lib\tcl$(TCL_VERSION)$(SUFX:t=).lib !endif TCL_LIBRARY = $(_TCLDIR)\lib TCLREGLIB =$(_TCLDIR)\lib\tclreg13$(SUFX:t=).lib TCLDDELIB =$(_TCLDIR)\lib\tcldde14$(SUFX:t=).lib TCLTOOLSDIR = \must\have\tcl\sources\to\build\this\target TCL_INCLUDES = -I"$(_TCLDIR)\include" !else # Building against Tcl sources TCLSH = $(_TCLDIR)\win\$(BUILDDIRTOP)\tclsh$(TCL_VERSION)$(SUFX).exe !if !exist($(TCLSH)) &&$(TCL_THREADS) TCLSH = $(_TCLDIR)\win\$(BUILDDIRTOP)\tclsh$(TCL_VERSION)t$(SUFX).exe !endif !if !exist($(TCLSH)) TCLSH =$(_TCLDIR)\win\$(BUILDDIRTOP)\tclsh$(TCL_VERSION)$(SUFX:t=).exe !endif TCLSTUBLIB =$(_TCLDIR)\win\$(BUILDDIRTOP)\tclstub$(TCL_VERSION).lib TCLIMPLIB = $(_TCLDIR)\win\$(BUILDDIRTOP)\tcl$(TCL_VERSION)$(SUFX).lib # When building extensions, may be linking against Tcl that does not add # "t" suffix (e.g. 8.5 or 8.7). If lib not found check for that possibility. !if !exist("$(TCLIMPLIB)") TCLIMPLIB =$(_TCLDIR)\win\$(BUILDDIRTOP)\tcl$(TCL_VERSION)$(SUFX:t=).lib !endif TCL_LIBRARY =$(_TCLDIR)\library TCLREGLIB = $(_TCLDIR)\win\$(BUILDDIRTOP)\tclreg13$(SUFX:t=).lib TCLDDELIB =$(_TCLDIR)\win\$(BUILDDIRTOP)\tcldde14$(SUFX:t=).lib TCLTOOLSDIR = $(_TCLDIR)\tools TCL_INCLUDES = -I"$(_TCLDIR)\generic" -I"$(_TCLDIR)\win" ................................................................................ TKIMPLIBNAME = tk$(TK_VERSION)$(SUFX).lib !if$(DOING_TK) WISH = $(OUT_DIR)\$(WISHNAME) TKSTUBLIB = $(OUT_DIR)\$(TKSTUBLIBNAME) TKIMPLIB = $(OUT_DIR)\$(TKIMPLIBNAME) TKLIB = $(OUT_DIR)\$(TKLIBNAME) TK_INCLUDES = -I"$(WINDIR)" -I"$(GENERICDIR)" !else # effectively NEED_TK !if $(TKINSTALL) # Building against installed Tk WISH =$(_TKDIR)\bin\$(WISHNAME) TKSTUBLIB =$(_TKDIR)\lib\$(TKSTUBLIBNAME) TKIMPLIB =$(_TKDIR)\lib\$(TKIMPLIBNAME) ................................................................................ !if$(TCL_MEM_DEBUG) OPTDEFINES = $(OPTDEFINES) -DTCL_MEM_DEBUG !endif !if$(TCL_COMPILE_DEBUG) OPTDEFINES = $(OPTDEFINES) -DTCL_COMPILE_DEBUG -DTCL_COMPILE_STATS !endif !if$(TCL_THREADS) && $(TCL_VERSION) <= 86 OPTDEFINES =$(OPTDEFINES) -DTCL_THREADS=1 !if $(USE_THREAD_ALLOC) OPTDEFINES =$(OPTDEFINES) -DUSE_THREAD_ALLOC=1 !endif !endif !if $(STATIC_BUILD) OPTDEFINES =$(OPTDEFINES) -DSTATIC_BUILD !endif !if $(TCL_NO_DEPRECATED) ................................................................................ !if "$(_USE_64BIT_TIME_T)" == "1" OPTDEFINES = $(OPTDEFINES) -D_USE_64BIT_TIME_T !endif # _ATL_XP_TARGETING - Newer SDK's need this to build for XP COMPILERFLAGS = /D_ATL_XP_TARGETING # Following is primarily for the benefit of extensions. Tcl 8.5 builds # Tcl without /DUNICODE, while 8.6 builds with it defined. When building # an extension, it is advisable (but not mandated) to use the same Windows # API as the Tcl build. This is accordingly defaulted below. A particular # extension can override this by pre-definining USE_WIDECHAR_API. !ifndef USE_WIDECHAR_API !if$(TCL_VERSION) > 85 USE_WIDECHAR_API = 1 !else USE_WIDECHAR_API = 0 !endif !endif !if $(USE_WIDECHAR_API) COMPILERFLAGS =$(COMPILERFLAGS) /DUNICODE /D_UNICODE !endif # Like the TEA system only set this non empty for non-Tk extensions # Note: some extensions use PACKAGE_NAME and others use PACKAGE_TCLNAME # so we pass both !if !$(DOING_TCL) && !$(DOING_TK) PKGNAMEFLAGS = -DPACKAGE_NAME="\"$(PRJ_PACKAGE_TCLNAME)\"" \ -DPACKAGE_TCLNAME="\"$(PRJ_PACKAGE_TCLNAME)\"" \ -DPACKAGE_VERSION="\"$(DOTVERSION)\"" \ ................................................................................ !if$(DEBUG) # Turn warnings into errors cwarn = $(cwarn) -WX !endif INCLUDES =$(TCL_INCLUDES) $(TK_INCLUDES)$(PRJ_INCLUDES) !if !$(DOING_TCL) && !$(DOING_TK) INCLUDES = $(INCLUDES) -I"$(GENERICDIR)" -I"$(WINDIR)" -I"$(COMPATDIR)" !endif # These flags are defined roughly in the order of the pre-reform # rules.vc/makefile.vc to help visually compare that the pre- and # post-reform build logs # cflags contains generic flags used for building practically all object files ................................................................................ @echo Installing demos to '$(DEMO_INSTALL_DIR)' @if not exist "$(DEMO_INSTALL_DIR)" mkdir "$(DEMO_INSTALL_DIR)" @if exist$(DEMODIR) $(CPYDIR) "$(DEMODIR)" "$(DEMO_INSTALL_DIR)" default-clean: @echo Cleaning$(TMP_DIR)\* ... @if exist $(TMP_DIR)\nul$(RMDIR) $(TMP_DIR) @echo Cleaning$(WINDIR)\nmakehlp.obj, nmakehlp.exe ... @if exist $(WINDIR)\nmakehlp.obj del$(WINDIR)\nmakehlp.obj @if exist $(WINDIR)\nmakehlp.exe del$(WINDIR)\nmakehlp.exe @if exist $(WINDIR)\nmakehlp.out del$(WINDIR)\nmakehlp.out @echo Cleaning $(WINDIR)\nmhlp-out.txt ... @if exist$(WINDIR)\nmhlp-out.txt del $(WINDIR)\nmhlp-out.txt @echo Cleaning$(WINDIR)\_junk.pch ... @if exist $(WINDIR)\_junk.pch del$(WINDIR)\_junk.pch @echo Cleaning $(WINDIR)\vercl.x, vercl.i ... @if exist$(WINDIR)\vercl.x del $(WINDIR)\vercl.x @if exist$(WINDIR)\vercl.i del $(WINDIR)\vercl.i @echo Cleaning$(WINDIR)\versions.vc, version.vc ... @if exist $(WINDIR)\versions.vc del$(WINDIR)\versions.vc @if exist $(WINDIR)\version.vc del$(WINDIR)\version.vc default-hose: default-clean @echo Hosing $(OUT_DIR)\* ... @if exist$(OUT_DIR)\nul $(RMDIR)$(OUT_DIR) # Only for backward compatibility default-distclean: default-hose ................................................................................ # main application, the master makefile should define explicit rules. {$(ROOT)}.c{$(TMP_DIR)}.obj:: $(CCPKGCMD) @<<$< << {$(WINDIR)}.c{$(TMP_DIR)}.obj:: $(CCPKGCMD) @<<$< << {$(GENERICDIR)}.c{$(TMP_DIR)}.obj:: $(CCPKGCMD) @<<$< ................................................................................ $(CCPKGCMD) @<<$< << {$(RCDIR)}.rc{$(TMP_DIR)}.res: $(RESCMD)$< {$(WINDIR)}.rc{$(TMP_DIR)}.res: $(RESCMD)$< {$(TMP_DIR)}.rc{$(TMP_DIR)}.res: $(RESCMD)$< .SUFFIXES: .SUFFIXES:.c .rc ................................................................................ !if $(CONFIG_CHECK) !ifdef TCLNMAKECONFIG !include$(TCLNMAKECONFIG) !if defined(CORE_MACHINE) && "$(CORE_MACHINE)" != "$(MACHINE)" !error ERROR: Build target ($(MACHINE)) does not match the Tcl library architecture ($(CORE_MACHINE)). !endif !if defined(CORE_USE_THREAD_ALLOC) && $(CORE_USE_THREAD_ALLOC) !=$(USE_THREAD_ALLOC) !message WARNING: Value of USE_THREAD_ALLOC ($(USE_THREAD_ALLOC)) does not match its Tcl core value ($(CORE_USE_THREAD_ALLOC)). !endif !if defined(CORE_DEBUG) && $(CORE_DEBUG) !=$(DEBUG) !message WARNING: Value of DEBUG ($(DEBUG)) does not match its Tcl library configuration ($(DEBUG)). !endif !endif   | | | < < | | | | | | | < < < | | | | < < < | | | | | | < < < < < < < < < < < < < < < < < | | | | | | | | | | | | | | | | | |  158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 ... 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 .... 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 .... 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 .... 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 .... 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 .... 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 .... 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 .... 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 .... 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 1721 1722 1723 1724 1725 .... 1746 1747 1748 1749 1750 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760  # some Tcl interfaces that are not publicly exposed. # # The fragment will set the following macros: # ROOT - root of this module sources # COMPATDIR - source directory that holds compatibility sources # DOCDIR - source directory containing documentation files # GENERICDIR - platform-independent source directory # WIN_DIR - Windows-specific source directory # TESTDIR - directory containing test files # TOOLSDIR - directory containing build tools # _TCLDIR - root of the Tcl installation OR the Tcl sources. Not set # when building Tcl itself. # _INSTALLDIR - native form of the installation path. For Tcl # this will be the root of the Tcl installation. For extensions # this will be the lib directory under the root. ................................................................................ !ifndef DEMODIR !if exist("$(LIBDIR)\demos") DEMODIR =$(LIBDIR)\demos !else DEMODIR = $(ROOT)\demos !endif !endif # ifndef DEMODIR # Do NOT use WINDIR because it is Windows internal environment # variable to point to c:\windows! WIN_DIR =$(ROOT)\win !ifndef RCDIR !if exist("$(WIN_DIR)\rc") RCDIR =$(WIN_DIR)\rc !else RCDIR = $(WIN_DIR) !endif !endif RCDIR =$(RCDIR:/=\) # The target directory where the built packages and binaries will be installed. # INSTALLDIR is the (optional) path specified by the user. # _INSTALLDIR is INSTALLDIR using the backslash separator syntax ................................................................................ # The name of the stubs library for the project being built STUBPREFIX = $(PROJECT)stub # Set up paths to various Tcl executables and libraries needed by extensions !if$(DOING_TCL) TCLSHNAME = $(PROJECT)sh$(VERSION)$(SUFX).exe TCLSH =$(OUT_DIR)\$(TCLSHNAME) TCLIMPLIB =$(OUT_DIR)\$(PROJECT)$(VERSION)$(SUFX).lib TCLLIBNAME =$(PROJECT)$(VERSION)$(SUFX).$(EXT) TCLLIB =$(OUT_DIR)\$(TCLLIBNAME) TCLSTUBLIBNAME =$(STUBPREFIX)$(VERSION).lib TCLSTUBLIB =$(OUT_DIR)\$(TCLSTUBLIBNAME) TCL_INCLUDES = -I"$(WIN_DIR)" -I"$(GENERICDIR)" !else # !$(DOING_TCL) !if $(TCLINSTALL) # Building against an installed Tcl # When building extensions, we need to locate tclsh. Depending on version # of Tcl we are building against, this may or may not have a "t" suffix. # Try various possibilities in turn. TCLSH =$(_TCLDIR)\bin\tclsh$(TCL_VERSION)$(SUFX:t=).exe !if !exist("$(TCLSH)") TCLSH =$(_TCLDIR)\bin\tclsh$(TCL_VERSION)t$(SUFX:t=).exe !endif TCLSTUBLIB = $(_TCLDIR)\lib\tclstub$(TCL_VERSION).lib TCLIMPLIB = $(_TCLDIR)\lib\tcl$(TCL_VERSION)$(SUFX:t=).lib # When building extensions, may be linking against Tcl that does not add # "t" suffix (e.g. 8.5 or 8.7). If lib not found check for that possibility. !if !exist("$(TCLIMPLIB)") TCLIMPLIB = $(_TCLDIR)\lib\tcl$(TCL_VERSION)t$(SUFX:t=).lib !endif TCL_LIBRARY =$(_TCLDIR)\lib TCLREGLIB = $(_TCLDIR)\lib\tclreg13$(SUFX:t=).lib TCLDDELIB = $(_TCLDIR)\lib\tcldde14$(SUFX:t=).lib TCLTOOLSDIR = \must\have\tcl\sources\to\build\this\target TCL_INCLUDES = -I"$(_TCLDIR)\include" !else # Building against Tcl sources TCLSH =$(_TCLDIR)\win\$(BUILDDIRTOP)\tclsh$(TCL_VERSION)$(SUFX:t=).exe !if !exist($(TCLSH)) TCLSH = $(_TCLDIR)\win\$(BUILDDIRTOP)\tclsh$(TCL_VERSION)t$(SUFX:t=).exe !endif TCLSTUBLIB = $(_TCLDIR)\win\$(BUILDDIRTOP)\tclstub$(TCL_VERSION).lib TCLIMPLIB =$(_TCLDIR)\win\$(BUILDDIRTOP)\tcl$(TCL_VERSION)$(SUFX:t=).lib # When building extensions, may be linking against Tcl that does not add # "t" suffix (e.g. 8.5 or 8.7). If lib not found check for that possibility. !if !exist("$(TCLIMPLIB)") TCLIMPLIB = $(_TCLDIR)\win\$(BUILDDIRTOP)\tcl$(TCL_VERSION)t$(SUFX:t=).lib !endif TCL_LIBRARY = $(_TCLDIR)\library TCLREGLIB =$(_TCLDIR)\win\$(BUILDDIRTOP)\tclreg13$(SUFX:t=).lib TCLDDELIB = $(_TCLDIR)\win\$(BUILDDIRTOP)\tcldde14$(SUFX:t=).lib TCLTOOLSDIR =$(_TCLDIR)\tools TCL_INCLUDES = -I"$(_TCLDIR)\generic" -I"$(_TCLDIR)\win" ................................................................................ TKIMPLIBNAME = tk$(TK_VERSION)$(SUFX).lib !if $(DOING_TK) WISH =$(OUT_DIR)\$(WISHNAME) TKSTUBLIB =$(OUT_DIR)\$(TKSTUBLIBNAME) TKIMPLIB =$(OUT_DIR)\$(TKIMPLIBNAME) TKLIB =$(OUT_DIR)\$(TKLIBNAME) TK_INCLUDES = -I"$(WIN_DIR)" -I"$(GENERICDIR)" !else # effectively NEED_TK !if$(TKINSTALL) # Building against installed Tk WISH = $(_TKDIR)\bin\$(WISHNAME) TKSTUBLIB = $(_TKDIR)\lib\$(TKSTUBLIBNAME) TKIMPLIB = $(_TKDIR)\lib\$(TKIMPLIBNAME) ................................................................................ !if $(TCL_MEM_DEBUG) OPTDEFINES =$(OPTDEFINES) -DTCL_MEM_DEBUG !endif !if $(TCL_COMPILE_DEBUG) OPTDEFINES =$(OPTDEFINES) -DTCL_COMPILE_DEBUG -DTCL_COMPILE_STATS !endif !if $(TCL_THREADS) &&$(TCL_VERSION) < 87 OPTDEFINES = $(OPTDEFINES) -DTCL_THREADS=1 !if$(USE_THREAD_ALLOC) && $(TCL_VERSION) < 87 OPTDEFINES =$(OPTDEFINES) -DUSE_THREAD_ALLOC=1 !endif !endif !if $(STATIC_BUILD) OPTDEFINES =$(OPTDEFINES) -DSTATIC_BUILD !endif !if $(TCL_NO_DEPRECATED) ................................................................................ !if "$(_USE_64BIT_TIME_T)" == "1" OPTDEFINES = $(OPTDEFINES) -D_USE_64BIT_TIME_T !endif # _ATL_XP_TARGETING - Newer SDK's need this to build for XP COMPILERFLAGS = /D_ATL_XP_TARGETING # Like the TEA system only set this non empty for non-Tk extensions # Note: some extensions use PACKAGE_NAME and others use PACKAGE_TCLNAME # so we pass both !if !$(DOING_TCL) && !$(DOING_TK) PKGNAMEFLAGS = -DPACKAGE_NAME="\"$(PRJ_PACKAGE_TCLNAME)\"" \ -DPACKAGE_TCLNAME="\"$(PRJ_PACKAGE_TCLNAME)\"" \ -DPACKAGE_VERSION="\"$(DOTVERSION)\"" \ ................................................................................ !if $(DEBUG) # Turn warnings into errors cwarn =$(cwarn) -WX !endif INCLUDES = $(TCL_INCLUDES)$(TK_INCLUDES) $(PRJ_INCLUDES) !if !$(DOING_TCL) && !$(DOING_TK) INCLUDES =$(INCLUDES) -I"$(GENERICDIR)" -I"$(WIN_DIR)" -I"$(COMPATDIR)" !endif # These flags are defined roughly in the order of the pre-reform # rules.vc/makefile.vc to help visually compare that the pre- and # post-reform build logs # cflags contains generic flags used for building practically all object files ................................................................................ @echo Installing demos to '$(DEMO_INSTALL_DIR)' @if not exist "$(DEMO_INSTALL_DIR)" mkdir "$(DEMO_INSTALL_DIR)" @if exist $(DEMODIR)$(CPYDIR) "$(DEMODIR)" "$(DEMO_INSTALL_DIR)" default-clean: @echo Cleaning $(TMP_DIR)\* ... @if exist$(TMP_DIR)\nul $(RMDIR)$(TMP_DIR) @echo Cleaning $(WIN_DIR)\nmakehlp.obj, nmakehlp.exe ... @if exist$(WIN_DIR)\nmakehlp.obj del $(WIN_DIR)\nmakehlp.obj @if exist$(WIN_DIR)\nmakehlp.exe del $(WIN_DIR)\nmakehlp.exe @if exist$(WIN_DIR)\nmakehlp.out del $(WIN_DIR)\nmakehlp.out @echo Cleaning$(WIN_DIR)\nmhlp-out.txt ... @if exist $(WIN_DIR)\nmhlp-out.txt del$(WIN_DIR)\nmhlp-out.txt @echo Cleaning $(WIN_DIR)\_junk.pch ... @if exist$(WIN_DIR)\_junk.pch del $(WIN_DIR)\_junk.pch @echo Cleaning$(WIN_DIR)\vercl.x, vercl.i ... @if exist $(WIN_DIR)\vercl.x del$(WIN_DIR)\vercl.x @if exist $(WIN_DIR)\vercl.i del$(WIN_DIR)\vercl.i @echo Cleaning $(WIN_DIR)\versions.vc, version.vc ... @if exist$(WIN_DIR)\versions.vc del $(WIN_DIR)\versions.vc @if exist$(WIN_DIR)\version.vc del $(WIN_DIR)\version.vc default-hose: default-clean @echo Hosing$(OUT_DIR)\* ... @if exist $(OUT_DIR)\nul$(RMDIR) $(OUT_DIR) # Only for backward compatibility default-distclean: default-hose ................................................................................ # main application, the master makefile should define explicit rules. {$(ROOT)}.c{$(TMP_DIR)}.obj::$(CCPKGCMD) @<< $< << {$(WIN_DIR)}.c{$(TMP_DIR)}.obj::$(CCPKGCMD) @<< $< << {$(GENERICDIR)}.c{$(TMP_DIR)}.obj::$(CCPKGCMD) @<< $< ................................................................................$(CCPKGCMD) @<< $< << {$(RCDIR)}.rc{$(TMP_DIR)}.res:$(RESCMD) $< {$(WIN_DIR)}.rc{$(TMP_DIR)}.res:$(RESCMD) $< {$(TMP_DIR)}.rc{$(TMP_DIR)}.res:$(RESCMD) $< .SUFFIXES: .SUFFIXES:.c .rc ................................................................................ !if$(CONFIG_CHECK) !ifdef TCLNMAKECONFIG !include $(TCLNMAKECONFIG) !if defined(CORE_MACHINE) && "$(CORE_MACHINE)" != "$(MACHINE)" !error ERROR: Build target ($(MACHINE)) does not match the Tcl library architecture ($(CORE_MACHINE)). !endif !if$(TCL_VERSION) < 87 && defined(CORE_USE_THREAD_ALLOC) && $(CORE_USE_THREAD_ALLOC) !=$(USE_THREAD_ALLOC) !message WARNING: Value of USE_THREAD_ALLOC ($(USE_THREAD_ALLOC)) does not match its Tcl core value ($(CORE_USE_THREAD_ALLOC)). !endif !if defined(CORE_DEBUG) && $(CORE_DEBUG) !=$(DEBUG) !message WARNING: Value of DEBUG ($(DEBUG)) does not match its Tcl library configuration ($(DEBUG)). !endif !endif