* win/makefile.vc: Added better support for paths with spaces in

the name. Added .lib and support .dlls to the install-binaries
target.  Added generate of a pkgIndex.tcl script to the
install-libraries target.

1 files changed, 50 insertions, 49 deletions

diff --git a/win/makefile.vc b/win/makefile.vc
index 1d3e2b3..c054590 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -2,12 +2,14 @@
 #
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-# 
+#
 # Copyright (c) 1995-1996 Sun Microsystems, Inc.
-# RCS: @(#) $Id: makefile.vc,v 1.23 1999/02/02 23:01:15 stanton Exp $
+# Copyright (c) 1998-1999 by Scriptics Corporation.
+#
+# RCS: @(#) $Id: makefile.vc,v 1.24 1999/02/03 02:59:17 stanton Exp $
 
 # Does not depend on the presence of any environment variables in
-# order to compile tcl; all needed information is derived from 
+# order to compile tcl; all needed information is derived from
 # location of the compiler directories.
 
 #
@@ -15,8 +17,6 @@
 #
 # ROOT    = top of source tree
 #
-# TMPDIR  = location where .obj files should be stored during build
-#
 # TOOLS32 = location of VC++ 32-bit development tools. Note that the
 #	    VC++ 2.0 header files are broken, so you need to use the
 #	    ones that come with the developer network CD's, or later
@@ -24,7 +24,7 @@
 #
 # TOOLS16 = location of VC++ 1.5 16-bit tools, needed to build thunking
 #	    library.  This information is optional; if the 16-bit compiler
-#	    is not available, then the 16-bit code will not be built.  
+#	    is not available, then the 16-bit code will not be built.
 #	    Tcl will still run without the 16-bit code, but...
 #		A. Under Windows 3.X you will any calls to the exec command
 #	           will return an error.
@@ -35,11 +35,11 @@
 #
 
 ROOT		= ..
-TOOLS32		= c:\progra~1\devstudio\vc
-TOOLS32_rc	= c:\progra~1\devstudio\sharedide
+TOOLS32		= c:\program files\devstudio\vc
+TOOLS32_rc	= c:\program files\devstudio\sharedide
 TOOLS16		= c:\msvc
 
-INSTALLDIR	= c:\progra~1\Tcl
+INSTALLDIR	= c:\programa files\Tcl
 
 # Set this to the appropriate value of /MACHINE: for your platform
 MACHINE	= IX86
@@ -174,17 +174,17 @@ TCLOBJS = \
 	$(TMPDIR)\tclWinNotify.obj \
 	$(TMPDIR)\tclWinPipe.obj \
 	$(TMPDIR)\tclWinSock.obj \
-	$(TMPDIR)\tclWinTime.obj 
+	$(TMPDIR)\tclWinTime.obj
 
-cc32		= $(TOOLS32)\bin\cl.exe
-link32		= $(TOOLS32)\bin\link.exe
-rc32		= $(TOOLS32_rc)\bin\rc.exe
-include32	= -I$(TOOLS32)\include
+cc32		= "$(TOOLS32)\bin\cl.exe"
+link32		= "$(TOOLS32)\bin\link.exe"
+rc32		= "$(TOOLS32_rc)\bin\rc.exe"
+include32	= -I"$(TOOLS32)\include"
 
-cc16		= $(TOOLS16)\bin\cl.exe
-link16		= $(TOOLS16)\bin\link.exe
-rc16		= $(TOOLS16)\bin\rc.exe
-include16	= -I$(TOOLS16)\include
+cc16		= "$(TOOLS16)\bin\cl.exe"
+link16		= "$(TOOLS16)\bin\link.exe"
+rc16		= "$(TOOLS16)\bin\rc.exe"
+include16	= -I"$(TOOLS16)\include"
 
 WINDIR          = $(ROOT)\win
 GENERICDIR	= $(ROOT)\generic
@@ -195,7 +195,7 @@ TCL_DEFINES	= -D__WIN32__ $(DEBUGDEFINES)
 TCL_CFLAGS	= $(cdebug) $(cflags) $(cvarsdll) $(include32) \
 			$(TCL_INCLUDES) $(TCL_DEFINES)
 CON_CFLAGS	= $(cdebug) $(cflags) $(cvars) $(include32) -DCONSOLE
-DOS_CFLAGS	= $(cdebug) $(cflags) $(include16) -AL 
+DOS_CFLAGS	= $(cdebug) $(cflags) $(include16) -AL
 DLL16_CFLAGS	= $(cdebug) $(cflags) $(include16) -ALw
 
 ######################################################################
@@ -244,14 +244,8 @@ conlibsdll = $(libcdll) $(baselibs)
 ######################################################################
 
 !IF "$(NODEBUG)" == "1"
-!IF "$(MACHINE)" == "ALPHA"
-# MSVC on Alpha doesn't understand -Ot
-cdebug = -O2i -Gs -GD
-!ELSE
-#cdebug = -Oti -Gs -GD
 # This cranks the optimization level to maximize speed
 cdebug = -O2 -Gs -GD
-!ENDIF
 !ELSE
 cdebug = -Z7 -Od -WX
 !ENDIF
@@ -291,7 +285,7 @@ cvarsdll   = $(cvars) -MDd
 
 release:    setup $(TCLSH) dlls
 dlls:	    setup $(TCL16DLL) $(TCLPIPEDLL) $(TCLREGDLL)
-all:	    setup $(TCLSH) dlls $(CAT16) $(CAT32) 
+all:	    setup $(TCLSH) dlls $(CAT16) $(CAT32)
 tcltest:    setup $(TCLTEST) dlls $(CAT16) $(CAT32)
 plugin:	    setup $(TCLPLUGINDLL) $(TCLSHP)
 install:    install-binaries install-libraries
@@ -310,14 +304,14 @@ setup:
 
 $(DUMPEXTS): $(WINDIR)\winDumpExts.c
 	$(cc32) $(CON_CFLAGS) -Fo$(TMPDIR)\ $?
-	set LIB=$(TOOLS32)\lib
+	set LIB="$(TOOLS32)\lib"
 	$(link32) $(ldebug) $(conlflags) $(guilibs) -out:$@ \
-		$(TMPDIR)\winDumpExts.obj 
+		$(TMPDIR)\winDumpExts.obj
 
 $(TCLLIB): $(TCLDLL)
 
 $(TCLDLL): $(TCLOBJS) $(TMPDIR)\tcl.def $(TMPDIR)\tcl.res
-	set LIB=$(TOOLS32)\lib
+	set LIB="$(TOOLS32)\lib"
 	$(link32) $(ldebug) $(dlllflags) -def:$(TMPDIR)\tcl.def \
 		-out:$@ $(TMPDIR)\tcl.res $(guilibsdll) @<<
 $(TCLOBJS)
@@ -326,41 +320,41 @@ $(TCLOBJS)
 $(TCLPLUGINLIB): $(TCLPLUGINDLL)
 
 $(TCLPLUGINDLL): $(TCLOBJS) $(TMPDIR)\plugin.def $(TMPDIR)\tcl.res
-	set LIB=$(TOOLS32)\lib
+	set LIB="$(TOOLS32)\lib"
 	$(link32) $(ldebug) $(dlllflags) -def:$(TMPDIR)\plugin.def \
 		-out:$@ $(TMPDIR)\tcl.res $(guilibsdll) @<<
 $(TCLOBJS)
 <<
 
 $(TCLSH): $(TCLSHOBJS) $(TCLLIB) $(TMPDIR)\tclsh.res
-	set LIB=$(TOOLS32)\lib
+	set LIB="$(TOOLS32)\lib"
 	$(link32) $(ldebug) $(conlflags) $(TMPDIR)\tclsh.res -stack:2300000 \
-		-out:$@ $(conlibsdll) $(TCLLIB) $(TCLSHOBJS) 
+		-out:$@ $(conlibsdll) $(TCLLIB) $(TCLSHOBJS)
 
 $(TCLSHP): $(TCLSHOBJS) $(TCLPLUGINLIB) $(TMPDIR)\tclsh.res
-	set LIB=$(TOOLS32)\lib
+	set LIB="$(TOOLS32)\lib"
 	$(link32) $(ldebug) $(conlflags) $(TMPDIR)\tclsh.res -stack:2300000 \
-		-out:$@ $(conlibsdll) $(TCLPLUGINLIB) $(TCLSHOBJS) 
+		-out:$@ $(conlibsdll) $(TCLPLUGINLIB) $(TCLSHOBJS)
 
 $(TCLTEST): $(TCLTESTOBJS) $(TCLLIB) $(TMPDIR)\tclsh.res
-	set LIB=$(TOOLS32)\lib
+	set LIB="$(TOOLS32)\lib"
 	$(link32) $(ldebug) $(conlflags) $(TMPDIR)\tclsh.res -stack:2300000 \
 		 -out:$@ $(conlibsdll) $(TCLLIB) $(TCLTESTOBJS)
 
 $(TCL16DLL):  $(WINDIR)\tcl16.rc $(WINDIR)\tclWin16.c
 	if exist $(cc16) $(cc16) @<<
 $(DLL16_CFLAGS) -Fo$(TMPDIR)\ $(WINDIR)\tclWin16.c
-<<                         
+<<
 	@copy << $(TMPDIR)\tclWin16.def > nul
 LIBRARY $(@B);dll
 EXETYPE WINDOWS
 CODE PRELOAD MOVEABLE DISCARDABLE
 DATA PRELOAD MOVEABLE SINGLE
-HEAPSIZE 1024 
+HEAPSIZE 1024
 EXPORTS
 	WEP @1 RESIDENTNAME
-	UTPROC @2 
-<< 
+	UTPROC @2
+<<
 	if exist $(cc16) $(link16) /NOLOGO /ONERROR:NOEXE /NOE @<<
 $(TMPDIR)\tclWin16.obj
 $@
@@ -372,22 +366,22 @@ $(TMPDIR)\tclWin16.def
 
 $(TCLPIPEDLL): $(WINDIR)\stub16.c
 	$(cc32) $(CON_CFLAGS) -Fo$(TMPDIR)\ $(WINDIR)\stub16.c
-	set LIB=$(TOOLS32)\lib
+	set LIB="$(TOOLS32)\lib"
 	$(link32) $(ldebug) $(conlflags) -out:$@ $(TMPDIR)\stub16.obj $(guilibs)
 
 $(TCLREGDLL): $(TMPDIR)\tclWinReg.obj
-	set LIB=$(TOOLS32)\lib
+	set LIB="$(TOOLS32)\lib"
 	$(link32) $(ldebug) $(dlllflags) -out:$@ $(TMPDIR)\tclWinReg.obj \
 		$(conlibsdll) $(TCLLIB)
 
 $(CAT32): $(WINDIR)\cat.c
 	$(cc32) $(CON_CFLAGS) -Fo$(TMPDIR)\ $?
-	set LIB=$(TOOLS32)\lib
+	set LIB="$(TOOLS32)\lib"
 	$(link32) $(conlflags) -out:$@ -stack:16384 $(TMPDIR)\cat.obj $(conlibs)
 
 $(CAT16): $(WINDIR)\cat.c
 	if exist $(cc16) $(cc16) $(DOS_CFLAGS) -Fo$(TMPDIR)\ $?
-	set LIB=$(TOOLS16)\lib
+	set LIB="$(TOOLS16)\lib"
 	if exist $(cc16) $(link16) /NOLOGO /ONERROR:NOEXE /NOI /STACK:16384 \
 		$(TMPDIR)\cat.obj,$@,nul,llibce.lib,nul
 
@@ -406,14 +400,22 @@ install-binaries: $(TCLSH)
 	@mkd $(LIB_INSTALL_DIR)
 	@echo installing $(TCLDLLNAME)
 	@copy $(TCLDLL) $(BIN_INSTALL_DIR)
+	@copy $(TCLLIB) $(LIB_INSTALL_DIR)
 	@echo installing $(TCLSH)
 	@copy $(TCLSH) $(BIN_INSTALL_DIR)
+	@echo installing $(TCLPIPEDLLNAME)
+	@copy $(TCLPIPEDLL) $(BIN_INSTALL_DIR)
+	@echo installing $(TCLREGDLLNAME)
+	@copy $(TCLREGDLL) $(LIB_INSTALL_DIR)
 
 install-libraries:
 	-@mkd $(LIB_INSTALL_DIR)
 	-@mkd $(INCLUDE_INSTALL_DIR)
 	-@mkd $(SCRIPT_INSTALL_DIR)
 	-@mkd $(SCRIPT_INSTALL_DIR)\http1.0
+	@copy << "$(SCRIPT_INSTALL_DIR)\pkgIndex.tcl"
+package ifneeded registry 1.0 "load [list [file join $$dir .. $(TCLREGDLLNAME)]] registry"
+<<
 	-@copy $(ROOT)\library\http1.0\http.tcl $(SCRIPT_INSTALL_DIR)\http1.0
 	-@copy $(ROOT)\library\http1.0\pkgIndex.tcl $(SCRIPT_INSTALL_DIR)\http1.0
 	-@mkd $(SCRIPT_INSTALL_DIR)\http2.0
@@ -440,8 +442,7 @@ $(TMPDIR)\tclWinInit.obj: $(WINDIR)\tclWinInit.c
 		-Fo$(TMPDIR)\ $?
 
 $(TMPDIR)\testMain.obj: $(WINDIR)\tclAppInit.c
-	$(cc32) $(TCL_CFLAGS) -DSTATIC_BUILD -DTCL_TEST \
-		-Fo$(TMPDIR)\testMain.obj $?
+	$(cc32) $(TCL_CFLAGS) -DTCL_TEST -Fo$(TMPDIR)\testMain.obj $?
 
 $(TMPDIR)\tclTest.obj: $(GENERICDIR)\tclTest.c
 	$(cc32) $(TCL_CFLAGS) -Fo$@ $?
@@ -453,7 +454,7 @@ $(TMPDIR)\tclWinTest.obj: $(WINDIR)\tclWinTest.c
 	$(cc32) $(TCL_CFLAGS) -Fo$@ $?
 
 $(TMPDIR)\tclAppInit.obj : $(WINDIR)\tclAppInit.c
-	$(cc32) $(TCL_CFLAGS) -DSTATIC_BUILD -Fo$@ $?
+	$(cc32) $(TCL_CFLAGS) -Fo$@ $?
 
 #
 # Implicit rules
@@ -473,9 +474,9 @@ $(TMPDIR)\tclAppInit.obj : $(WINDIR)\tclAppInit.c
 		$(TCL_DEFINES) $<
 
 clean:
-        -@del $(OUTDIR)\*.exp 
-	-@del $(OUTDIR)\*.lib 
-	-@del $(OUTDIR)\*.dll 
+        -@del $(OUTDIR)\*.exp
+	-@del $(OUTDIR)\*.lib
+	-@del $(OUTDIR)\*.dll
 	-@del $(OUTDIR)\*.exe
 	-@del $(OUTDIR)\*.pdb
 	-@del $(TMPDIR)\*.pch