Re-created the build mods for tip#340. Something I was doing was screwing with building

a proper shell

4 files changed, 6 insertions, 155 deletions

diff --git a/win/Makefile.in b/win/Makefile.in
index 7e371c8..b6533a4 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -152,7 +152,6 @@ 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,8 +302,8 @@ GENERIC_OBJS = \
 	tclUtf.$(OBJEXT) \
 	tclUtil.$(OBJEXT) \
 	tclVar.$(OBJEXT) \
-	tclZlib.$(OBJEXT) \
-	tclZipfs.$(OBJEXT)
+	tclZipfs.$(OBJEXT) \
+	tclZlib.$(OBJEXT)
 
 TOMMATH_OBJS = \
 	bncore.${OBJEXT} \
@@ -400,8 +399,6 @@ STUB_OBJS = \
 
 TCLSH_OBJS = tclAppInit.$(OBJEXT)
 
-TCLKIT_OBJS = tclkitMain.${OBJEXT} tclkit.${OBJEXT}
-
 ZLIB_OBJS = \
 	adler32.$(OBJEXT) \
 	compress.$(OBJEXT) \
@@ -423,7 +420,7 @@ all: binaries libraries doc packages
 
 tcltest: $(TCLSH) $(TEST_DLL_FILE)
 
-binaries: $(TCL_STUB_LIB_FILE) @LIBRARIES@ winextensions $(TCLSH) $(TCLKIT)
+binaries: $(TCL_STUB_LIB_FILE) @LIBRARIES@ winextensions $(TCLSH)
 
 winextensions: ${DDE_DLL_FILE} ${REG_DLL_FILE}
 
@@ -436,11 +433,6 @@ $(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)
 
@@ -504,9 +496,6 @@ 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
@@ -647,7 +636,6 @@ install-libraries: libraries install-tzdata install-msgs
 	@echo "Installing header files";
 	@for i in "$(GENERIC_DIR)/tcl.h" "$(GENERIC_DIR)/tclDecls.h" \
 		"$(GENERIC_DIR)/tclOO.h" "$(GENERIC_DIR)/tclOODecls.h" \
-		"$(GENERIC_DIR)/tclZipfs.h" \
 		"$(GENERIC_DIR)/tclPlatDecls.h" \
 		"$(GENERIC_DIR)/tclTomMath.h" \
 		"$(GENERIC_DIR)/tclTomMathDecls.h"; \
@@ -762,7 +750,7 @@ clean: cleanhelp clean-packages
 
 distclean: distclean-packages clean
 	$(RM) Makefile config.status config.cache config.log tclConfig.sh \
-		tcl.hpj config.status.lineno tclsh.exe.manifest
+		tcl.hpj config.status.lineno
 
 #
 # Bundled package targets
diff --git a/win/makefile.vc b/win/makefile.vc
index d360e67..dd7b061 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -344,8 +344,8 @@ COREOBJS = \
 	$(TMP_DIR)\tclUtf.obj \

 	$(TMP_DIR)\tclUtil.obj \

 	$(TMP_DIR)\tclVar.obj \

-	$(TMP_DIR)\tclZlib.obj \

-	$(TMP_DIR)\tclZipfs.obj

+	$(TMP_DIR)\tclZipfs.obj \

+	$(TMP_DIR)\tclZlib.obj

 

 ZLIBOBJS = \

 	$(TMP_DIR)\adler32.obj \

@@ -945,9 +945,6 @@ $(TMP_DIR)\tclWinTest.obj: $(WINDIR)\tclWinTest.c
 $(TMP_DIR)\tclZlib.obj: $(GENERICDIR)\tclZlib.c

 	$(cc32) $(TCL_CFLAGS) -I$(COMPATDIR)\zlib -DBUILD_tcl -Fo$@ $?

 

-$(TMP_DIR)\zipfs.obj: $(GENERICDIR)\zipfs.c

-	$(cc32) $(TCL_CFLAGS) -I$(COMPATDIR)\zlib -DBUILD_tcl -Fo$@ $?

-

 $(TMP_DIR)\tclPkgConfig.obj: $(GENERICDIR)\tclPkgConfig.c

 	$(cc32) -DBUILD_tcl $(TCL_CFLAGS) \

 	-DCFG_INSTALL_LIBDIR="\"$(LIB_INSTALL_DIR:\=\\)\"" \

@@ -1121,7 +1118,6 @@ install-libraries: tclConfig install-msgs install-tzdata
 	@$(CPY) "$(GENERICDIR)\tclDecls.h"        "$(INCLUDE_INSTALL_DIR)\"

 	@$(CPY) "$(GENERICDIR)\tclOO.h"           "$(INCLUDE_INSTALL_DIR)\"

 	@$(CPY) "$(GENERICDIR)\tclOODecls.h"      "$(INCLUDE_INSTALL_DIR)\"

-	@$(CPY) "$(GENERICDIR)\tclZipfs.h"        "$(INCLUDE_INSTALL_DIR)\"

 	@$(CPY) "$(GENERICDIR)\tclPlatDecls.h"    "$(INCLUDE_INSTALL_DIR)\"

 	@$(CPY) "$(GENERICDIR)\tclTomMath.h"      "$(INCLUDE_INSTALL_DIR)\"

 	@$(CPY) "$(GENERICDIR)\tclTomMathDecls.h" "$(INCLUDE_INSTALL_DIR)\"

diff --git a/win/tclkit.exe.manifest.in b/win/tclkit.exe.manifest.in
deleted file mode 100644
index 13c1d24..0000000
--- a/win/tclkit.exe.manifest.in
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"
-	xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
-    <assemblyIdentity
-	    version="@TCL_WIN_VERSION@"
-	    processorArchitecture="@MACHINE@"
-	    name="Tcl.tclsh"
-	    type="win32"
-	/>
-    <description>Tcl self-contained executable (tclkit)</description>
-    <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-	<security>
-	    <requestedPrivileges>
-		<requestedExecutionLevel
-			level="asInvoker"
-			uiAccess="false"
-		    />
-	    </requestedPrivileges>
-	</security>
-    </trustInfo>
-    <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
-	<application>
-	    <!-- Windows 8.1 -->
-	    <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
-	    <!-- Windows 8 -->
-	    <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
-	    <!-- Windows 7 -->
-	    <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
-	    <!-- Windows Vista -->
-	    <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
-	</application>
-    </compatibility>
-    <asmv3:application>
-	<asmv3:windowsSettings
-		xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
-	    <dpiAware>true</dpiAware>
-	</asmv3:windowsSettings>
-    </asmv3:application>
-    <dependency>
-	<dependentAssembly>
-	    <assemblyIdentity
-		    type="win32"
-		    name="Microsoft.Windows.Common-Controls"
-		    version="6.0.0.0"
-		    processorArchitecture="@MACHINE@"
-		    publicKeyToken="6595b64144ccf1df"
-		    language="*"
-		/>
-	</dependentAssembly>
-    </dependency>
-</assembly>
diff --git a/win/tclkit.rc b/win/tclkit.rc
deleted file mode 100644
index ebe37e1..0000000
--- a/win/tclkit.rc
+++ /dev/null
@@ -1,82 +0,0 @@
-//
-// Version Resource Script
-//
-
-#include <winver.h>
-#include <tcl.h>
-
-//
-// build-up the name suffix that defines the type of build this is.
-//
-#if TCL_THREADS
-#define SUFFIX_THREADS	    "t"
-#else
-#define SUFFIX_THREADS	    ""
-#endif
-
-#if STATIC_BUILD
-#define SUFFIX_STATIC	    "s"
-#else
-#define SUFFIX_STATIC	    ""
-#endif
-
-#if DEBUG && !UNCHECKED
-#define SUFFIX_DEBUG	    "g"
-#else
-#define SUFFIX_DEBUG	    ""
-#endif
-
-#define SUFFIX		    SUFFIX_THREADS SUFFIX_STATIC SUFFIX_DEBUG
-
-
-LANGUAGE 0x9, 0x1	/* LANG_ENGLISH, SUBLANG_DEFAULT */
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 	TCL_MAJOR_VERSION,TCL_MINOR_VERSION,TCL_RELEASE_LEVEL,TCL_RELEASE_SERIAL
- PRODUCTVERSION TCL_MAJOR_VERSION,TCL_MINOR_VERSION,TCL_RELEASE_LEVEL,TCL_RELEASE_SERIAL
- FILEFLAGSMASK 	0x3fL
-#ifdef DEBUG
- FILEFLAGS 	VS_FF_DEBUG
-#else
- FILEFLAGS 	0x0L
-#endif
- FILEOS 	VOS__WINDOWS32
- FILETYPE 	VFT_APP
- FILESUBTYPE 	0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "FileDescription", "Tclkit Application\0"
-            VALUE "OriginalFilename", "tclkit" STRINGIFY(TCL_MAJOR_VERSION) STRINGIFY(TCL_MINOR_VERSION) SUFFIX ".exe\0"
-            VALUE "CompanyName", "ActiveState Corporation\0"
-            VALUE "FileVersion", TCL_PATCH_LEVEL
-            VALUE "LegalCopyright", "Copyright \251 2000 by ActiveState Corporation, et al\0"
-            VALUE "ProductName", "Tcl " TCL_VERSION " for Windows\0"
-            VALUE "ProductVersion", TCL_PATCH_LEVEL
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-//
-// Icon
-//
-
-tclsh                      ICON    DISCARDABLE     "tclsh.ico"
-
-//
-// This is needed for Windows 8.1 onwards.
-//
-
-#ifndef RT_MANIFEST
-#define RT_MANIFEST     24
-#endif
-#ifndef CREATEPROCESS_MANIFEST_RESOURCE_ID
-#define CREATEPROCESS_MANIFEST_RESOURCE_ID 1
-#endif
-CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "tclkit.exe.manifest"