Browse Source

make.tcl fixes

master
Julian Noble 2 months ago
parent
commit
c6c498a3e3
  1. 50
      src/bootsupport/modules/punk/mix/cli-0.3.1.tm
  2. 50
      src/modules/punk/mix/cli-999999.0a1.0.tm
  3. 50
      src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/mix/cli-0.3.1.tm
  4. 50
      src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/mix/cli-0.3.1.tm

50
src/bootsupport/modules/punk/mix/cli-0.3.1.tm

@ -615,6 +615,8 @@ namespace eval punk::mix::cli {
-glob *\ -glob *\
-max_depth 100\ -max_depth 100\
] ]
set had_error 0
# -max_depth -1 for no limit # -max_depth -1 for no limit
set build_installername pods_in_$current_source_dir set build_installername pods_in_$current_source_dir
set build_installer [punkcheck::installtrack new $build_installername $buildfolder/.punkcheck] set build_installer [punkcheck::installtrack new $build_installername $buildfolder/.punkcheck]
@ -668,7 +670,6 @@ namespace eval punk::mix::cli {
close $fdout close $fdout
} }
#delete and regenerate zip and modpod stubbed zip #delete and regenerate zip and modpod stubbed zip
set had_error 0
set notes [list] set notes [list]
if {[catch { if {[catch {
file delete $buildfolder/$basename-$module_build_version.zip file delete $buildfolder/$basename-$module_build_version.zip
@ -704,7 +705,7 @@ namespace eval punk::mix::cli {
modpod::lib::make_zip_modpod $zipfile $modulefile modpod::lib::make_zip_modpod $zipfile $modulefile
} else { } else {
#TODO - review punk::zip::mkzip and/or external zip to provide a fallback? #TODO - review punk::zip::mkzip and/or external zip to provide a fallback?
set had_err 1 set had_error 1
lappend notest "zipfs_unavailable" lappend notest "zipfs_unavailable"
puts stderr "WARNING: zipfs unavailable can't build $modulefile" puts stderr "WARNING: zipfs unavailable can't build $modulefile"
} }
@ -730,28 +731,31 @@ namespace eval punk::mix::cli {
$build_event destroy $build_event destroy
$build_installer destroy $build_installer destroy
$event targetset_init INSTALL $target_module_dir/$basename-$module_build_version.tm #JMN - review
$event targetset_addsource $modulefile if {!$had_error} {
if {\ $event targetset_init INSTALL $target_module_dir/$basename-$module_build_version.tm
[llength [dict get [$event targetset_source_changes] changed]]\ $event targetset_addsource $modulefile
|| [llength [$event get_targets_exist]] < [llength [$event get_targets]]\ if {\
} { [llength [dict get [$event targetset_source_changes] changed]]\
|| [llength [$event get_targets_exist]] < [llength [$event get_targets]]\
$event targetset_started } {
# -- --- --- --- --- ---
if {$did_skip} {set did_skip 0; puts -nonewline stdout \n} $event targetset_started
lappend module_list $modulefile # -- --- --- --- --- ---
file copy -force $modulefile $target_module_dir if {$did_skip} {set did_skip 0; puts -nonewline stdout \n}
puts stderr "Copied zip modpod module $modulefile to $target_module_dir" lappend module_list $modulefile
# -- --- --- --- --- --- file copy -force $modulefile $target_module_dir
$event targetset_end OK -note "zip modpod" puts stderr "Copied zip modpod module $modulefile to $target_module_dir"
} else { # -- --- --- --- --- ---
puts -nonewline stderr "." $event targetset_end OK -note "zip modpod"
set did_skip 1 } else {
if {$is_interesting} { puts -nonewline stderr "."
puts stderr "$modulefile [$event targetset_source_changes]" set did_skip 1
if {$is_interesting} {
puts stderr "$modulefile [$event targetset_source_changes]"
}
$event targetset_end SKIPPED
} }
$event targetset_end SKIPPED
} }
} }
tarjar { tarjar {

50
src/modules/punk/mix/cli-999999.0a1.0.tm

@ -615,6 +615,8 @@ namespace eval punk::mix::cli {
-glob *\ -glob *\
-max_depth 100\ -max_depth 100\
] ]
set had_error 0
# -max_depth -1 for no limit # -max_depth -1 for no limit
set build_installername pods_in_$current_source_dir set build_installername pods_in_$current_source_dir
set build_installer [punkcheck::installtrack new $build_installername $buildfolder/.punkcheck] set build_installer [punkcheck::installtrack new $build_installername $buildfolder/.punkcheck]
@ -668,7 +670,6 @@ namespace eval punk::mix::cli {
close $fdout close $fdout
} }
#delete and regenerate zip and modpod stubbed zip #delete and regenerate zip and modpod stubbed zip
set had_error 0
set notes [list] set notes [list]
if {[catch { if {[catch {
file delete $buildfolder/$basename-$module_build_version.zip file delete $buildfolder/$basename-$module_build_version.zip
@ -704,7 +705,7 @@ namespace eval punk::mix::cli {
modpod::lib::make_zip_modpod $zipfile $modulefile modpod::lib::make_zip_modpod $zipfile $modulefile
} else { } else {
#TODO - review punk::zip::mkzip and/or external zip to provide a fallback? #TODO - review punk::zip::mkzip and/or external zip to provide a fallback?
set had_err 1 set had_error 1
lappend notest "zipfs_unavailable" lappend notest "zipfs_unavailable"
puts stderr "WARNING: zipfs unavailable can't build $modulefile" puts stderr "WARNING: zipfs unavailable can't build $modulefile"
} }
@ -730,28 +731,31 @@ namespace eval punk::mix::cli {
$build_event destroy $build_event destroy
$build_installer destroy $build_installer destroy
$event targetset_init INSTALL $target_module_dir/$basename-$module_build_version.tm #JMN - review
$event targetset_addsource $modulefile if {!$had_error} {
if {\ $event targetset_init INSTALL $target_module_dir/$basename-$module_build_version.tm
[llength [dict get [$event targetset_source_changes] changed]]\ $event targetset_addsource $modulefile
|| [llength [$event get_targets_exist]] < [llength [$event get_targets]]\ if {\
} { [llength [dict get [$event targetset_source_changes] changed]]\
|| [llength [$event get_targets_exist]] < [llength [$event get_targets]]\
$event targetset_started } {
# -- --- --- --- --- ---
if {$did_skip} {set did_skip 0; puts -nonewline stdout \n} $event targetset_started
lappend module_list $modulefile # -- --- --- --- --- ---
file copy -force $modulefile $target_module_dir if {$did_skip} {set did_skip 0; puts -nonewline stdout \n}
puts stderr "Copied zip modpod module $modulefile to $target_module_dir" lappend module_list $modulefile
# -- --- --- --- --- --- file copy -force $modulefile $target_module_dir
$event targetset_end OK -note "zip modpod" puts stderr "Copied zip modpod module $modulefile to $target_module_dir"
} else { # -- --- --- --- --- ---
puts -nonewline stderr "." $event targetset_end OK -note "zip modpod"
set did_skip 1 } else {
if {$is_interesting} { puts -nonewline stderr "."
puts stderr "$modulefile [$event targetset_source_changes]" set did_skip 1
if {$is_interesting} {
puts stderr "$modulefile [$event targetset_source_changes]"
}
$event targetset_end SKIPPED
} }
$event targetset_end SKIPPED
} }
} }
tarjar { tarjar {

50
src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/mix/cli-0.3.1.tm

@ -615,6 +615,8 @@ namespace eval punk::mix::cli {
-glob *\ -glob *\
-max_depth 100\ -max_depth 100\
] ]
set had_error 0
# -max_depth -1 for no limit # -max_depth -1 for no limit
set build_installername pods_in_$current_source_dir set build_installername pods_in_$current_source_dir
set build_installer [punkcheck::installtrack new $build_installername $buildfolder/.punkcheck] set build_installer [punkcheck::installtrack new $build_installername $buildfolder/.punkcheck]
@ -668,7 +670,6 @@ namespace eval punk::mix::cli {
close $fdout close $fdout
} }
#delete and regenerate zip and modpod stubbed zip #delete and regenerate zip and modpod stubbed zip
set had_error 0
set notes [list] set notes [list]
if {[catch { if {[catch {
file delete $buildfolder/$basename-$module_build_version.zip file delete $buildfolder/$basename-$module_build_version.zip
@ -704,7 +705,7 @@ namespace eval punk::mix::cli {
modpod::lib::make_zip_modpod $zipfile $modulefile modpod::lib::make_zip_modpod $zipfile $modulefile
} else { } else {
#TODO - review punk::zip::mkzip and/or external zip to provide a fallback? #TODO - review punk::zip::mkzip and/or external zip to provide a fallback?
set had_err 1 set had_error 1
lappend notest "zipfs_unavailable" lappend notest "zipfs_unavailable"
puts stderr "WARNING: zipfs unavailable can't build $modulefile" puts stderr "WARNING: zipfs unavailable can't build $modulefile"
} }
@ -730,28 +731,31 @@ namespace eval punk::mix::cli {
$build_event destroy $build_event destroy
$build_installer destroy $build_installer destroy
$event targetset_init INSTALL $target_module_dir/$basename-$module_build_version.tm #JMN - review
$event targetset_addsource $modulefile if {!$had_error} {
if {\ $event targetset_init INSTALL $target_module_dir/$basename-$module_build_version.tm
[llength [dict get [$event targetset_source_changes] changed]]\ $event targetset_addsource $modulefile
|| [llength [$event get_targets_exist]] < [llength [$event get_targets]]\ if {\
} { [llength [dict get [$event targetset_source_changes] changed]]\
|| [llength [$event get_targets_exist]] < [llength [$event get_targets]]\
$event targetset_started } {
# -- --- --- --- --- ---
if {$did_skip} {set did_skip 0; puts -nonewline stdout \n} $event targetset_started
lappend module_list $modulefile # -- --- --- --- --- ---
file copy -force $modulefile $target_module_dir if {$did_skip} {set did_skip 0; puts -nonewline stdout \n}
puts stderr "Copied zip modpod module $modulefile to $target_module_dir" lappend module_list $modulefile
# -- --- --- --- --- --- file copy -force $modulefile $target_module_dir
$event targetset_end OK -note "zip modpod" puts stderr "Copied zip modpod module $modulefile to $target_module_dir"
} else { # -- --- --- --- --- ---
puts -nonewline stderr "." $event targetset_end OK -note "zip modpod"
set did_skip 1 } else {
if {$is_interesting} { puts -nonewline stderr "."
puts stderr "$modulefile [$event targetset_source_changes]" set did_skip 1
if {$is_interesting} {
puts stderr "$modulefile [$event targetset_source_changes]"
}
$event targetset_end SKIPPED
} }
$event targetset_end SKIPPED
} }
} }
tarjar { tarjar {

50
src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/mix/cli-0.3.1.tm

@ -615,6 +615,8 @@ namespace eval punk::mix::cli {
-glob *\ -glob *\
-max_depth 100\ -max_depth 100\
] ]
set had_error 0
# -max_depth -1 for no limit # -max_depth -1 for no limit
set build_installername pods_in_$current_source_dir set build_installername pods_in_$current_source_dir
set build_installer [punkcheck::installtrack new $build_installername $buildfolder/.punkcheck] set build_installer [punkcheck::installtrack new $build_installername $buildfolder/.punkcheck]
@ -668,7 +670,6 @@ namespace eval punk::mix::cli {
close $fdout close $fdout
} }
#delete and regenerate zip and modpod stubbed zip #delete and regenerate zip and modpod stubbed zip
set had_error 0
set notes [list] set notes [list]
if {[catch { if {[catch {
file delete $buildfolder/$basename-$module_build_version.zip file delete $buildfolder/$basename-$module_build_version.zip
@ -704,7 +705,7 @@ namespace eval punk::mix::cli {
modpod::lib::make_zip_modpod $zipfile $modulefile modpod::lib::make_zip_modpod $zipfile $modulefile
} else { } else {
#TODO - review punk::zip::mkzip and/or external zip to provide a fallback? #TODO - review punk::zip::mkzip and/or external zip to provide a fallback?
set had_err 1 set had_error 1
lappend notest "zipfs_unavailable" lappend notest "zipfs_unavailable"
puts stderr "WARNING: zipfs unavailable can't build $modulefile" puts stderr "WARNING: zipfs unavailable can't build $modulefile"
} }
@ -730,28 +731,31 @@ namespace eval punk::mix::cli {
$build_event destroy $build_event destroy
$build_installer destroy $build_installer destroy
$event targetset_init INSTALL $target_module_dir/$basename-$module_build_version.tm #JMN - review
$event targetset_addsource $modulefile if {!$had_error} {
if {\ $event targetset_init INSTALL $target_module_dir/$basename-$module_build_version.tm
[llength [dict get [$event targetset_source_changes] changed]]\ $event targetset_addsource $modulefile
|| [llength [$event get_targets_exist]] < [llength [$event get_targets]]\ if {\
} { [llength [dict get [$event targetset_source_changes] changed]]\
|| [llength [$event get_targets_exist]] < [llength [$event get_targets]]\
$event targetset_started } {
# -- --- --- --- --- ---
if {$did_skip} {set did_skip 0; puts -nonewline stdout \n} $event targetset_started
lappend module_list $modulefile # -- --- --- --- --- ---
file copy -force $modulefile $target_module_dir if {$did_skip} {set did_skip 0; puts -nonewline stdout \n}
puts stderr "Copied zip modpod module $modulefile to $target_module_dir" lappend module_list $modulefile
# -- --- --- --- --- --- file copy -force $modulefile $target_module_dir
$event targetset_end OK -note "zip modpod" puts stderr "Copied zip modpod module $modulefile to $target_module_dir"
} else { # -- --- --- --- --- ---
puts -nonewline stderr "." $event targetset_end OK -note "zip modpod"
set did_skip 1 } else {
if {$is_interesting} { puts -nonewline stderr "."
puts stderr "$modulefile [$event targetset_source_changes]" set did_skip 1
if {$is_interesting} {
puts stderr "$modulefile [$event targetset_source_changes]"
}
$event targetset_end SKIPPED
} }
$event targetset_end SKIPPED
} }
} }
tarjar { tarjar {

Loading…
Cancel
Save