Overview
Comment: | Updated to be pluggable |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | pluggable |
Files: | files | file ages | folders |
SHA1: |
349896fca7b1e43967fc2f69c6475a87 |
User & Date: | rkeene on 2011-05-31 02:03:03 |
Other Links: | branch diff | manifest | tags |
Context
2011-06-03
| ||
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:59 | Merged trunk changes into branch check-in: ddf9f18c93 user: rkeene tags: pluggable | |
Changes
Modified kitsh/buildsrc/kitsh-0.0/Makefile.common.in from [537f4f602e] to [89e8fa6548].
︙ | ︙ | |||
48 49 50 51 52 53 54 55 56 57 58 59 60 61 | rm -f $(OBJS) $(EXTRA_OBJS) $(EXTRA_VFS_OBJS) rm -f cvfs_data_tcl.c cvfs_data_tcl.o rm -f cvfs.tcl.h rm -f tclsh.o tclsh tclsh.exe rm -f wish.o wish wish.exe distclean: clean rm -f Makefile Makefile.in Makefile.common rm -f config.status config.log rm -f *~ rm -rf starpack.vfs rm -rf autom4te.cache mrproper: distclean | > | 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 | rm -f $(OBJS) $(EXTRA_OBJS) $(EXTRA_VFS_OBJS) rm -f cvfs_data_tcl.c cvfs_data_tcl.o rm -f cvfs.tcl.h rm -f tclsh.o tclsh tclsh.exe rm -f wish.o wish wish.exe distclean: clean rm -f kitInit-libs.h rm -f Makefile Makefile.in Makefile.common rm -f config.status config.log rm -f *~ rm -rf starpack.vfs rm -rf autom4te.cache mrproper: distclean |
︙ | ︙ |
Modified kitsh/buildsrc/kitsh-0.0/aclocal.m4 from [370c9cd778] to [d398d3b4ba].
︙ | ︙ | |||
155 156 157 158 159 160 161 162 163 164 165 | ]) AC_DEFUN(DC_FIND_TCLKIT_LIBS, [ DC_SETUP_TCL_PLAT_DEFS dnl We will need this for the Tcl project, which we will always have DC_CHECK_FOR_WHOLE_ARCHIVE for projdir in ../../../*/; do proj="`basename "${projdir}"`" | > > > | > > > > > > > > | 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 | ]) AC_DEFUN(DC_FIND_TCLKIT_LIBS, [ DC_SETUP_TCL_PLAT_DEFS dnl We will need this for the Tcl project, which we will always have DC_CHECK_FOR_WHOLE_ARCHIVE echo '/* Dynamically generated. */' > kitInit-libs.h libs_init_funcs="" for projdir in ../../../*/; do proj="`basename "${projdir}"`" if test "${proj}" = "build"; then continue fi if test "${proj}" = "kitsh"; then continue fi projlibdir="../../../${proj}/inst" if test -d "${projlibdir}"; then true else continue fi AC_MSG_CHECKING([for libraries required for ${proj}]) projlibfiles="`find "${projlibdir}" -name '*.a' 2>/dev/null | tr "\n" ' '`" projlibfilesnostub="`find "${projlibdir}" -name '*.a' 2>/dev/null | grep -v 'stub' | tr "\n" ' '`" AC_MSG_RESULT([${projlibfilesnostub}]) hide_symbols="1" initialize="1" if test "${proj}" = "tcl"; then DC_TEST_WHOLE_ARCHIVE_SHARED_LIB([$ARCHS $projlibfilesnostub], [ projlibfiles="${projlibfilesnostub}" ], [ DC_TEST_WHOLE_ARCHIVE_SHARED_LIB([$ARCHS $projlibfiles], [ projlibfiles="${projlibfiles}" ]) ]) hide_symbols="0" initialize="0" fi if test "${proj}" = "mk4tcl"; then if test -n "${projlibfiles}"; then AC_DEFINE(KIT_INCLUDES_MK4TCL, [1], [Specify this if you link against mkt4tcl]) kc_cv_feature_kit_includes_mk4tcl='1' DC_DO_STATIC_LINK_LIBCXX fi initialize="0" fi if test "${proj}" = "tk"; then if test "${projlibfilesnostub}" != ""; then DC_DO_TK AC_DEFINE(KIT_INCLUDES_TK, [1], [Specify this if we link statically to Tk]) if test -n "${TK_VERSION}"; then |
︙ | ︙ | |||
225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 | DC_TEST_WHOLE_ARCHIVE_SHARED_LIB([$ARCHS $projlibfiles], [ projlibfiles="${projlibfiles}" ]) ]) hide_symbols="0" fi fi if test "${hide_symbols}" = "1"; then STRIPLIBS="${STRIPLIBS} ${projlibfiles}" fi dnl Do not explicitly link to Zlib, that will happen elsewhere if test "${proj}" = "zlib"; then continue fi ARCHS="${ARCHS} ${projlibfiles}" done AC_SUBST(ARCHS) AC_SUBST(STRIPLIBS) ]) AC_DEFUN(DC_SETUP_TCL_PLAT_DEFS, [ AC_CANONICAL_BUILD AC_CANONICAL_HOST | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 | DC_TEST_WHOLE_ARCHIVE_SHARED_LIB([$ARCHS $projlibfiles], [ projlibfiles="${projlibfiles}" ]) ]) hide_symbols="0" fi initialize="0" fi if test "${proj}" = "thread"; then initialize="0" fi if test "${proj}" = "tclvfs"; then initialize="0" fi if test "${hide_symbols}" = "1"; then STRIPLIBS="${STRIPLIBS} ${projlibfiles}" fi dnl Do not explicitly link to Zlib, that will happen elsewhere if test "${proj}" = "zlib"; then continue fi if test "${initialize}" = "1"; then if test -n "${projlibfilesnostub}"; then projucase="`echo ${proj} | dd conv=ucase 2>/dev/null`" projtcase="`echo ${projucase} | cut -c 1``echo ${proj} | cut -c 2-`" lib_init_func="${projtcase}_Init" echo "#define KIT_INCLUDES_${projucase}" >> kitInit-libs.h echo "Tcl_AppInitProc ${lib_init_func};" >> kitInit-libs.h libs_init_funcs="${libs_init_funcs} ${lib_init_func}" fi fi ARCHS="${ARCHS} ${projlibfiles}" done echo '' >> kitInit-libs.h echo 'static void _Tclkit_GenericLib_Init(void) {' >> kitInit-libs.h for lib_init_func in ${libs_init_funcs}; do proj="`echo ${lib_init_func} | sed 's@_Init$$@@@' | dd conv=lcase 2>/dev/null`" echo " Tcl_StaticPackage(0, \"${proj}\", ${lib_init_func}, NULL);" >> kitInit-libs.h done echo ' return;' >> kitInit-libs.h echo '}' >> kitInit-libs.h AC_SUBST(ARCHS) AC_SUBST(STRIPLIBS) ]) AC_DEFUN(DC_SETUP_TCL_PLAT_DEFS, [ AC_CANONICAL_BUILD AC_CANONICAL_HOST |
︙ | ︙ |
Modified kitsh/buildsrc/kitsh-0.0/kitInit.c from [50169ff8c3] to [0cfdc14cf7].
︙ | ︙ | |||
57 58 59 60 61 62 63 | #if 10 * TCL_MAJOR_VERSION + TCL_MINOR_VERSION < 85 # define KIT_INCLUDES_PWB 1 #endif #if 10 * TCL_MAJOR_VERSION + TCL_MINOR_VERSION < 86 # define KIT_INCLUDES_ZLIB 1 #endif | < | | | 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 | #if 10 * TCL_MAJOR_VERSION + TCL_MINOR_VERSION < 85 # define KIT_INCLUDES_PWB 1 #endif #if 10 * TCL_MAJOR_VERSION + TCL_MINOR_VERSION < 86 # define KIT_INCLUDES_ZLIB 1 #endif #include "kitInit-libs.h" #ifdef KIT_INCLUDES_MK4TCL Tcl_AppInitProc Mk4tcl_Init; #endif Tcl_AppInitProc Vfs_Init, Rechan_Init; #ifdef KIT_INCLUDES_PWB Tcl_AppInitProc Pwb_Init; #endif |
︙ | ︙ | |||
337 338 339 340 341 342 343 | return; } return; } static void _Tclkit_Generic_Init(void) { | < < < | 336 337 338 339 340 341 342 343 344 345 346 347 348 349 | return; } return; } static void _Tclkit_Generic_Init(void) { #ifdef KIT_INCLUDES_MK4TCL Tcl_StaticPackage(0, "Mk4tcl", Mk4tcl_Init, NULL); #endif #ifdef KIT_INCLUDES_PWB Tcl_StaticPackage(0, "pwb", Pwb_Init, NULL); #endif Tcl_StaticPackage(0, "rechan", Rechan_Init, NULL); |
︙ | ︙ | |||
364 365 366 367 368 369 370 371 372 373 374 375 376 377 | #ifdef _WIN32 Tcl_StaticPackage(0, "dde", Dde_Init, NULL); Tcl_StaticPackage(0, "registry", Registry_Init, NULL); #endif #ifdef KIT_INCLUDES_TK Tcl_StaticPackage(0, "Tk", Tk_Init, Tk_SafeInit); #endif TclSetPreInitScript(preInitCmd); return; } static void _Tclkit_Interp_Init(Tcl_Interp *interp) { | > > | 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 | #ifdef _WIN32 Tcl_StaticPackage(0, "dde", Dde_Init, NULL); Tcl_StaticPackage(0, "registry", Registry_Init, NULL); #endif #ifdef KIT_INCLUDES_TK Tcl_StaticPackage(0, "Tk", Tk_Init, Tk_SafeInit); #endif _Tclkit_GenericLib_Init(); TclSetPreInitScript(preInitCmd); return; } static void _Tclkit_Interp_Init(Tcl_Interp *interp) { |
︙ | ︙ |