Check-in [e65eeb202c]
Overview
Comment:Updated KitDLL to support loading Mk4tcl
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:e65eeb202cb1463b19a23bf1a7f272e81c98686c
User & Date: rkeene on 2010-10-03 21:03:04
Other Links: manifest | tags
Context
2010-10-03
21:03
Added KitDLL to test suite check-in: 35e596ec3e user: rkeene tags: trunk
21:03
Updated KitDLL to support loading Mk4tcl check-in: e65eeb202c user: rkeene tags: trunk
21:02
Updated Mk4tcl to default to being built as a shared object if target is KitDLL check-in: eea8763689 user: rkeene tags: trunk
Changes

Modified kitdll/buildsrc/kitdll-0.0/aclocal.m4 from [7935e5debe] to [7417677dde].

   260    260   				libfiles="${libfilesnostub}"
   261    261   			], [
   262    262   				DC_TEST_WHOLE_ARCHIVE_SHARED_LIB([$ARCHS $libfiles], [
   263    263   					libfiles="${libfiles}"
   264    264   				])
   265    265   			])
   266    266   		fi
          267  +
          268  +		if test "${proj}" = "mk4tcl"; then
          269  +			if test -n "$libfilesnostub"; then
          270  +				AC_DEFINE(KIT_INCLUDES_MK4TCL, [1], [Specify this if you link against mkt4tcl])
          271  +			fi
          272  +		fi
   267    273   
   268    274   		if test "$proj" = "tk"; then
   269         -			if test -n "$libfiles"; then
          275  +			if test -n "$libfilesnostub"; then
   270    276   				DC_DO_TK
   271    277   				DC_TEST_WHOLE_ARCHIVE_SHARED_LIB([$ARCHS $libfilesnostub], [
   272    278   					libfiles="${libfilesnostub}"
   273    279   				], [
   274    280   					DC_TEST_WHOLE_ARCHIVE_SHARED_LIB([$ARCHS $libfiles], [
   275    281   						libfiles="${libfiles}"
   276    282   					])

Modified kitdll/buildsrc/kitdll-0.0/kitInit.c from [733eebf3f2] to [5dad1f22e3].

    30     30   #endif
    31     31   #if 10 * TCL_MAJOR_VERSION + TCL_MINOR_VERSION < 85
    32     32   #  define KIT_INCLUDES_PWB 1
    33     33   #endif
    34     34   
    35     35   Tcl_AppInitProc Vfs_Init, Rechan_Init;
    36     36   Tcl_AppInitProc Vfs_kitdll_data_tcl_Init;
           37  +#ifdef KIT_INCLUDES_MK4TCL
           38  +Tcl_AppInitProc Mk4tcl_Init;
           39  +#endif
    37     40   #ifdef KIT_INCLUDES_PWB
    38     41   Tcl_AppInitProc Pwb_Init;
    39     42   #endif
    40     43   #ifdef TCL_THREADS
    41     44   Tcl_AppInitProc Thread_Init;
    42     45   #endif
    43     46   #ifdef _WIN32
................................................................................
    48     51    * This Tcl code is invoked whenever Tcl_Init() is called on an
    49     52    * interpreter.  It should mount up the VFS and make everything ready for
    50     53    * that interpreter to do its job.
    51     54    */
    52     55   static char *preInitCmd =
    53     56   "proc tclKitInit {} {\n"
    54     57   	"rename tclKitInit {}\n"
           58  +#ifdef KIT_INCLUDES_MK4TCL
           59  +	"catch { load {} Mk4tcl }\n"
           60  +#endif
    55     61   	"load {} tclkit::init\n"
    56     62   	"load {} rechan\n"
    57     63   	"load {} vfs\n"
    58     64   	"load {} vfs_kitdll_data_tcl\n"
    59     65   #include "vfs_kitdll.tcl.h"
    60     66   	"if {![file exists \"/.KITDLL_TCL/boot.tcl\"]} {\n"
    61     67   		"vfs::kitdll::Mount tcl /.KITDLL_TCL\n"
................................................................................
   260    266    * are ready to be used when invoked.
   261    267    */
   262    268   void __attribute__((constructor)) _Tclkit_Init(void) {
   263    269   	Tcl_StaticPackage(0, "tclkit::init", Tclkit_init_Init, NULL);
   264    270   	Tcl_StaticPackage(0, "rechan", Rechan_Init, NULL);
   265    271   	Tcl_StaticPackage(0, "vfs", Vfs_Init, NULL);
   266    272   	Tcl_StaticPackage(0, "vfs_kitdll_data_tcl", Vfs_kitdll_data_tcl_Init, NULL);
          273  +#ifdef KIT_INCLUDES_MK4TCL
          274  +	Tcl_StaticPackage(0, "Mk4tcl", Mk4tcl_Init, NULL);
          275  +#endif
   267    276   #ifdef KIT_INCLUDES_PWB
   268    277   	Tcl_StaticPackage(0, "pwb", Pwb_Init, NULL);
   269    278   #endif
   270    279   #ifdef TCL_THREADS
   271    280   	Tcl_StaticPackage(0, "Thread", Thread_Init, NULL);
   272    281   #endif
   273    282   #ifdef _WIN32