Overview
| Comment: | More work towards integrating KitDLL and KitSH -- C-VFS tested working within KitSH |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | merge-kitdll-kitsh-common |
| Files: | files | file ages | folders |
| SHA1: | 7d18befb92d05ae3980536cc775c7730db195808 |
| User & Date: | rkeene on 2011-05-21 15:09:07 |
| Other Links: | manifest | tags |
Context
|
2011-05-21
| ||
| 15:57 | Added file missing from last commit check-in: ef0c50058f user: rkeene tags: merge-kitdll-kitsh-common | |
| 15:09 | More work towards integrating KitDLL and KitSH -- C-VFS tested working within KitSH check-in: 7d18befb92 user: rkeene tags: merge-kitdll-kitsh-common | |
|
2011-05-20
| ||
| 06:31 |
Fixed bug with determining which build is selected
Fixed unexplained bug with determining the target OS information Updated to supply the VFS before building (in support of future C-VFS) check-in: b5b42e2343 user: rkeene tags: merge-kitdll-kitsh-common | |
Changes
build/make-kit-mipsel became executable with contents [814a04e3a0].
Modified kitsh/buildsrc/kitsh-0.0/Makefile.kitdll.in from [54a46a52d1] to [9cd9dc1edd].
11 11 OBJS = vfs_kitdll_data_tcl.o kitInit.o rechan.o pwb.o zlib.o 12 12 EXTRA_OBJS = @EXTRA_OBJS@ 13 13 TCLSH_NATIVE = tclsh 14 14 15 15 # Default target 16 16 all: libtclkit@KITDLL_LIB_VERSION@.@SHOBJEXT@ 17 17 18 -# Build targets 19 -## VFS Build 20 -vfs_kitdll_data_tcl.o: vfs_kitdll_data_tcl.c 21 -vfs_kitdll_data_tcl.c: dir2c.tcl starpack.vfs vfs_kitdll_data.c 22 - "$(TCLSH_NATIVE)" dir2c.tcl tcl starpack.vfs > vfs_kitdll_data_tcl.c 18 +-include Makefile.common 23 19 24 20 ## Tclkit Build 25 21 kitInit.o: kitInit.c vfs_kitdll.tcl.h 26 -vfs_kitdll.tcl.h: vfs_kitdll.tcl 27 - "$(TCLSH_NATIVE)" ./stringify.tcl vfs_kitdll.tcl > vfs_kitdll.tcl.h 28 22 29 23 ## Extensions 30 24 rechan.o: rechan.c 31 25 pwb.o: pwb.c 32 26 zlib.o: zlib.c 33 27 34 28 ## DLL Build ................................................................................ 53 47 rm -f vfs_kitdll.tcl.h 54 48 rm -f tclsh.o tclsh tclsh.exe 55 49 rm -f wish.o wish wish.exe 56 50 57 51 distclean: clean 58 52 rm -f config.status config.log 59 53 rm -f *~ 60 - rm -f Makefile 54 + rm -f Makefile Makefile.in Makefile.common 61 55 rm -rf starpack.vfs 62 56 63 57 mrproper: distclean 64 58 65 59 .PHONY: all clean distclean
Modified kitsh/buildsrc/kitsh-0.0/Makefile.tclkit.in from [ca60ee8255] to [2493fcdddc].
5 5 LDFLAGS = @LDFLAGS@ 6 6 LIBS = @LIBS@ 7 7 ARCHS = @ARCHS@ 8 8 OBJS = kitInit.o main.o pwb.o rechan.o zlib.o winMain.o 9 9 EXTRA_OBJS = @EXTRA_OBJS@ 10 10 11 11 all: kit 12 + 13 +-include Makefile.common 12 14 13 15 kit.res.o: kit.rc kit.ico 14 16 $(RC) -o kit.res.o $(CPPFLAGS) kit.rc 15 17 16 18 kit: $(OBJS) $(EXTRA_OBJS) $(ARCHS) 17 19 $(CC) $(CPPFLAGS) $(CFLAGS) -o kit $(OBJS) $(EXTRA_OBJS) $(ARCHS) $(LDFLAGS) $(LIBS) 18 20 19 21 boot.tcl.h: boot.tcl 20 - ./stringify.tcl boot.tcl > boot.tcl.h 22 + "$(TCLSH_NATIVE)" ./stringify.tcl boot.tcl > boot.tcl.h 21 23 22 24 zipvfs.tcl.h: zipvfs.tcl 23 - ./stringify.tcl zipvfs.tcl > zipvfs.tcl.h 25 + "$(TCLSH_NATIVE)" ./stringify.tcl zipvfs.tcl > zipvfs.tcl.h 24 26 25 27 clean: 26 28 rm -f kit $(OBJS) kit.res.o 27 29 28 30 distclean: clean 29 - rm -f config.h Makefile Makefile.in config.log config.status 31 + rm -f config.h Makefile Makefile.in Makefile.common config.log config.status 30 32 rm -rf autom4te.cache 31 33 32 34 mrproper: distclean 33 35 rm -f configure config.h boot.tcl.h zipvfs.tcl.h 34 36 35 37 .PHONY: all clean distclean
Modified kitsh/buildsrc/kitsh-0.0/boot.tcl from [6dee5fa1e9] to [f82ab7409d].
70 70 } 71 71 } 72 72 73 73 seek $::tclKitStorage_fd 0 74 74 set vfsHandler [list ::vfs::zip::handler $::tclKitStorage_fd] 75 75 unset ::tclKitStorage_fd 76 76 } 77 + "cvfs" { 78 + set vfsHandler [list ::vfs::kitdll::vfshandler tcl] 79 + } 77 80 } 78 81 79 82 # mount the executable, i.e. make all runtime files available 80 83 vfs::filesystem mount $noe $vfsHandler 81 84 82 85 # alter path to find encodings 83 86 if {[info tclversion] eq "8.4"} {
Modified kitsh/buildsrc/kitsh-0.0/configure.ac from [a823c6235c] to [c9dbeb54a1].
165 165 fi 166 166 167 167 dnl Put correct Makefile template in place 168 168 rm -f Makefile.in 169 169 cp Makefile.${TARGET}.in Makefile.in 170 170 171 171 dnl Produce output 172 -AC_OUTPUT(Makefile) 172 +AC_OUTPUT(Makefile Makefile.common)