jn
/
punkshell
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

make.tcl fix premature fail of vfs creation when tclkit extraction fails

master
Julian Noble 3 months ago
parent
9353ed178c
commit
716bc20063
1 changed files with 13 additions and 10 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 23
      src/make.tcl

23
src/make.tcl
Unescape View File

@ -2906,8 +2906,8 @@ foreach vfstail $vfs_tails {
set extract_kit_type "" set extract_kit_type ""
while {!$extraction_done && [llength $extraction_trylist]} { while {!$extraction_done && [llength $extraction_trylist]} {
set extract_kit_type [lpop extraction_trylist 0] set extract_kit_try [lpop extraction_trylist 0]
switch -- $extract_kit_type { switch -- $extract_kit_try {
zip - zipcat { zip - zipcat {
#for a zipkit - we need to extract the existing vfs from the runtime #for a zipkit - we need to extract the existing vfs from the runtime
#zipfs mkimg replaces the entire zipped vfs in the runtime - so we need the original data to be part of our targetvfs. #zipfs mkimg replaces the entire zipped vfs in the runtime - so we need the original data to be part of our targetvfs.
@ -2987,12 +2987,12 @@ foreach vfstail $vfs_tails {
zipfile::decode::unzip $archiveinfo $extractedzipfolder zipfile::decode::unzip $archiveinfo $extractedzipfolder
}]} { }]} {
set extraction_done 1 set extraction_done 1
set extract_kit_type $extract_kit_try
#todo - verify that init.tcl etc are present?
merge_over $extractedzipfolder $targetvfs
} }
#todo - verify that init.tcl etc are present?
merge_over $extractedzipfolder $targetvfs
} }
} }
cookit - cookfs { cookit - cookfs {
#upx easy enough to deal with if we have/install a upx executable (avail on windows via scoop, freshports for freebsd and presumably various for linux) #upx easy enough to deal with if we have/install a upx executable (avail on windows via scoop, freshports for freebsd and presumably various for linux)
@ -3021,17 +3021,19 @@ foreach vfstail $vfs_tails {
#copy from mounted runtime's vfs to the filesystem vfs #copy from mounted runtime's vfs to the filesystem vfs
merge_over $rtmountpoint $targetvfs merge_over $rtmountpoint $targetvfs
set extraction_done 1 set extraction_done 1
set extract_kit_type $extract_kit_try
} }
} }
} }
kit { kit {
if {!$have_sdx} { if {!$have_sdx} {
puts stderr "no sdx available to wrap $targetkit" puts stderr "no sdx available to unwrap $targetkit"
lappend failed_kits [list kit $targetkit reason "sdx_executable_unavailable"] lappend failed_kits [list kit $targetkit reason "sdx_executable_unavailable"]
$vfs_event targetset_end FAILED #extraction fail for one type doesn't mean we have fully failed yet
$vfs_event destroy #$vfs_event targetset_end FAILED
$vfs_installer destroy #$vfs_event destroy
continue #$vfs_installer destroy
continue ;#to next extraction attempt
} }
set raw_runtime $buildfolder/raw_$runtime_fullname set raw_runtime $buildfolder/raw_$runtime_fullname
@ -3061,6 +3063,7 @@ foreach vfstail $vfs_tails {
merge_over [file rootname $building_runtime].vfs $targetvfs merge_over [file rootname $building_runtime].vfs $targetvfs
} }
set extraction_done 1 set extraction_done 1
set extract_kit_type $extract_kit_try
file copy -force $building_runtime $raw_runtime file copy -force $building_runtime $raw_runtime
} }
cd $prev_cwd cd $prev_cwd

Write Preview
Loading…
Cancel
Save