Check-in [c7d604dff8]
Overview
Comment:Updated to not remount TclKit VFS in initialization
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:c7d604dff88fda4e48e6ccc502f647d1c81d9f22
User & Date: rkeene on 2010-09-26 04:49:20
Other Links: manifest | tags
Context
2010-09-26
04:49
Fixed issue with opening directories returning wrong error check-in: 1955802108 user: rkeene tags: trunk
04:49
Updated to not remount TclKit VFS in initialization check-in: c7d604dff8 user: rkeene tags: trunk
04:49
Updated to not provide Tk package, since that is taken care of by Tk itself check-in: d589e2755f user: rkeene tags: trunk
Changes

Modified kitsh/buildsrc/kitsh-0.0/kitInit.c from [dc3318ae4e] to [f2454b481f].

   124    124   			"set s [zlib decompress $s]\n"
   125    125   		"}\n"
   126    126   	"}\n"
   127    127   #endif /* KIT_STORAGE_MK4 */
   128    128   #ifdef KIT_STORAGE_ZIP
   129    129   	"set ::tclKitStorage \"zip\"\n"
   130    130   	"catch { load {} vfs }\n"
   131         -#  include "zipvfs.tcl.h"
   132         -	"catch {\n"
   133         -		"set ::tclKitStorage_fd [zip::open [info nameofexecutable]]\n"
          131  +	"if {[lsearch -exact [vfs::filesystem info] [info nameofexecutable]] != -1} {"
          132  +		"set s \"\"\n"
   134    133   	"}\n"
   135         -	"if {![catch { ::zip::stat $::tclKitStorage_fd boot.tcl sb }]} {\n"
          134  +	"if {![info exists s]} {\n"
          135  +#  include "zipvfs.tcl.h"
   136    136   		"catch {\n"
   137         -			"seek $::tclKitStorage_fd $sb(ino)\n"
   138         -			"zip::Data $::tclKitStorage_fd sb s\n"
          137  +			"set ::tclKitStorage_fd [::zip::open [info nameofexecutable]]\n"
          138  +		"} err\n"
          139  +		"if {![catch { ::zip::stat $::tclKitStorage_fd boot.tcl sb }]} {\n"
          140  +			"catch {\n"
          141  +				"seek $::tclKitStorage_fd $sb(ino)\n"
          142  +				"zip::Data $::tclKitStorage_fd sb s\n"
          143  +			"}\n"
   139    144   		"}\n"
   140    145   	"}\n"
   141    146   #endif /* KIT_STORAGE_ZIP */
   142    147   	"if {![info exists s]} {\n"
   143    148   		"set f [open setup.tcl]\n"
   144    149   		"set s [read $f]\n"
   145    150   		"close $f\n"