Check-in [833e605ae0]
Overview
Comment:Updated to remove TclOO from minimal builds
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:833e605ae01761613f139658fa75fb643449ab4c
User & Date: rkeene on 2012-09-09 19:44:03
Other Links: manifest | tags
Context
2012-10-06
21:29
Updated to not attempt to build kit.res.o unless we are actually on Windows check-in: 4de28fdabf user: rkeene tags: trunk
2012-09-09
19:44
Updated to remove TclOO from minimal builds check-in: 833e605ae0 user: rkeene tags: trunk
2012-08-27
16:09
Updated to indicate win32 binaries are not runnable without WINE check-in: b6bf532c8e user: rkeene tags: trunk
Changes

Modified README from [d6d6daf628] to [e06708f800].

   131    131   		Set this variable to a non-empty string to exclude unnecessary
   132    132   		packages from Tcl build.  This excludes the following packages:
   133    133   			tcltest
   134    134   
   135    135   		Additionally, any bundled packages (in the "pkgs" directory)
   136    136   		are excluded.  This typically includes (as of Tcl 8.6):
   137    137   			itcl thread
          138  +
          139  +		Also, TclOO is removed from Tcl 8.6 forcefully.
   138    140   
   139    141   Kitsh Configure Options:
   140    142   	1. --enable-kit-storage={zip|mk4|auto}
   141    143   		Specify which type of storage to use with the Tclkit.  The
   142    144   		default is to auto-detect.  Auto-detection uses Mk4 if
   143    145   		available and built statically, otherwise it falls back to Zip.
   144    146   

Added tcl/patchscripts/minbuild-nooo.sh version [5b6fd738e8].

            1  +#! /usr/bin/env bash
            2  +
            3  +# Only apply to minimal builds
            4  +if [ -z "${KITCREATOR_MINBUILD}" ]; then
            5  +	exit 0
            6  +fi
            7  +
            8  +# Only apply if the Tcl being built actually includes OO as part of Tcl
            9  +if [ ! -f 'generic/tclOO.c' ]; then
           10  +	exit 0
           11  +fi
           12  +
           13  +# Apply OO-removing patch
           14  +patch -p1 << _EOF_
           15  +--- tclcvs_HEAD/generic/tclBasic.c	2012-09-07 16:01:14.000000000 -0500
           16  ++++ tclcvs_HEAD-OOremoved/generic/tclBasic.c	2012-09-09 13:44:06.618912251 -0500
           17  +@@ -820,8 +820,6 @@
           18  +      * Create unsupported commands for debugging bytecode and objects.
           19  +      */
           20  + 
           21  +-    Tcl_CreateObjCommand(interp, "::tcl::unsupported::disassemble",
           22  +-	    Tcl_DisassembleObjCmd, NULL, NULL);
           23  +     Tcl_CreateObjCommand(interp, "::tcl::unsupported::representation",
           24  + 	    Tcl_RepresentationCmd, NULL, NULL);
           25  + 
           26  +--- tclcvs_HEAD/generic/tclProc.c	2012-09-07 16:01:14.000000000 -0500
           27  ++++ tclcvs_HEAD-OOremoved/generic/tclProc.c	2012-09-09 13:45:16.634913713 -0500
           28  +@@ -2857,6 +2857,7 @@
           29  +  *----------------------------------------------------------------------
           30  +  */
           31  + 
           32  ++#if 0
           33  + int
           34  + Tcl_DisassembleObjCmd(
           35  +     ClientData dummy,		/* Not used. */
           36  +@@ -3072,6 +3073,7 @@
           37  +     Tcl_SetObjResult(interp, TclDisassembleByteCodeObj(codeObjPtr));
           38  +     return TCL_OK;
           39  + }
           40  ++#endif
           41  + 
           42  + /*
           43  +  * Local Variables:
           44  +--- tclcvs_HEAD/generic/tclVar.c	2012-09-07 16:01:14.000000000 -0500
           45  ++++ tclcvs_HEAD-OOremoved/generic/tclVar.c	2012-09-09 13:34:22.138912414 -0500
           46  +@@ -6360,6 +6360,7 @@
           47  + 	return;
           48  +     }
           49  + 
           50  ++#if 0
           51  +     if (iPtr->varFramePtr->isProcCallFrame & FRAME_IS_METHOD) {
           52  + 	CallContext *contextPtr = iPtr->varFramePtr->clientData;
           53  + 	Method *mPtr = contextPtr->callPtr->chain[contextPtr->index].mPtr;
           54  +@@ -6382,6 +6383,7 @@
           55  + 	    }
           56  + 	}
           57  +     }
           58  ++#endif
           59  +     Tcl_DeleteHashTable(&addedTable);
           60  + }
           61  + 
           62  +_EOF_
           63  +
           64  +# Further remove OO
           65  +cd generic
           66  +
           67  +# Remove calls to TclOOInit()
           68  +sed 's@TclOOInit(interp)@TCL_OK@' tclBasic.c > tclBasic.c.new
           69  +cat tclBasic.c.new > tclBasic.c
           70  +rm -f tclBasic.c.new
           71  +
           72  +# Rmove all TclOO* related compilation units, to be sure to catch all removals
           73  +for file in tclOO*.[ch]; do
           74  +	> "${file}"
           75  +done