Diff

Differences From Artifact [01a4e2e7f2]:

To Artifact [b17724e7c3]:


    11     11   set kitfile [lindex $argv 0]
    12     12   set vfsdir [lindex $argv 1]
    13     13   if {[lindex $argv 2] != ""} {
    14     14   	set opt_compression [lindex $argv 2]
    15     15   }
    16     16   
    17     17   # Determine what storage mechanism is being used
    18         -## This logic must be duplicated from "kitInit.c"
    19         -set fd [open Makefile r]
           18  +set fd [open Makefile.common r]
    20     19   set data [read $fd]
    21     20   close $fd
    22     21   
    23     22   if {[string match "*KIT_STORAGE_ZIP*" $data]} {
    24     23   	set tclKitStorage zip
    25     24   }
    26     25   if {[string match "*KIT_STORAGE_MK4*" $data]} {
    27     26   	set tclKitStorage mk4
    28     27   }
    29         -
    30         -if {![info exists tclKitStorage]} {
    31         -	if {[string match "*KIT_INCLUDES_MK4TCL*" $data]} {
    32         -		set tclKitStorage mk4
    33         -	} else {
    34         -		set tclKitStorage zip
    35         -	}
           28  +if {[string match "*KIT_STORAGE_CVFS*" $data]} {
           29  +	set tclKitStorage cvfs
    36     30   }
    37     31   
    38     32   # Define procedures
    39     33   proc copy_file {srcfile destfile} {
    40     34   	switch -glob -- $srcfile {
    41     35   		"*.tcl" - "*.txt" {
    42     36   			set ifd [open $srcfile r]
................................................................................
   113    107   		if {[catch {
   114    108   			close $zipfd
   115    109   		} err]} {
   116    110   			puts stderr "Error while updating executable: $err"
   117    111   
   118    112   			exit 1
   119    113   		}
          114  +	}
          115  +	"cvfs" {
          116  +		# No-op
   120    117   	}
   121    118   }