@ -1166,8 +1166,10 @@ proc ::punkboot::lib::mapvfs_parse_config {mapfile rtbase sourcefolder default_t
# T A R G E T . e x e s u f f i x , d u p l i c a t e a p p n a m e - > < a p p n a m e > _ < r u n t i m e > ) s o l i s t e d n a m e s # T A R G E T . e x e s u f f i x , d u p l i c a t e a p p n a m e - > < a p p n a m e > _ < r u n t i m e > ) s o l i s t e d n a m e s
# m a t c h w h a t a b a k e p r o d u c e s . E n t r i e s w h o s e v f s f o l d e r i s m i s s i n g o n d i s k n e v e r # m a t c h w h a t a b a k e p r o d u c e s . E n t r i e s w h o s e v f s f o l d e r i s m i s s i n g o n d i s k n e v e r
# r e a c h t h e k i t l o o p - t h e y a r e a p p e n d e d a f t e r t h e b u i l d a b l e s e t s o ' b a k e l i s t ' # r e a c h t h e k i t l o o p - t h e y a r e a p p e n d e d a f t e r t h e b u i l d a b l e s e t s o ' b a k e l i s t '
# c a n s u r f a c e t h e m a s b r o k e n c o n f i g . D u p l i c a t e - n a m e d i s a m b i g u a t i o n a s s u m e s t h e # c a n s u r f a c e t h e m a s b r o k e n c o n f i g . D u p l i c a t e - n a m e d i s a m b i g u a t i o n i s p e r T A R G E T
# c o n f i g k e e p s a p p n a m e s u n i q u e ( a s t h e k i t l o o p i t s e l f e f f e c t i v e l y d o e s ) . # ( G - 1 2 7 ) : s a m e - n a m e d k i t s f o r d i f f e r e n t t a r g e t s c o e x i s t u n d e r t h e i r o w n o u t p u t
# t i e r s ; a s a m e - t a r g e t d u p l i c a t e a s s u m e s t h e c o n f i g k e e p s a p p n a m e s u n i q u e ( a s
# t h e k i t l o o p i t s e l f e f f e c t i v e l y d o e s ) .
# $ r t b a s e i s t h e s t o r e R O O T ( b i n / r u n t i m e ) : e a c h r e c o r d r e s o l v e s i t s o w n t i e r # $ r t b a s e i s t h e s t o r e R O O T ( b i n / r u n t i m e ) : e a c h r e c o r d r e s o l v e s i t s o w n t i e r
# u n d e r i t , s o e n t r i e s t a r g e t i n g d i f f e r e n t p l a t f o r m s r e p o r t t h e i r o w n s t o r e # u n d e r i t , s o e n t r i e s t a r g e t i n g d i f f e r e n t p l a t f o r m s r e p o r t t h e i r o w n s t o r e
# p r e s e n c e ( G - 1 2 2 ) . R e t u r n s a l i s t o f r e c o r d d i c t s : # p r e s e n c e ( G - 1 2 2 ) . R e t u r n s a l i s t o f r e c o r d d i c t s :
@ -1180,6 +1182,9 @@ proc ::punkboot::lib::mapvfs_parse_config {mapfile rtbase sourcefolder default_t
# r u n t i m e _ d i r s t o r e t i e r f o l d e r h o l d i n g t h e r u n t i m e ( " " f o r " - " ) # r u n t i m e _ d i r s t o r e t i e r f o l d e r h o l d i n g t h e r u n t i m e ( " " f o r " - " )
# t a r g e t t a r g e t p l a t f o r m ( e . g w i n 3 2 - x 8 6 _ 6 4 ) # t a r g e t t a r g e t p l a t f o r m ( e . g w i n 3 2 - x 8 6 _ 6 4 )
# s t o r e _ t i e r b i n / r u n t i m e t i e r f o l d e r n a m e f o r t h e t a r g e t # s t o r e _ t i e r b i n / r u n t i m e t i e r f o l d e r n a m e f o r t h e t a r g e t
# o u t _ t i e r k i t O U T P U T t i e r r e l a t i v e t o b i n / a n d s r c / _ b u i l d / - " " f o r t h e
# d e f a u l t ( h o s t ) t a r g e t ' s f l a t l o c a t i o n s , " k i t s / < p l a t f o r m > " f o r a n y
# o t h e r t a r g e t ( G - 1 2 7 )
# v f s v f s f o l d e r t a i l ( e . g p u n k 9 w i n t k 9 0 3 . v f s ) # v f s v f s f o l d e r t a i l ( e . g p u n k 9 w i n t k 9 0 3 . v f s )
# v f s _ p r e s e n t 1 | 0 # v f s _ p r e s e n t 1 | 0
# s m o k e r e q u i r e G - 1 3 3 s m o k e - r e q u i r e p a c k a g e l i s t a s c o n f i g u r e d ( " " w h e n u n d e c l a r e d ) # s m o k e r e q u i r e G - 1 3 3 s m o k e - r e q u i r e p a c k a g e l i s t a s c o n f i g u r e d ( " " w h e n u n d e c l a r e d )
@ -1228,14 +1233,16 @@ proc ::punkboot::lib::mapvfs_kit_outputs {model rtbase sourcefolder} {
set runtime_file $rtname [ : : punkboot : : lib::platform_exe_suffix $target ] set runtime_file $rtname [ : : punkboot : : lib::platform_exe_suffix $target ]
set targetkit $ { appname } [ : : punkboot : : lib::platform_exe_suffix $target ] set targetkit $ { appname } [ : : punkboot : : lib::platform_exe_suffix $target ]
set kitname $appname set kitname $appname
if { $targetkit in $exe_names_seen } { if { [ list $target $targetkit ] in $exe_names_seen } {
# d u p l i c a t e a p p n a m e c o n f i g u r e d - k i t l o o p d i s a m b i g u a t e s t h e s a m e w a y # d u p l i c a t e a p p n a m e c o n f i g u r e d f o r t h e s a m e t a r g e t - k i t l o o p
# d i s a m b i g u a t e s t h e s a m e w a y ( G - 1 2 7 : d i f f e r e n t - t a r g e t n a m e s a k e s
# c o e x i s t u n d e r t h e i r o w n k i t s / < p l a t f o r m > / o u t p u t t i e r s i n s t e a d )
set targetkit $ { appname } _$rtname set targetkit $ { appname } _$rtname
set kitname $ { appname } _$rtname set kitname $ { appname } _$rtname
} }
set runtime_present [ file exists [ file join $runtime_dir $runtime_file ] ] set runtime_present [ file exists [ file join $runtime_dir $runtime_file ] ]
} }
lappend exe_names_seen $targetkit lappend exe_names_seen [ list $target $targetkit ]
lappend records [ dict create\ lappend records [ dict create\
kitname $kitname \ kitname $kitname \
targetkit $targetkit \ targetkit $targetkit \
@ -1246,6 +1253,7 @@ proc ::punkboot::lib::mapvfs_kit_outputs {model rtbase sourcefolder} {
runtime_dir $runtime_dir \ runtime_dir $runtime_dir \
target $target \ target $target \
store_tier $store_tier \ store_tier $store_tier \
out_tier [ expr { $target eq $default_target ? { } : " k i t s / $ t a r g e t " } ] \
vfs $vfstail \ vfs $vfstail \
vfs_present [ file isdirectory [ file join $sourcefolder vfs $vfstail ] ] \ vfs_present [ file isdirectory [ file join $sourcefolder vfs $vfstail ] ] \
smokerequire $smokerequires \ smokerequire $smokerequires \
@ -4690,7 +4698,14 @@ if {$::punkboot::command eq "bakelist"} {
set kit_type [ dict get $rec kit_type] set kit_type [ dict get $rec kit_type]
set runtime [ dict get $rec runtime] set runtime [ dict get $rec runtime]
set vfstail [ dict get $rec vfs] set vfstail [ dict get $rec vfs]
set deployed [ punkboot : : lib::kit_deploy_state $buildfolder $binfolder [ dict get $rec targetkit] ] # G - 1 2 7 : d e p l o y - s t a t e r o o t s f o l l o w t h e r e c o r d ' s o u t p u t t i e r ( n o n - d e f a u l t
# t a r g e t s l i v e u n d e r k i t s / < p l a t f o r m > / i n b o t h b i n / a n d s r c / _ b u i l d / )
set out_tier [ dict get $rec out_tier]
if { $out_tier eq " " } {
set deployed [ punkboot : : lib::kit_deploy_state $buildfolder $binfolder [ dict get $rec targetkit] ]
} else {
set deployed [ punkboot : : lib::kit_deploy_state $buildfolder / $out_tier $binfolder / $out_tier [ dict get $rec targetkit] ]
}
set notes [ list ] set notes [ list ]
if { $runtime ne " - " && ! [ dict get $rec runtime_present] } { if { $runtime ne " - " && ! [ dict get $rec runtime_present] } {
lappend notes runtime= missing lappend notes runtime= missing
@ -4702,6 +4717,8 @@ if {$::punkboot::command eq "bakelist"} {
# c r o s s - t a r g e t e n t r y : i t s r u n t i m e , s t o r e t i e r a n d a r t i f a c t n a m i n g f o l l o w # c r o s s - t a r g e t e n t r y : i t s r u n t i m e , s t o r e t i e r a n d a r t i f a c t n a m i n g f o l l o w
# i t s o w n p l a t f o r m , n o t t h i s h o s t ' s d e f a u l t # i t s o w n p l a t f o r m , n o t t h i s h o s t ' s d e f a u l t
lappend notes target= [ dict get $rec target] lappend notes target= [ dict get $rec target]
# G - 1 2 7 : a n d i t s b u i l d / d e p l o y l o c a t i o n s s i t u n d e r t h e k i t s / < p l a t f o r m > / t i e r
lappend notes out= $out_tier /
} }
if { [ dict get $rec group] ne " " } { if { [ dict get $rec group] ne " " } {
lappend notes group= [ dict get $rec group] lappend notes group= [ dict get $rec group]
@ -4784,8 +4801,9 @@ if {$::punkboot::command eq "bakelist"} {
} elseif { ! [ dict get $rec bake_default] } { } elseif { ! [ dict get $rec bake_default] } {
puts stdout " b a k e _ d e f a u l t : f a l s e ( e x c l u d e d f r o m f u l l b a k e s - b a k e b y n a m e t o b u i l d ) " puts stdout " b a k e _ d e f a u l t : f a l s e ( e x c l u d e d f r o m f u l l b a k e s - b a k e b y n a m e t o b u i l d ) "
} }
puts stdout " b u i l d p r o d u c t : s r c / _ b u i l d / [ d i c t g e t $ r e c t a r g e t k i t ] [ p u n k b o o t : : l i b : : b a k e l i s t _ f i l e _ d e t a i l $ b u i l d f o l d e r / [ d i c t g e t $ r e c t a r g e t k i t ] ] " set relkit [ expr { [ dict get $rec out_tier] eq " " ? [ dict get $rec targetkit] : " [ d i c t g e t $ r e c o u t _ t i e r ] / [ d i c t g e t $ r e c t a r g e t k i t ] " } ]
puts stdout " d e p l o y e d : b i n / [ d i c t g e t $ r e c t a r g e t k i t ] [ p u n k b o o t : : l i b : : b a k e l i s t _ f i l e _ d e t a i l $ b i n f o l d e r / [ d i c t g e t $ r e c t a r g e t k i t ] ] s t a t e = [ l i n d e x $ r o w 4 ] " puts stdout " b u i l d p r o d u c t : s r c / _ b u i l d / $ r e l k i t [ p u n k b o o t : : l i b : : b a k e l i s t _ f i l e _ d e t a i l $ b u i l d f o l d e r / $ r e l k i t ] "
puts stdout " d e p l o y e d : b i n / $ r e l k i t [ p u n k b o o t : : l i b : : b a k e l i s t _ f i l e _ d e t a i l $ b i n f o l d e r / $ r e l k i t ] s t a t e = [ l i n d e x $ r o w 4 ] "
} }
} }
exit 0 exit 0
@ -7949,14 +7967,17 @@ foreach vfstail $vfs_tails {
set targetkit $appname.kit set targetkit $appname.kit
} else { } else {
set targetkit $ { appname } $rt_suffix set targetkit $ { appname } $rt_suffix
if { $targetkit in $exe_names_seen } { if { [ list $rt_target $targetkit ] in $exe_names_seen } {
# d u p l i c a t e a p p n a m e c o n f i g u r e d ? # d u p l i c a t e a p p n a m e c o n f i g u r e d f o r t h e S A M E t a r g e t ?
# ( G - 1 2 7 : s a m e - n a m e d k i t s f o r D I F F E R E N T t a r g e t s c o e x i s t u n d e r
# t h e i r o w n k i t s / < p l a t f o r m > / o u t p u t t i e r s - o n l y a s a m e - t a r g e t
# d u p l i c a t e n e e d s a d i s a m b i g u a t i n g n a m e )
# t o d o - c o n s i d e r c r e a t i n g a s $ { a p p n a m e } ( 2 ) e t c ? # t o d o - c o n s i d e r c r e a t i n g a s $ { a p p n a m e } ( 2 ) e t c ?
puts stderr " t a r g e t k i t : $ t a r g e t k i t a l r e a d y s e e n - u s i n g n a m e $ { a p p n a m e } _ $ r t n a m e " puts stderr " t a r g e t k i t : $ t a r g e t k i t a l r e a d y s e e n f o r t a r g e t $ r t _ t a r g e t u s i n g n a m e $ { a p p n a m e } _ $ r t n a m e "
set targetkit $ { appname } _$rtname set targetkit $ { appname } _$rtname
} }
} }
lappend exe_names_seen $targetkit lappend exe_names_seen [ list $rt_target $targetkit ]
lappend targetkits [ list $targetkit $target_kit_type $kit_smokerequires $kit_attrs ] lappend targetkits [ list $targetkit $target_kit_type $kit_smokerequires $kit_attrs ]
} }
} }
@ -7967,6 +7988,23 @@ foreach vfstail $vfs_tails {
} }
puts stdout " p r o c e s s i n g t a r g e t k i t : $ t a r g e t k i t _ i n f o " puts stdout " p r o c e s s i n g t a r g e t k i t : $ t a r g e t k i t _ i n f o "
lassign $targetkit_info targetkit target_kit_type kit_smokerequires kit_attrs lassign $targetkit_info targetkit target_kit_type kit_smokerequires kit_attrs
# G - 1 2 7 : o u t p u t l o c a t i o n s a r e k e y e d b y t h e k i t ' s T A R G E T . K i t s f o r t h i s
# h o s t ' s o w n d e f a u l t t a r g e t k e e p t h e f l a t l o c a t i o n s e v e r y l a u n c h e r , t e s t
# a n d h a b i t e x p e c t s ( s r c / _ b u i l d / < k i t > , b i n / < k i t > ) ; a n y o t h e r t a r g e t ' s k i t
# b u i l d s a n d d e p l o y s u n d e r a k i t s / < p l a t f o r m > / t i e r s o s a m e - n a m e d k i t s f o r
# d i f f e r e n t t a r g e t s c o e x i s t i n s t e a d o f o v e r w r i t i n g e a c h o t h e r a c r o s s
# s e l e c t i v e r u n s . b i n / k i t s / r a t h e r t h a n b i n / < p l a t f o r m > / b e c a u s e
# b i n / r u n t i m e / < p l a t f o r m > / a l r e a d y m e a n s b u i l d I N P U T S .
if { $rt_target eq $rt_default_target } {
set kit_builddir $buildfolder
set kit_deploydir $binfolder
set kit_relpath $targetkit ; # k i t p a t h r e l a t i v e t o b i n / a n d s r c / _ b u i l d /
} else {
set kit_builddir $buildfolder / kits/ $rt_target
set kit_deploydir $binfolder / kits/ $rt_target
set kit_relpath kits/ $rt_target / $targetkit
}
file mkdir $kit_builddir
# G - 0 2 4 : b a k e _ d e f a u l t = f a l s e e n t r i e s ( d e c l a r e d p e r e n t r y o r v i a t h e i r g r o u p ) # G - 0 2 4 : b a k e _ d e f a u l t = f a l s e e n t r i e s ( d e c l a r e d p e r e n t r y o r v i a t h e i r g r o u p )
# a r e e x c l u d e d f r o m f u l l b a k e s - e x p l i c i t n a m e / @ g r o u p s e l e c t i o n b u i l d s t h e m . # a r e e x c l u d e d f r o m f u l l b a k e s - e x p l i c i t n a m e / @ g r o u p s e l e c t i o n b u i l d s t h e m .
if { ! [ llength $::punkboot::bake_selected_kitnames ] if { ! [ llength $::punkboot::bake_selected_kitnames ]
@ -7979,9 +8017,9 @@ foreach vfstail $vfs_tails {
# c r e a t e d w h e n a b s e n t , t h e n r e p l a c e d o n l y b y a n e x p l i c i t r e l e a s e s t e p # c r e a t e d w h e n a b s e n t , t h e n r e p l a c e d o n l y b y a n e x p l i c i t r e l e a s e s t e p
# ( G - 0 2 3 o w n s t h a t s t e p ) - a n o r m a l b a k e n e v e r o v e r w r i t e s i t . # ( G - 0 2 3 o w n s t h a t s t e p ) - a n o r m a l b a k e n e v e r o v e r w r i t e s i t .
if { [ dict exists $kit_attrs scheme_role] && [ dict get $kit_attrs scheme_role] eq " r e l e a s e " if { [ dict exists $kit_attrs scheme_role] && [ dict get $kit_attrs scheme_role] eq " r e l e a s e "
&& [ file exists $binfolde r / $targetkit ] } { && [ file exists $kit_deploydi r / $targetkit ] } {
puts stdout " s k i p p i n g $ t a r g e t k i t ( r e l e a s e - g a t e d s c h e m e o u t p u t : b i n / $ t a r g e t k i t e x i s t s a n d a n o r m a l b a k e n e v e r o v e r w r i t e s i t - t h e e x p l i c i t r e l e a s e s t e p i s G - 0 2 3 ; t o f o r c e a r e b u i l d n o w , d e l e t e b i n / $ t a r g e t k i t f i r s t ) " puts stdout " s k i p p i n g $ t a r g e t k i t ( r e l e a s e - g a t e d s c h e m e o u t p u t : b i n / $ k i t _ r e l p a t h e x i s t s a n d a n o r m a l b a k e n e v e r o v e r w r i t e s i t - t h e e x p l i c i t r e l e a s e s t e p i s G - 0 2 3 ; t o f o r c e a r e b u i l d n o w , d e l e t e b i n / $ k i t _ r e l p a t h f i r s t ) "
lappend skipped_kits [ list kit $targetkit reason " r e l e a s e - g a t e d ( b i n / $ t a r g e t k i t e x i s t s ) " ] lappend skipped_kits [ list kit $targetkit reason " r e l e a s e - g a t e d ( b i n / $ k i t _ r e l p a t h e x i s t s ) " ]
continue continue
} }
# S e l f - b u i l d g u a r d : n e v e r p r o c e s s t h e k i t w h o s e d e p l o y e d e x e c u t a b l e i s r u n n i n g t h i s # S e l f - b u i l d g u a r d : n e v e r p r o c e s s t h e k i t w h o s e d e p l o y e d e x e c u t a b l e i s r u n n i n g t h i s
@ -7991,7 +8029,7 @@ foreach vfstail $vfs_tails {
# p u n k e x e c u t a b l e r e m a i n s s u p p o r t e d f o r e v e r y t h i n g e x c e p t r e b u i l d i n g t h a t e x e c u t a b l e . # p u n k e x e c u t a b l e r e m a i n s s u p p o r t e d f o r e v e r y t h i n g e x c e p t r e b u i l d i n g t h a t e x e c u t a b l e .
# ( a H O S T f i l e s y s t e m c o m p a r i s o n - c a s e r u l e s f o l l o w t h e h o s t , n o t t h e t a r g e t ) # ( a H O S T f i l e s y s t e m c o m p a r i s o n - c a s e r u l e s f o l l o w t h e h o s t , n o t t h e t a r g e t )
set self_exe [ file normalize [ info nameofexecutable] ] set self_exe [ file normalize [ info nameofexecutable] ]
set self_deploy_target [ file normalize $binfolde r / $targetkit ] set self_deploy_target [ file normalize $kit_deploydi r / $targetkit ]
if { $::punkboot::host_windows } { if { $::punkboot::host_windows } {
set is_self_build [ string equal - nocase $self_exe $self_deploy_target ] set is_self_build [ string equal - nocase $self_exe $self_deploy_target ]
} else { } else {
@ -8007,7 +8045,7 @@ foreach vfstail $vfs_tails {
set vfs_installer [ punkcheck : : installtrack new $installername $basedir / .punkcheck] set vfs_installer [ punkcheck : : installtrack new $installername $basedir / .punkcheck]
$vfs_installer set_source_target $sourcefolder $buildfolder $vfs_installer set_source_target $sourcefolder $buildfolder
set vfs_event [ $vfs_installer start_event { -make-step build_vfs} ] set vfs_event [ $vfs_installer start_event { -make-step build_vfs} ]
$vfs_event targetset_init INSTALL $buildfolde r / $targetkit $vfs_event targetset_init INSTALL $kit_builddi r / $targetkit
set relvfs [ punkcheck : : lib::path_relative $basedir $sourcefolder / vfs/ $vfstail ] set relvfs [ punkcheck : : lib::path_relative $basedir $sourcefolder / vfs/ $vfstail ]
if { ! [ dict exists $path_cksum_cache $relvfs ] } { if { ! [ dict exists $path_cksum_cache $relvfs ] } {
# e . g . . / v f s / p u n k 8 7 . v f s { c k s u m x x x x c k s u m _ a l l _ o p t s { - c k s u m _ c o n t e n t 1 . . . - c k s u m _ a l g o r i t h m s h a 1 } } # e . g . . / v f s / p u n k 8 7 . v f s { c k s u m x x x x c k s u m _ a l l _ o p t s { - c k s u m _ c o n t e n t 1 . . . - c k s u m _ a l g o r i t h m s h a 1 } }
@ -8051,7 +8089,8 @@ foreach vfstail $vfs_tails {
package require control package require control
# k e e p t h i s a s i m p l e n a m e - b i n / p u n k s c r i p t c a l l s i n t o s r c / _ b u i l d / e x e n a m e . v f s / m a i n . t c l # k e e p t h i s a s i m p l e n a m e - b i n / p u n k s c r i p t c a l l s i n t o s r c / _ b u i l d / e x e n a m e . v f s / m a i n . t c l
set targetvfs $buildfolder / $targetkit.vfs # ( G - 1 2 7 : n o n - d e f a u l t - t a r g e t k i t s k e e p t h e s i m p l e n a m e u n d e r t h e i r k i t s / < p l a t f o r m > / t i e r )
set targetvfs $kit_builddir / $targetkit.vfs
file delete - force $targetvfs file delete - force $targetvfs
set extraction_done 0 set extraction_done 0
@ -8423,7 +8462,7 @@ foreach vfstail $vfs_tails {
# t h e a s s e m b l e r s b e l o w c o n s u m e w r a p _ r u n t i m e - t h e s t a m p e d p e r - k i t c o p y # t h e a s s e m b l e r s b e l o w c o n s u m e w r a p _ r u n t i m e - t h e s t a m p e d p e r - k i t c o p y
# o f t h e p a y l o a d - f r e e r a w p r e f i x w h e n e m b e d d i n g h a p p e n e d , t h e u n t o u c h e d # o f t h e p a y l o a d - f r e e r a w p r e f i x w h e n e m b e d d i n g h a p p e n e d , t h e u n t o u c h e d
# r a w p r e f i x o t h e r w i s e . R u n t i m e s t o r e o r i g i n a l s a r e n e v e r m o d i f i e d . # r a w p r e f i x o t h e r w i s e . R u n t i m e s t o r e o r i g i n a l s a r e n e v e r m o d i f i e d .
lassign [ : : punkboot : : kit_icon_process $targetkit $rt_target $rtname $target_kit_type $sourcefolder $vfstail $raw_runtime $buildfolde r ] wrap_runtime kiticon_sidecar lassign [ : : punkboot : : kit_icon_process $targetkit $rt_target $rtname $target_kit_type $sourcefolder $vfstail $raw_runtime $kit_builddi r ] wrap_runtime kiticon_sidecar
set wrapvfs $targetvfs set wrapvfs $targetvfs
switch - - $target_kit_type { switch - - $target_kit_type {
@ -8723,13 +8762,13 @@ foreach vfstail $vfs_tails {
} }
} }
if { [ file exists $buildfolde r / $targetkit ] } { if { [ file exists $kit_builddi r / $targetkit ] } {
puts stderr " d e l e t i n g e x i s t i n g $ b u i l d f o l d e r / $ t a r g e t k i t " puts stderr " d e l e t i n g e x i s t i n g $ k i t _ b u i l d d i r / $ t a r g e t k i t "
if { [ catch { if { [ catch {
file delete $buildfolde r / $targetkit file delete $kit_builddi r / $targetkit
} msg ] } { } msg ] } {
puts stderr " F a i l e d t o d e l e t e $ b u i l d f o l d e r / $ t a r g e t k i t " puts stderr " F a i l e d t o d e l e t e $ k i t _ b u i l d d i r / $ t a r g e t k i t "
lappend failed_kits [ list kit $targetkit reason " c o u l d n o t d e l e t e b u i l d f o l d e r k i t a t $ b u i l d f o l d e r / $ t a r g e t k i t " ] lappend failed_kits [ list kit $targetkit reason " c o u l d n o t d e l e t e b u i l d f o l d e r k i t a t $ k i t _ b u i l d d i r / $ t a r g e t k i t " ]
$vfs_event targetset_end FAILED $vfs_event targetset_end FAILED
$vfs_event destroy $vfs_event destroy
$vfs_installer destroy $vfs_installer destroy
@ -8739,7 +8778,7 @@ foreach vfstail $vfs_tails {
# W I N D O W S f i l e s y s t e m ' t u n n e l l i n g ' ( f i l e r e p l a c e m e n t w i t h i n 1 5 s e c s ) c o u l d c a u s e t a r g e t k i t t o c o p y c t i m e & s h o r t n a m e m e t a d a t a f r o m p r e v i o u s f i l e ! # W I N D O W S f i l e s y s t e m ' t u n n e l l i n g ' ( f i l e r e p l a c e m e n t w i t h i n 1 5 s e c s ) c o u l d c a u s e t a r g e t k i t t o c o p y c t i m e & s h o r t n a m e m e t a d a t a f r o m p r e v i o u s f i l e !
# T h i s i s p r o b a b l y h a r m l e s s - b u t w o r t h b e i n g a w a r e o f . # T h i s i s p r o b a b l y h a r m l e s s - b u t w o r t h b e i n g a w a r e o f .
file rename $buildfolder / $vfsname.new $buildfolde r / $targetkit file rename $buildfolder / $vfsname.new $kit_builddi r / $targetkit
# - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - -
$vfs_event targetset_end OK $vfs_event targetset_end OK
@ -8751,7 +8790,7 @@ foreach vfstail $vfs_tails {
# d e p l o y s ; p l a i n / n o n e ( n o a t t a c h e d z i p - t h e m e t a k i t k i t s h a p e ) a n d # d e p l o y s ; p l a i n / n o n e ( n o a t t a c h e d z i p - t h e m e t a k i t k i t s h a p e ) a n d
# u n r e a d a b l e r e s u l t s a r e s i l e n c e . O n e E O C D s c a n + C D w a l k p e r # u n r e a d a b l e r e s u l t s a r e s i l e n c e . O n e E O C D s c a n + C D w a l k p e r
# R E B U I L T k i t o n l y . # R E B U I L T k i t o n l y .
lassign [ : : punkboot : : get_kit_offsetstyle_report $buildfolde r / $targetkit ] offprobe_available offprobe lassign [ : : punkboot : : get_kit_offsetstyle_report $kit_builddi r / $targetkit ] offprobe_available offprobe
if { ! $offprobe_available } { if { ! $offprobe_available } {
puts stderr " N O T E : k i t o f f s e t - s t y l e p i n u n a v a i l a b l e ( p u n k b o o t : : u t i l s k i t _ o f f s e t s t y l e _ r e p o r t n o t l o a d a b l e f r o m b o o t s u p p o r t ) - c o n t i n u i n g w i t h o u t i t " puts stderr " N O T E : k i t o f f s e t - s t y l e p i n u n a v a i l a b l e ( p u n k b o o t : : u t i l s k i t _ o f f s e t s t y l e _ r e p o r t n o t l o a d a b l e f r o m b o o t s u p p o r t ) - c o n t i n u i n g w i t h o u t i t "
} elseif { [ dict get $offprobe offsetstyle] eq " f i l e " } { } elseif { [ dict get $offprobe offsetstyle] eq " f i l e " } {
@ -8771,7 +8810,7 @@ foreach vfstail $vfs_tails {
puts stdout " s m o k e - r e q u i r e s k i p p e d f o r k i t $ t a r g e t k i t : c r o s s - t a r g e t ( $ r t _ t a r g e t ) - t h e a r t i f a c t i s n o t e x e c u t a b l e o n t h i s $ : : p u n k b o o t : : h o s t _ p l a t f o r m h o s t " puts stdout " s m o k e - r e q u i r e s k i p p e d f o r k i t $ t a r g e t k i t : c r o s s - t a r g e t ( $ r t _ t a r g e t ) - t h e a r t i f a c t i s n o t e x e c u t a b l e o n t h i s $ : : p u n k b o o t : : h o s t _ p l a t f o r m h o s t "
} else { } else {
puts stdout " s m o k e - r e q u i r e p r o b e f o r k i t $ t a r g e t k i t ( p a c k a g e s : $ k i t _ s m o k e r e q u i r e s ) - e x e c u t i n g f r e s h l y b u i l t a r t i f a c t v i a i t s t c l s h s u b c o m m a n d " puts stdout " s m o k e - r e q u i r e p r o b e f o r k i t $ t a r g e t k i t ( p a c k a g e s : $ k i t _ s m o k e r e q u i r e s ) - e x e c u t i n g f r e s h l y b u i l t a r t i f a c t v i a i t s t c l s h s u b c o m m a n d "
: : punkboot : : kit_smoke_require_probe $buildfolde r / $targetkit $targetkit $kit_smokerequires : : punkboot : : kit_smoke_require_probe $kit_builddi r / $targetkit $targetkit $kit_smokerequires
} }
} }
@ -8785,14 +8824,13 @@ foreach vfstail $vfs_tails {
$vfs_event destroy $vfs_event destroy
$vfs_installer destroy $vfs_installer destroy
# T O D O - a l l o w b u i l d i n g o f k i t s f o r o t h e r p l a t f o r m s # C r o s s - p l a t f o r m k i t o u t p u t s : R E T I R E D T O D O ( G - 1 2 7 - s e e
# - w e n e e d t o u s e < p r o j e c t > / b i n f o r o n l y k i t s t a r g e t t i n g c u r r e n t p l a t f o r m , # g o a l s / G - 1 2 7 - c r o s s t a r g e t - v f s - b a k e . m d ) . K i t s f o r t h i s h o s t ' s d e f a u l t
# a n d u s e < p r o j e c t > / b i n / < p l a t f o r m > f o r o t h e r s # t a r g e t d e p l o y f l a t t o < p r o j e c t > / b i n e x a c t l y a s a l w a y s ; a n y o t h e r
# t h a t w e w e c a n h a v e s a m e t a r g e t e x e c u t a b l e f o r m u l t i p l e p l a t f o r m s e . g e x e c u t a b l e j u s t n a m e d ' p u n k s h e l l ' # t a r g e t ' s k i t d e p l o y s u n d e r < p r o j e c t > / b i n / k i t s / < p l a t f o r m > / ( t h e
# - t o d o t h i s w e n e e d t o c h a n g e r u n t i m e / m a p v f s . c o n f i g t o h a v e p l a t f o r m n a m e s n o t j u s t s t a n d a l o n e t a r g e t e x e c u t a b l e n a m e s # m a p p i n g s i d e g a i n e d p l a t f o r m n a m e s + t o m l f o r m a t u n d e r G - 1 2 2 / G - 0 2 4 ) .
# ( t o d o : c h a n g e t o t o m l f o r m a t a t s a m e t i m e )
after 200 after 200
set deployment_folder [ file dirname $sourcefolder ] / bin set deployment_folder $kit_deploydir
file mkdir $deployment_folder file mkdir $deployment_folder
# - - - - - - - - - - - - # - - - - - - - - - - - -
@ -8804,7 +8842,7 @@ foreach vfstail $vfs_tails {
# s e t l a s t _ c o m p l e t i o n [ $ b i n _ e v e n t t a r g e t s e t _ l a s t _ c o m p l e t e ] # s e t l a s t _ c o m p l e t i o n [ $ b i n _ e v e n t t a r g e t s e t _ l a s t _ c o m p l e t e ]
$bin_event targetset_addsource $deployment_folder / $targetkit ; # a d d t a r g e t a s a s o u r c e o f m e t a d a t a f o r c h a n g e d e t e c t i o n $bin_event targetset_addsource $deployment_folder / $targetkit ; # a d d t a r g e t a s a s o u r c e o f m e t a d a t a f o r c h a n g e d e t e c t i o n
$bin_event targetset_addsource $buildfolde r / $targetkit $bin_event targetset_addsource $kit_builddi r / $targetkit
$bin_event targetset_started $bin_event targetset_started
# - - - - - - - - - - - - # - - - - - - - - - - - -
@ -8827,16 +8865,16 @@ foreach vfstail $vfs_tails {
} }
puts stdout " c o p y i n g . . " puts stdout " c o p y i n g . . "
puts stdout " $ b u i l d f o l d e r / $ t a r g e t k i t " puts stdout " $ k i t _ b u i l d d i r / $ t a r g e t k i t "
puts stdout " t o : " puts stdout " t o : "
puts stdout " $ d e p l o y m e n t _ f o l d e r / $ t a r g e t k i t " puts stdout " $ d e p l o y m e n t _ f o l d e r / $ t a r g e t k i t "
after 300 after 300
file copy $buildfolde r / $targetkit $deployment_folder / $targetkit file copy $kit_builddi r / $targetkit $deployment_folder / $targetkit
# G - 0 5 7 : t h e k i t r e s o u r c e s i d e c a r s h i p s w i t h t h e k i t # G - 0 5 7 : t h e k i t r e s o u r c e s i d e c a r s h i p s w i t h t h e k i t
if { [ file isfile $buildfolde r / $targetkit.resources.toml ] } { if { [ file isfile $kit_builddi r / $targetkit.resources.toml ] } {
file copy - force $buildfolde r / $targetkit.resources.toml $deployment_folder / $targetkit.resources.toml file copy - force $kit_builddi r / $targetkit.resources.toml $deployment_folder / $targetkit.resources.toml
} }
lappend installed_kits $targetkit lappend installed_kits $kit_relpath
# - - - - - - - - - - - - # - - - - - - - - - - - -
$bin_event targetset_end OK $bin_event targetset_end OK
# - - - - - - - - - - - - # - - - - - - - - - - - -
@ -8847,7 +8885,7 @@ foreach vfstail $vfs_tails {
# G - 0 5 7 : k e e p t h e d e p l o y e d r e s o u r c e s i d e c a r c u r r e n t e v e n w h e n t h e k i t # G - 0 5 7 : k e e p t h e d e p l o y e d r e s o u r c e s i d e c a r c u r r e n t e v e n w h e n t h e k i t
# i t s e l f i s u n c h a n g e d ( t h e r e c o r d c a n b e n e w e r t h a n t h e k i t r e b u i l d - # i t s e l f i s u n c h a n g e d ( t h e r e c o r d c a n b e n e w e r t h a n t h e k i t r e b u i l d -
# e . g t h e s i d e c a r f e a t u r e a r r i v i n g , o r a h o s t - c a p a b i l i t y c h a n g e ) # e . g t h e s i d e c a r f e a t u r e a r r i v i n g , o r a h o s t - c a p a b i l i t y c h a n g e )
if { [ : : punkboot : : kiticon::copy_ifchanged $buildfolde r / $targetkit.resources.toml $deployment_folder / $targetkit.resources.toml ] eq " c o p i e d " } { if { [ : : punkboot : : kiticon::copy_ifchanged $kit_builddi r / $targetkit.resources.toml $deployment_folder / $targetkit.resources.toml ] eq " c o p i e d " } {
puts stdout " k i t i c o n ( G - 0 5 7 ) : r e f r e s h e d d e p l o y e d s i d e c a r $ d e p l o y m e n t _ f o l d e r / $ t a r g e t k i t . r e s o u r c e s . t o m l " puts stdout " k i t i c o n ( G - 0 5 7 ) : r e f r e s h e d d e p l o y e d s i d e c a r $ d e p l o y m e n t _ f o l d e r / $ t a r g e t k i t . r e s o u r c e s . t o m l "
} }
lappend skipped_kit_installs [ list kit $targetkit reason " n o c h a n g e d e t e c t e d " ] lappend skipped_kit_installs [ list kit $targetkit reason " n o c h a n g e d e t e c t e d " ]
