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: |
833e605ae01761613f139658fa75fb64 |
| 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 132 133 134 135 136 137 138 139 140 141 142 143 144 |
Set this variable to a non-empty string to exclude unnecessary
packages from Tcl build. This excludes the following packages:
tcltest
Additionally, any bundled packages (in the "pkgs" directory)
are excluded. This typically includes (as of Tcl 8.6):
itcl thread
Kitsh Configure Options:
1. --enable-kit-storage={zip|mk4|auto}
Specify which type of storage to use with the Tclkit. The
default is to auto-detect. Auto-detection uses Mk4 if
available and built statically, otherwise it falls back to Zip.
| > > | 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 |
Set this variable to a non-empty string to exclude unnecessary
packages from Tcl build. This excludes the following packages:
tcltest
Additionally, any bundled packages (in the "pkgs" directory)
are excluded. This typically includes (as of Tcl 8.6):
itcl thread
Also, TclOO is removed from Tcl 8.6 forcefully.
Kitsh Configure Options:
1. --enable-kit-storage={zip|mk4|auto}
Specify which type of storage to use with the Tclkit. The
default is to auto-detect. Auto-detection uses Mk4 if
available and built statically, otherwise it falls back to Zip.
|
| ︙ | ︙ |
Added tcl/patchscripts/minbuild-nooo.sh version [5b6fd738e8].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 |
#! /usr/bin/env bash
# Only apply to minimal builds
if [ -z "${KITCREATOR_MINBUILD}" ]; then
exit 0
fi
# Only apply if the Tcl being built actually includes OO as part of Tcl
if [ ! -f 'generic/tclOO.c' ]; then
exit 0
fi
# Apply OO-removing patch
patch -p1 << _EOF_
--- tclcvs_HEAD/generic/tclBasic.c 2012-09-07 16:01:14.000000000 -0500
+++ tclcvs_HEAD-OOremoved/generic/tclBasic.c 2012-09-09 13:44:06.618912251 -0500
@@ -820,8 +820,6 @@
* Create unsupported commands for debugging bytecode and objects.
*/
- Tcl_CreateObjCommand(interp, "::tcl::unsupported::disassemble",
- Tcl_DisassembleObjCmd, NULL, NULL);
Tcl_CreateObjCommand(interp, "::tcl::unsupported::representation",
Tcl_RepresentationCmd, NULL, NULL);
--- tclcvs_HEAD/generic/tclProc.c 2012-09-07 16:01:14.000000000 -0500
+++ tclcvs_HEAD-OOremoved/generic/tclProc.c 2012-09-09 13:45:16.634913713 -0500
@@ -2857,6 +2857,7 @@
*----------------------------------------------------------------------
*/
+#if 0
int
Tcl_DisassembleObjCmd(
ClientData dummy, /* Not used. */
@@ -3072,6 +3073,7 @@
Tcl_SetObjResult(interp, TclDisassembleByteCodeObj(codeObjPtr));
return TCL_OK;
}
+#endif
/*
* Local Variables:
--- tclcvs_HEAD/generic/tclVar.c 2012-09-07 16:01:14.000000000 -0500
+++ tclcvs_HEAD-OOremoved/generic/tclVar.c 2012-09-09 13:34:22.138912414 -0500
@@ -6360,6 +6360,7 @@
return;
}
+#if 0
if (iPtr->varFramePtr->isProcCallFrame & FRAME_IS_METHOD) {
CallContext *contextPtr = iPtr->varFramePtr->clientData;
Method *mPtr = contextPtr->callPtr->chain[contextPtr->index].mPtr;
@@ -6382,6 +6383,7 @@
}
}
}
+#endif
Tcl_DeleteHashTable(&addedTable);
}
_EOF_
# Further remove OO
cd generic
# Remove calls to TclOOInit()
sed 's@TclOOInit(interp)@TCL_OK@' tclBasic.c > tclBasic.c.new
cat tclBasic.c.new > tclBasic.c
rm -f tclBasic.c.new
# Rmove all TclOO* related compilation units, to be sure to catch all removals
for file in tclOO*.[ch]; do
> "${file}"
done
|