Check-in [78b96b6e9c]
Overview
Comment:Merged in pluggable branch
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:78b96b6e9c5287c50929f16a78d67dfb556a88a6
User & Date: rkeene on 2011-06-03 05:37:14
Other Links: manifest | tags
Context
2011-06-03
05:39
KitCreator 0.6.0 check-in: 000da8e97d user: rkeene tags: trunk, 0.6.0
05:37
Merged in pluggable branch check-in: 78b96b6e9c user: rkeene tags: trunk
2011-05-31
02:03
Updated to be pluggable Closed-Leaf check-in: 349896fca7 user: rkeene tags: pluggable
2011-05-28
23:53
Updated to only mount VFS once

Updated to always load "vfs" check-in: d5ed5900eb user: rkeene tags: trunk

Changes

build/make-kit-mipsel became a regular file with contents [814a04e3a0].


Modified kitsh/buildsrc/kitsh-0.0/Makefile.common.in from [537f4f602e] to [89e8fa6548].

    48     48   	rm -f $(OBJS) $(EXTRA_OBJS) $(EXTRA_VFS_OBJS)
    49     49   	rm -f cvfs_data_tcl.c cvfs_data_tcl.o
    50     50   	rm -f cvfs.tcl.h
    51     51   	rm -f tclsh.o tclsh tclsh.exe
    52     52   	rm -f wish.o wish wish.exe
    53     53   
    54     54   distclean: clean
           55  +	rm -f kitInit-libs.h
    55     56   	rm -f Makefile Makefile.in Makefile.common
    56     57   	rm -f config.status config.log
    57     58   	rm -f *~
    58     59   	rm -rf starpack.vfs
    59     60   	rm -rf autom4te.cache
    60     61   
    61     62   mrproper: distclean
    62     63   	rm -f configure config.h boot.tcl.h zipvfs.tcl.h
    63     64   
    64     65   .PHONY: all clean distclean mrproper

Modified kitsh/buildsrc/kitsh-0.0/aclocal.m4 from [1f1678240f] to [d398d3b4ba].

   156    156   
   157    157   AC_DEFUN(DC_FIND_TCLKIT_LIBS, [
   158    158   	DC_SETUP_TCL_PLAT_DEFS
   159    159   
   160    160   	dnl We will need this for the Tcl project, which we will always have
   161    161   	DC_CHECK_FOR_WHOLE_ARCHIVE
   162    162   
   163         -	for proj in mk4tcl tcl tclvfs tk zlib; do
   164         -		AC_MSG_CHECKING([for libraries required for ${proj}])
          163  +	echo '/* Dynamically generated. */' > kitInit-libs.h
          164  +	libs_init_funcs=""
          165  +
          166  +	for projdir in ../../../*/; do
          167  +		proj="`basename "${projdir}"`"
          168  +
          169  +		if test "${proj}" = "build"; then
          170  +			continue
          171  +		fi
          172  +
          173  +		if test "${proj}" = "kitsh"; then
          174  +			continue
          175  +		fi
   165    176   
   166    177   		projlibdir="../../../${proj}/inst"
          178  +
          179  +		if test -d "${projlibdir}"; then
          180  +			true
          181  +		else
          182  +			continue
          183  +		fi
          184  +
          185  +		AC_MSG_CHECKING([for libraries required for ${proj}])
          186  +
   167    187   		projlibfiles="`find "${projlibdir}" -name '*.a' 2>/dev/null | tr "\n" ' '`"
   168    188   		projlibfilesnostub="`find "${projlibdir}" -name '*.a' 2>/dev/null | grep -v 'stub' | tr "\n" ' '`"
   169    189   
   170    190   		AC_MSG_RESULT([${projlibfilesnostub}])
   171    191   
   172    192   		hide_symbols="1"
          193  +		initialize="1"
   173    194   
   174    195   		if test "${proj}" = "tcl"; then
   175    196   			DC_TEST_WHOLE_ARCHIVE_SHARED_LIB([$ARCHS $projlibfilesnostub], [
   176    197   				projlibfiles="${projlibfilesnostub}"
   177    198   			], [
   178    199   				DC_TEST_WHOLE_ARCHIVE_SHARED_LIB([$ARCHS $projlibfiles], [
   179    200   					projlibfiles="${projlibfiles}"
   180    201   				])
   181    202   			])
   182    203   
   183    204   			hide_symbols="0"
          205  +			initialize="0"
   184    206   		fi
   185    207   
   186    208   		if test "${proj}" = "mk4tcl"; then
   187    209   			if test -n "${projlibfiles}"; then
   188    210   				AC_DEFINE(KIT_INCLUDES_MK4TCL, [1], [Specify this if you link against mkt4tcl])
   189    211   
   190    212   				kc_cv_feature_kit_includes_mk4tcl='1'
   191    213   
   192    214   				DC_DO_STATIC_LINK_LIBCXX
   193    215   			fi
          216  +
          217  +			initialize="0"
   194    218   		fi
   195    219   
   196    220   		if test "${proj}" = "tk"; then
   197    221   			if test "${projlibfilesnostub}" != ""; then
   198    222   				DC_DO_TK
   199    223   				AC_DEFINE(KIT_INCLUDES_TK, [1], [Specify this if we link statically to Tk])
   200    224   				if test -n "${TK_VERSION}"; then
................................................................................
   212    236   					DC_TEST_WHOLE_ARCHIVE_SHARED_LIB([$ARCHS $projlibfiles], [
   213    237   						projlibfiles="${projlibfiles}"
   214    238   					])
   215    239   				])
   216    240   
   217    241   				hide_symbols="0"
   218    242   			fi
          243  +
          244  +			initialize="0"
          245  +		fi
          246  +
          247  +		if test "${proj}" = "thread"; then
          248  +			initialize="0"
          249  +		fi
          250  +
          251  +		if test "${proj}" = "tclvfs"; then
          252  +			initialize="0"
   219    253   		fi
   220    254   
   221    255   		if test "${hide_symbols}" = "1"; then
   222    256   			STRIPLIBS="${STRIPLIBS} ${projlibfiles}"
   223    257   		fi
   224    258   
   225    259   		dnl Do not explicitly link to Zlib, that will happen elsewhere
   226    260   		if test "${proj}" = "zlib"; then
   227    261   			continue
   228    262   		fi
          263  +
          264  +		if test "${initialize}" = "1"; then
          265  +			if test -n "${projlibfilesnostub}"; then
          266  +				projucase="`echo ${proj} | dd conv=ucase 2>/dev/null`"
          267  +				projtcase="`echo ${projucase} | cut -c 1``echo ${proj} | cut -c 2-`"
          268  +				lib_init_func="${projtcase}_Init"
          269  +
          270  +				echo "#define KIT_INCLUDES_${projucase}" >> kitInit-libs.h
          271  +				echo "Tcl_AppInitProc ${lib_init_func};" >> kitInit-libs.h
          272  +
          273  +				libs_init_funcs="${libs_init_funcs} ${lib_init_func}"
          274  +			fi
          275  +		fi
   229    276   
   230    277   		ARCHS="${ARCHS} ${projlibfiles}"
   231    278   	done
   232    279   
          280  +	echo '' >> kitInit-libs.h
          281  +	echo 'static void _Tclkit_GenericLib_Init(void) {' >> kitInit-libs.h
          282  +	for lib_init_func in ${libs_init_funcs}; do
          283  +		proj="`echo ${lib_init_func} | sed 's@_Init$$@@@' | dd conv=lcase 2>/dev/null`"
          284  +		echo "	Tcl_StaticPackage(0, \"${proj}\", ${lib_init_func}, NULL);" >> kitInit-libs.h
          285  +	done
          286  +	echo '	return;' >> kitInit-libs.h
          287  +	echo '}' >> kitInit-libs.h
          288  +
   233    289   	AC_SUBST(ARCHS)
   234    290   	AC_SUBST(STRIPLIBS)
   235    291   ])
   236    292   
   237    293   AC_DEFUN(DC_SETUP_TCL_PLAT_DEFS, [
   238    294   	AC_CANONICAL_BUILD
   239    295   	AC_CANONICAL_HOST

Modified kitsh/buildsrc/kitsh-0.0/kitInit.c from [50169ff8c3] to [0cfdc14cf7].

    57     57   #if 10 * TCL_MAJOR_VERSION + TCL_MINOR_VERSION < 85
    58     58   #  define KIT_INCLUDES_PWB 1
    59     59   #endif
    60     60   #if 10 * TCL_MAJOR_VERSION + TCL_MINOR_VERSION < 86
    61     61   #  define KIT_INCLUDES_ZLIB 1
    62     62   #endif
    63     63   
    64         -#ifdef KIT_INCLUDES_ITCL
    65         -Tcl_AppInitProc	Itcl_Init;
    66         -#endif
           64  +#include "kitInit-libs.h"
           65  +
    67     66   #ifdef KIT_INCLUDES_MK4TCL
    68     67   Tcl_AppInitProc	Mk4tcl_Init;
    69     68   #endif
    70     69   Tcl_AppInitProc Vfs_Init, Rechan_Init;
    71     70   #ifdef KIT_INCLUDES_PWB
    72     71   Tcl_AppInitProc	Pwb_Init;
    73     72   #endif
................................................................................
   337    336   		return;
   338    337   	}
   339    338   
   340    339   	return;
   341    340   }
   342    341   
   343    342   static void _Tclkit_Generic_Init(void) {
   344         -#ifdef KIT_INCLUDES_ITCL
   345         -	Tcl_StaticPackage(0, "Itcl", Itcl_Init, NULL);
   346         -#endif 
   347    343   #ifdef KIT_INCLUDES_MK4TCL
   348    344   	Tcl_StaticPackage(0, "Mk4tcl", Mk4tcl_Init, NULL);
   349    345   #endif
   350    346   #ifdef KIT_INCLUDES_PWB
   351    347   	Tcl_StaticPackage(0, "pwb", Pwb_Init, NULL);
   352    348   #endif 
   353    349   	Tcl_StaticPackage(0, "rechan", Rechan_Init, NULL);
................................................................................
   364    360   #ifdef _WIN32
   365    361   	Tcl_StaticPackage(0, "dde", Dde_Init, NULL);
   366    362   	Tcl_StaticPackage(0, "registry", Registry_Init, NULL);
   367    363   #endif
   368    364   #ifdef KIT_INCLUDES_TK
   369    365   	Tcl_StaticPackage(0, "Tk", Tk_Init, Tk_SafeInit);
   370    366   #endif
          367  +
          368  +	_Tclkit_GenericLib_Init();
   371    369   
   372    370   	TclSetPreInitScript(preInitCmd);
   373    371   
   374    372   	return;
   375    373   }
   376    374   
   377    375   static void _Tclkit_Interp_Init(Tcl_Interp *interp) {