Overview
Comment: | Added Tk support
Added wish test driver Fixed issue with stripping KitDLL Minor cleanup |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
2dbaa7246ac0efe038eb6283dd787b87 |
User & Date: | rkeene on 2010-09-30 09:25:08 |
Other Links: | manifest | tags |
References
2010-09-30
| ||
09:41 | • Ticket [faa590a5fa] Create KitDLL status still Verified with 1 other change artifact: 9f2565a9d0 user: rkeene | |
Context
2010-09-30
| ||
16:19 | Fixed issue with globbing a single file or directory check-in: b358be54cd user: rkeene tags: trunk | |
09:25 |
Added Tk support
Added wish test driver Fixed issue with stripping KitDLL Minor cleanup check-in: 2dbaa7246a user: rkeene tags: trunk | |
08:26 | Renamed KitDLL library from libtcl to libtclkit check-in: bec59f252e user: rkeene tags: trunk | |
Changes
Modified kitdll/build.sh from [1a4467c4d3] to [47f9c339e5].
︙ | ︙ | |||
62 63 64 65 66 67 68 | rm -rf "starpack.vfs" # Create VFS directory mkdir "starpack.vfs" mkdir "starpack.vfs/lib" ## Copy in required built directories | | < < | | 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 | rm -rf "starpack.vfs" # Create VFS directory mkdir "starpack.vfs" mkdir "starpack.vfs/lib" ## Copy in required built directories cp -r "${OTHERPKGSDIR}"/*/out/* 'starpack.vfs/' ## Rename the "vfs" package directory to what "boot.tcl" expects mv 'starpack.vfs/lib'/vfs* 'starpack.vfs/lib/vfs' ## Install "boot.tcl" cp 'boot.tcl' 'starpack.vfs/' # Build KitDLL echo "Running: ./configure --with-tcl=\"${TCLCONFIGDIR}\" ${CONFIGUREEXTRA}" ./configure --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA} echo "Running: ${MAKE:-make}" ${MAKE:-make} TCLSH_NATIVE="${TCLSH_NATIVE}" || exit 1 # Strip the KitDLL of debugging symbols, if possible "${STRIP:-strip}" -g libtclkit.* >/dev/null 2>/dev/null exit 0 ) || exit 1 exit 0 |
Modified kitdll/buildsrc/kitdll-0.0/Makefile.in from [4d217fe77e] to [6ce16de7bd].
1 2 3 4 5 6 7 8 9 10 | CC = @CC@ CFLAGS = @CFLAGS@ @SHOBJFLAGS@ -Wall CPPFLAGS = @CPPFLAGS@ @DEFS@ -DKITDLL_MAKE_LOADABLE=1 LDFLAGS = @LDFLAGS@ SHOBJLDFLAGS = @SHOBJLDFLAGS@ LIBS = @LIBS@ STATICLIBS = @ARCHS@ OBJS = vfs_kitdll_data_tcl.o kitInit.o rechan.o pwb.o TCLSH_NATIVE = tclsh | > | 1 2 3 4 5 6 7 8 9 10 11 | CC = @CC@ CFLAGS = @CFLAGS@ @SHOBJFLAGS@ -Wall CPPFLAGS = @CPPFLAGS@ @DEFS@ -DKITDLL_MAKE_LOADABLE=1 WISH_CFLAGS = @WISH_CFLAGS@ LDFLAGS = @LDFLAGS@ SHOBJLDFLAGS = @SHOBJLDFLAGS@ LIBS = @LIBS@ STATICLIBS = @ARCHS@ OBJS = vfs_kitdll_data_tcl.o kitInit.o rechan.o pwb.o TCLSH_NATIVE = tclsh |
︙ | ︙ | |||
31 32 33 34 35 36 37 38 39 40 41 42 43 44 | $(CC) $(CPPFLAGS) $(CFLAGS) -o libtclkit.@SHOBJEXT@ $(OBJS) $(LDFLAGS) $(SHOBJLDFLAGS) -Wl,--whole-archive $(STATICLIBS) -Wl,--no-whole-archive $(LIBS) # Test driver tclsh.o: tclsh.c tclsh: tclsh.o libtclkit.@SHOBJEXT@ $(CC) $(CPPFLAGS) $(CFLAGS) -o tclsh tclsh.o -L. -ltclkit -Wl,-R,`pwd` # Cleanup routeines clean: rm -f libtclkit.@SHOBJEXT@ rm -f $(OBJS) rm -f vfs_kitdll_data_tcl.c rm -f vfs_kitdll.tcl.h rm -f tclsh.o tclsh | > > > > | 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 | $(CC) $(CPPFLAGS) $(CFLAGS) -o libtclkit.@SHOBJEXT@ $(OBJS) $(LDFLAGS) $(SHOBJLDFLAGS) -Wl,--whole-archive $(STATICLIBS) -Wl,--no-whole-archive $(LIBS) # Test driver tclsh.o: tclsh.c tclsh: tclsh.o libtclkit.@SHOBJEXT@ $(CC) $(CPPFLAGS) $(CFLAGS) -o tclsh tclsh.o -L. -ltclkit -Wl,-R,`pwd` wish.o: wish.c wish: wish.o libtclkit.@SHOBJEXT@ $(CC) $(CPPFLAGS) $(CFLAGS) $(WISH_CFLAGS) -o wish wish.o -L. -ltclkit -Wl,-R,`pwd` # Cleanup routeines clean: rm -f libtclkit.@SHOBJEXT@ rm -f $(OBJS) rm -f vfs_kitdll_data_tcl.c rm -f vfs_kitdll.tcl.h rm -f tclsh.o tclsh |
︙ | ︙ |
Modified kitdll/buildsrc/kitdll-0.0/aclocal.m4 from [e402deb226] to [8720922151].
︙ | ︙ | |||
215 216 217 218 219 220 221 | ;; esac ]) AC_DEFUN(DC_FIND_TCLKIT_LIBS, [ DC_SETUP_TCL_PLAT_DEFS | > > | > > > > > > > > > > > > > > > > > | 215 216 217 218 219 220 221 222 223 224 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 253 254 255 256 257 258 | ;; esac ]) AC_DEFUN(DC_FIND_TCLKIT_LIBS, [ DC_SETUP_TCL_PLAT_DEFS WISH_CFLAGS="" for proj in tcl tclvfs tk; do AC_MSG_CHECKING([for libraries required for ${proj}]) libdir="../../../${proj}/inst" libfiles="`find "${libdir}" -name '*.a' 2>/dev/null | tr "\n" ' '`" libfilesnostub="`find "${libdir}" -name '*.a' 2>/dev/null | grep -v 'stub' | tr "\n" ' '`" if test "$proj" = "tcl"; then libfiles="${libfilesnostub}" fi if test "$proj" = "tk"; then libfiles="${libfilesnostub}" if test -n "$libfiles"; then DC_DO_TK AC_DEFINE(KIT_INCLUDES_TK, [1], [Specify this if we link statically to Tk]) if test -n "${TK_VERSION}"; then AC_DEFINE_UNQUOTED(KIT_TK_VERSION, "${TK_VERSION}${TK_PATCH_LEVEL}", [Specify the version of Tk]) fi if test "$host_os" = "mingw32msvc" -o "$host_os" = "mingw32"; then WISH_CFLAGS="-mwindows" fi fi fi ARCHS="${ARCHS} ${libfiles}" AC_MSG_RESULT([${libfiles}]) done AC_SUBST(WISH_CFLAGS) AC_SUBST(ARCHS) ]) |
Modified kitdll/buildsrc/kitdll-0.0/kitInit.c from [891f640ccd] to [6d34381c61].
|
| > > > | > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 | #ifdef KIT_INCLUDES_TK # include <tk.h> #else # include <tcl.h> #endif /* KIT_INCLUDES_TK */ #ifdef _WIN32 # define WIN32_LEAN_AND_MEAN # include <windows.h> # undef WIN32_LEAN_AND_MEAN #endif /* _WIN32 */ #include "tclInt.h" #if defined(HAVE_TCL_GETENCODINGNAMEFROMENVIRONMENT) && defined(HAVE_TCL_SETSYSTEMENCODING) # define TCLKIT_CAN_SET_ENCODING 1 #endif #if 10 * TCL_MAJOR_VERSION + TCL_MINOR_VERSION < 85 # define KIT_INCLUDES_PWB 1 |
︙ | ︙ | |||
31 32 33 34 35 36 37 38 39 40 41 42 43 44 | "vfs::kitdll::Mount tcl /.KITDLL_TCL\n" "set f [open \"/.KITDLL_TCL/boot.tcl\"]\n" "set s [read $f]\n" "close $f\n" "::tclkit::init::initInterp\n" "rename ::tclkit::init::initInterp {}\n" "uplevel #0 $s\n" #ifdef _WIN32 "catch {load {} dde}\n" "catch {load {} registry}\n" #endif /* _WIN32 */ "}\n" "tclKitInit"; | > > > > > | 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 | "vfs::kitdll::Mount tcl /.KITDLL_TCL\n" "set f [open \"/.KITDLL_TCL/boot.tcl\"]\n" "set s [read $f]\n" "close $f\n" "::tclkit::init::initInterp\n" "rename ::tclkit::init::initInterp {}\n" "uplevel #0 $s\n" #if defined(KIT_INCLUDES_TK) && defined(KIT_TK_VERSION) "package ifneeded Tk " KIT_TK_VERSION " {\n" "load {} Tk\n" "}\n" #endif #ifdef _WIN32 "catch {load {} dde}\n" "catch {load {} registry}\n" #endif /* _WIN32 */ "}\n" "tclKitInit"; |
︙ | ︙ | |||
85 86 87 88 89 90 91 92 93 94 95 96 | #ifdef TCL_THREADS Tcl_StaticPackage(0, "Thread", Thread_Init, NULL); #endif #ifdef _WIN32 Tcl_StaticPackage(0, "dde", Dde_Init, NULL); Tcl_StaticPackage(0, "registry", Registry_Init, NULL); #endif TclSetPreInitScript(preInitCmd); return; } | > > > | 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 | #ifdef TCL_THREADS Tcl_StaticPackage(0, "Thread", Thread_Init, NULL); #endif #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; } |
Modified kitdll/buildsrc/kitdll-0.0/tclsh.c from [0713d9aa46] to [5950dce536].
|
| < < < < | 1 2 3 4 5 6 7 | #include <tcl.h> int Tcl_AppInit(Tcl_Interp *interp) { return(Tcl_Init(interp)); } int main(int argc, char **argv) { |
︙ | ︙ |
Added kitdll/buildsrc/kitdll-0.0/wish.c version [59698e12d8].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 | #include <tk.h> int Tcl_AppInit(Tcl_Interp *interp) { int tcl_ret; tcl_ret = Tcl_Init(interp); if (tcl_ret == TCL_ERROR) { return(tcl_ret); } tcl_ret = Tk_Init(interp); if (tcl_ret == TCL_ERROR) { return(tcl_ret); } #ifdef _WIN32 tcl_ret = Tk_CreateConsoleWindow(interp); if (tcl_ret == TCL_ERROR) { return(tcl_ret); } #endif return(TCL_OK); } int main(int argc, char **argv) { Tk_Main(argc, argv, Tcl_AppInit); return(1); } |