From c6c498a3e38af494a542e3f3fb40c1ff53e3cba6 Mon Sep 17 00:00:00 2001 From: Julian Noble Date: Mon, 23 Sep 2024 05:27:50 +1000 Subject: [PATCH] make.tcl fixes --- src/bootsupport/modules/punk/mix/cli-0.3.1.tm | 50 ++++++++++--------- src/modules/punk/mix/cli-999999.0a1.0.tm | 50 ++++++++++--------- .../bootsupport/modules/punk/mix/cli-0.3.1.tm | 50 ++++++++++--------- .../bootsupport/modules/punk/mix/cli-0.3.1.tm | 50 ++++++++++--------- 4 files changed, 108 insertions(+), 92 deletions(-) diff --git a/src/bootsupport/modules/punk/mix/cli-0.3.1.tm b/src/bootsupport/modules/punk/mix/cli-0.3.1.tm index 39346d5d..4cde0057 100644 --- a/src/bootsupport/modules/punk/mix/cli-0.3.1.tm +++ b/src/bootsupport/modules/punk/mix/cli-0.3.1.tm @@ -615,6 +615,8 @@ namespace eval punk::mix::cli { -glob *\ -max_depth 100\ ] + set had_error 0 + # -max_depth -1 for no limit set build_installername pods_in_$current_source_dir set build_installer [punkcheck::installtrack new $build_installername $buildfolder/.punkcheck] @@ -668,7 +670,6 @@ namespace eval punk::mix::cli { close $fdout } #delete and regenerate zip and modpod stubbed zip - set had_error 0 set notes [list] if {[catch { file delete $buildfolder/$basename-$module_build_version.zip @@ -704,7 +705,7 @@ namespace eval punk::mix::cli { modpod::lib::make_zip_modpod $zipfile $modulefile } else { #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" puts stderr "WARNING: zipfs unavailable can't build $modulefile" } @@ -730,28 +731,31 @@ namespace eval punk::mix::cli { $build_event destroy $build_installer destroy - $event targetset_init INSTALL $target_module_dir/$basename-$module_build_version.tm - $event targetset_addsource $modulefile - 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} - lappend module_list $modulefile - file copy -force $modulefile $target_module_dir - puts stderr "Copied zip modpod module $modulefile to $target_module_dir" - # -- --- --- --- --- --- - $event targetset_end OK -note "zip modpod" - } else { - puts -nonewline stderr "." - set did_skip 1 - if {$is_interesting} { - puts stderr "$modulefile [$event targetset_source_changes]" + #JMN - review + if {!$had_error} { + $event targetset_init INSTALL $target_module_dir/$basename-$module_build_version.tm + $event targetset_addsource $modulefile + 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} + lappend module_list $modulefile + file copy -force $modulefile $target_module_dir + puts stderr "Copied zip modpod module $modulefile to $target_module_dir" + # -- --- --- --- --- --- + $event targetset_end OK -note "zip modpod" + } else { + puts -nonewline stderr "." + set did_skip 1 + if {$is_interesting} { + puts stderr "$modulefile [$event targetset_source_changes]" + } + $event targetset_end SKIPPED } - $event targetset_end SKIPPED } } tarjar { diff --git a/src/modules/punk/mix/cli-999999.0a1.0.tm b/src/modules/punk/mix/cli-999999.0a1.0.tm index 0a0ddcef..a3f7d913 100644 --- a/src/modules/punk/mix/cli-999999.0a1.0.tm +++ b/src/modules/punk/mix/cli-999999.0a1.0.tm @@ -615,6 +615,8 @@ namespace eval punk::mix::cli { -glob *\ -max_depth 100\ ] + set had_error 0 + # -max_depth -1 for no limit set build_installername pods_in_$current_source_dir set build_installer [punkcheck::installtrack new $build_installername $buildfolder/.punkcheck] @@ -668,7 +670,6 @@ namespace eval punk::mix::cli { close $fdout } #delete and regenerate zip and modpod stubbed zip - set had_error 0 set notes [list] if {[catch { file delete $buildfolder/$basename-$module_build_version.zip @@ -704,7 +705,7 @@ namespace eval punk::mix::cli { modpod::lib::make_zip_modpod $zipfile $modulefile } else { #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" puts stderr "WARNING: zipfs unavailable can't build $modulefile" } @@ -730,28 +731,31 @@ namespace eval punk::mix::cli { $build_event destroy $build_installer destroy - $event targetset_init INSTALL $target_module_dir/$basename-$module_build_version.tm - $event targetset_addsource $modulefile - 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} - lappend module_list $modulefile - file copy -force $modulefile $target_module_dir - puts stderr "Copied zip modpod module $modulefile to $target_module_dir" - # -- --- --- --- --- --- - $event targetset_end OK -note "zip modpod" - } else { - puts -nonewline stderr "." - set did_skip 1 - if {$is_interesting} { - puts stderr "$modulefile [$event targetset_source_changes]" + #JMN - review + if {!$had_error} { + $event targetset_init INSTALL $target_module_dir/$basename-$module_build_version.tm + $event targetset_addsource $modulefile + 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} + lappend module_list $modulefile + file copy -force $modulefile $target_module_dir + puts stderr "Copied zip modpod module $modulefile to $target_module_dir" + # -- --- --- --- --- --- + $event targetset_end OK -note "zip modpod" + } else { + puts -nonewline stderr "." + set did_skip 1 + if {$is_interesting} { + puts stderr "$modulefile [$event targetset_source_changes]" + } + $event targetset_end SKIPPED } - $event targetset_end SKIPPED } } tarjar { diff --git a/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/mix/cli-0.3.1.tm b/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/mix/cli-0.3.1.tm index 39346d5d..4cde0057 100644 --- a/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/mix/cli-0.3.1.tm +++ b/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 *\ -max_depth 100\ ] + set had_error 0 + # -max_depth -1 for no limit set build_installername pods_in_$current_source_dir set build_installer [punkcheck::installtrack new $build_installername $buildfolder/.punkcheck] @@ -668,7 +670,6 @@ namespace eval punk::mix::cli { close $fdout } #delete and regenerate zip and modpod stubbed zip - set had_error 0 set notes [list] if {[catch { file delete $buildfolder/$basename-$module_build_version.zip @@ -704,7 +705,7 @@ namespace eval punk::mix::cli { modpod::lib::make_zip_modpod $zipfile $modulefile } else { #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" puts stderr "WARNING: zipfs unavailable can't build $modulefile" } @@ -730,28 +731,31 @@ namespace eval punk::mix::cli { $build_event destroy $build_installer destroy - $event targetset_init INSTALL $target_module_dir/$basename-$module_build_version.tm - $event targetset_addsource $modulefile - 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} - lappend module_list $modulefile - file copy -force $modulefile $target_module_dir - puts stderr "Copied zip modpod module $modulefile to $target_module_dir" - # -- --- --- --- --- --- - $event targetset_end OK -note "zip modpod" - } else { - puts -nonewline stderr "." - set did_skip 1 - if {$is_interesting} { - puts stderr "$modulefile [$event targetset_source_changes]" + #JMN - review + if {!$had_error} { + $event targetset_init INSTALL $target_module_dir/$basename-$module_build_version.tm + $event targetset_addsource $modulefile + 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} + lappend module_list $modulefile + file copy -force $modulefile $target_module_dir + puts stderr "Copied zip modpod module $modulefile to $target_module_dir" + # -- --- --- --- --- --- + $event targetset_end OK -note "zip modpod" + } else { + puts -nonewline stderr "." + set did_skip 1 + if {$is_interesting} { + puts stderr "$modulefile [$event targetset_source_changes]" + } + $event targetset_end SKIPPED } - $event targetset_end SKIPPED } } tarjar { diff --git a/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/mix/cli-0.3.1.tm b/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/mix/cli-0.3.1.tm index 39346d5d..4cde0057 100644 --- a/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/mix/cli-0.3.1.tm +++ b/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 *\ -max_depth 100\ ] + set had_error 0 + # -max_depth -1 for no limit set build_installername pods_in_$current_source_dir set build_installer [punkcheck::installtrack new $build_installername $buildfolder/.punkcheck] @@ -668,7 +670,6 @@ namespace eval punk::mix::cli { close $fdout } #delete and regenerate zip and modpod stubbed zip - set had_error 0 set notes [list] if {[catch { file delete $buildfolder/$basename-$module_build_version.zip @@ -704,7 +705,7 @@ namespace eval punk::mix::cli { modpod::lib::make_zip_modpod $zipfile $modulefile } else { #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" puts stderr "WARNING: zipfs unavailable can't build $modulefile" } @@ -730,28 +731,31 @@ namespace eval punk::mix::cli { $build_event destroy $build_installer destroy - $event targetset_init INSTALL $target_module_dir/$basename-$module_build_version.tm - $event targetset_addsource $modulefile - 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} - lappend module_list $modulefile - file copy -force $modulefile $target_module_dir - puts stderr "Copied zip modpod module $modulefile to $target_module_dir" - # -- --- --- --- --- --- - $event targetset_end OK -note "zip modpod" - } else { - puts -nonewline stderr "." - set did_skip 1 - if {$is_interesting} { - puts stderr "$modulefile [$event targetset_source_changes]" + #JMN - review + if {!$had_error} { + $event targetset_init INSTALL $target_module_dir/$basename-$module_build_version.tm + $event targetset_addsource $modulefile + 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} + lappend module_list $modulefile + file copy -force $modulefile $target_module_dir + puts stderr "Copied zip modpod module $modulefile to $target_module_dir" + # -- --- --- --- --- --- + $event targetset_end OK -note "zip modpod" + } else { + puts -nonewline stderr "." + set did_skip 1 + if {$is_interesting} { + puts stderr "$modulefile [$event targetset_source_changes]" + } + $event targetset_end SKIPPED } - $event targetset_end SKIPPED } } tarjar {