Beginning work in earnest on Tip#430 and Tip#453

Renamed zipfs.c to tclZipfs.c. Eliminated tclZipfs.h.

Removed the bootstrap introduced by Odie/Androwish. With zipfs in the core
one only needs to specify the TclPreInitScript

The project at least builds on OSX. Working on Windows under MSYS/MinGW next

Added a local snapshot of practcl.

3 files changed, 15 insertions, 19 deletions

diff --git a/win/Makefile.in b/win/Makefile.in
index e4ca501..118ccb1 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -152,6 +152,7 @@ SHARED_LIBRARIES 	= $(TCL_DLL_FILE) @ZLIB_DLL_FILE@
 STATIC_LIBRARIES	= $(TCL_LIB_FILE)
 
 TCLSH			= tclsh$(VER)${EXESUFFIX}
+TCLKIT			= tclkit$(VER)${EXESUFFIX}
 CAT32			= cat32$(EXEEXT)
 MAN2TCL			= man2tcl$(EXEEXT)
 
@@ -303,7 +304,7 @@ GENERIC_OBJS = \
 	tclUtil.$(OBJEXT) \
 	tclVar.$(OBJEXT) \
 	tclZlib.$(OBJEXT) \
-	zipfs.$(OBJEXT)
+	tclZipfs.$(OBJEXT)
 
 TOMMATH_OBJS = \
 	bncore.${OBJEXT} \
@@ -399,6 +400,8 @@ STUB_OBJS = \
 
 TCLSH_OBJS = tclAppInit.$(OBJEXT)
 
+TCLKIT_OBJS = tclkitMain.${OBJEXT} tclkit.${OBJEXT}
+
 ZLIB_OBJS = \
 	adler32.$(OBJEXT) \
 	compress.$(OBJEXT) \
@@ -420,7 +423,7 @@ all: binaries libraries doc packages
 
 tcltest: $(TCLSH) $(TEST_DLL_FILE)
 
-binaries: $(TCL_STUB_LIB_FILE) @LIBRARIES@ winextensions $(TCLSH)
+binaries: $(TCL_STUB_LIB_FILE) @LIBRARIES@ winextensions $(TCLSH) $(TCLKIT)
 
 winextensions: ${DDE_DLL_FILE} ${REG_DLL_FILE}
 
@@ -433,6 +436,11 @@ $(TCLSH): $(TCLSH_OBJS) @LIBRARIES@ $(TCL_STUB_LIB_FILE) tclsh.$(RES)
         tclsh.$(RES) $(CC_EXENAME) $(LDFLAGS_CONSOLE)
 	@VC_MANIFEST_EMBED_EXE@
 
+$(TCLKIT): $(TCLKIT_OBJ) @LIBRARIES@ $(TCL_STUB_LIB_FILE) tclsh.$(RES)
+	$(CC) $(CFLAGS) $(TCLKIT_OBJ) $(TCL_LIB_FILE) $(TCL_STUB_LIB_FILE) $(LIBS) \
+        tclsh.$(RES) $(CC_EXENAME) $(LDFLAGS_CONSOLE)
+	@VC_MANIFEST_EMBED_EXE@
+
 cat32.$(OBJEXT): cat.c
 	$(CC) -c $(CC_SWITCHES) @DEPARG@ $(CC_OBJNAME)
 
@@ -496,6 +504,9 @@ testMain.${OBJEXT}: tclAppInit.c
 tclMain2.${OBJEXT}: tclMain.c
 	$(CC) -c $(CC_SWITCHES) -DBUILD_tcl -DTCL_ASCII_MAIN @DEPARG@ $(CC_OBJNAME)
 
+tclkitMain.${OBJEXT}: tclAppInit.c
+	$(CC) -c $(CC_SWITCHES) -DTCL_LOCAL_MAIN_HOOK="Tclkit_MainHook" -DTCL_LOCAL_APPINIT="Tclkit_AppInit" @DEPARG@ $(CC_OBJNAME)
+
 # TIP #59, embedding of configuration information into the binary library.
 #
 # Part of Tcl's configuration information are the paths where it was installed
diff --git a/win/makefile.vc b/win/makefile.vc
index ec7afac..cf7d422 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -345,7 +345,7 @@ COREOBJS = \
 	$(TMP_DIR)\tclUtil.obj \

 	$(TMP_DIR)\tclVar.obj \

 	$(TMP_DIR)\tclZlib.obj \

-	$(TMP_DIR)\zipfs.obj

+	$(TMP_DIR)\tclZipfs.obj

 

 ZLIBOBJS = \

 	$(TMP_DIR)\adler32.obj \

diff --git a/win/tclAppInit.c b/win/tclAppInit.c
index 1c3ef9b..e06eaf5 100644
--- a/win/tclAppInit.c
+++ b/win/tclAppInit.c
@@ -25,13 +25,10 @@
 #include <tchar.h>
 
 #ifdef TCL_TEST
-#include "tclZipfs.h"
 extern Tcl_PackageInitProc Tcltest_Init;
 extern Tcl_PackageInitProc Tcltest_SafeInit;
 #endif /* TCL_TEST */
 
-MODULE_SCOPE int Tcl_Zvfs_Boot(const char *,const char *,const char *);
-
 #if defined(STATIC_BUILD) && TCL_USE_STATIC_PACKAGES
 extern Tcl_PackageInitProc Registry_Init;
 extern Tcl_PackageInitProc Dde_Init;
@@ -128,13 +125,7 @@ _tmain(
 #ifdef TCL_LOCAL_MAIN_HOOK
     TCL_LOCAL_MAIN_HOOK(&argc, &argv);
 #endif
-#ifdef TCL_ZIPVFS
-    #define TCLKIT_INIT     "main.tcl"
-    #define TCLKIT_VFSMOUNT "/zvfs"
-    Tcl_FindExecutable(argv[0]);
-    CONST char *cp=Tcl_GetNameOfExecutable();
-    Tcl_Zvfs_Boot(cp,TCLKIT_VFSMOUNT,TCLKIT_INIT);
-#endif
+
     Tcl_Main(argc, argv, TCL_LOCAL_APPINIT);
     return 0;			/* Needed only to prevent compiler warning. */
 }
@@ -165,9 +156,6 @@ Tcl_AppInit(
     if ((Tcl_Init)(interp) == TCL_ERROR) {
 	return TCL_ERROR;
     }
-    if(Tcl_StaticPackage(interp, "zipfs", Tclzipfs_Init, Tclzipfs_SafeInit) == TCL_ERROR ) {
-	return TCL_ERROR;
-    }
 
 #if defined(STATIC_BUILD) && TCL_USE_STATIC_PACKAGES
     if (Registry_Init(interp) == TCL_ERROR) {
@@ -186,9 +174,6 @@ Tcl_AppInit(
 	return TCL_ERROR;
     }
     Tcl_StaticPackage(interp, "Tcltest", Tcltest_Init, Tcltest_SafeInit);
-    if (Tclzipfs_Init(interp) == TCL_ERROR) {
-	return TCL_ERROR;
-    }
 #endif /* TCL_TEST */
 
     /*