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

more debug output for non-windows platforms (make.tcl issues)

master
Julian Noble 3 months ago
parent
b8aaad0f32
commit
fc95e9d0bf
4 changed files with 28 additions and 4 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. 4
      src/bootsupport/modules/punk/mix/base-0.1.tm
  2. 12
      src/bootsupport/modules/punk/mix/cli-0.3.1.tm
  3. 4
      src/modules/punk/mix/base-0.1.tm
  4. 12
      src/modules/punk/mix/cli-999999.0a1.0.tm

4
src/bootsupport/modules/punk/mix/base-0.1.tm
Unescape View File

@ -682,7 +682,7 @@ namespace eval punk::mix::base {
cd $base ;#cd is process-wide.. keep cd in effect for as small a scope as possible. (review for thread issues) cd $base ;#cd is process-wide.. keep cd in effect for as small a scope as possible. (review for thread issues)
#temp emission to stdout.. todo - repl telemetry channel #temp emission to stdout.. todo - repl telemetry channel
puts stdout "cksum_path: creating temporary tar archive for $path" puts stdout "\ncksum_path: creating temporary tar archive for $path"
puts -nonewline stdout " at: $archivename ..." puts -nonewline stdout " at: $archivename ..."
set tsstart [clock millis] set tsstart [clock millis]
if {[set tarpath [auto_execok tar]] ne ""} { if {[set tarpath [auto_execok tar]] ne ""} {
@ -709,7 +709,7 @@ namespace eval punk::mix::base {
set sizeinfo "(file type $ftype - tarred size [punk::lib::format_number [file size $archivename]] bytes)" set sizeinfo "(file type $ftype - tarred size [punk::lib::format_number [file size $archivename]] bytes)"
} }
set tsstart [clock millis] set tsstart [clock millis]
puts -nonewline stdout "cksum_path: calculating cksum using $opt_cksum_algorithm for $target $sizeinfo ... " puts -nonewline stdout "\ncksum_path: calculating cksum using $opt_cksum_algorithm for $target $sizeinfo ... "
set cksum [{*}$cksum_command $archivename] set cksum [{*}$cksum_command $archivename]
set tsend [clock millis] set tsend [clock millis]
set ms [expr {$tsend - $tsstart}] set ms [expr {$tsend - $tsstart}]

12
src/bootsupport/modules/punk/mix/cli-0.3.1.tm
Unescape View File

@ -599,6 +599,12 @@ namespace eval punk::mix::cli {
if {[string match "foobar" $current_source_dir]} { if {[string match "foobar" $current_source_dir]} {
set is_interesting 1 set is_interesting 1
} }
#debug for issues on non-windows platforms.
if {$::tcl_platform(platform) ne "windows"} {
set is_interesting 1
}
if {$is_interesting} { if {$is_interesting} {
puts "build_modules_from_source_to_base >>> module $current_source_dir/$modpath" puts "build_modules_from_source_to_base >>> module $current_source_dir/$modpath"
} }
@ -609,10 +615,13 @@ namespace eval punk::mix::cli {
#split_modulename_version version part will be empty if not valid tcl version #split_modulename_version version part will be empty if not valid tcl version
#last segment doesn't look even slightly versiony - fail. #last segment doesn't look even slightly versiony - fail.
puts stderr "ERROR: Unable to confirm file $current_source_dir/$modpath is a reasonably versioned .tm module - ABORTING." puts stderr "ERROR: Unable to confirm file $current_source_dir/$modpath is a reasonably versioned .tm module - ABORTING."
flush stderr
after 1000
exit 1 exit 1
} }
switch -- $modtype { switch -- $modtype {
pod { pod {
puts -nonewline stderr "p-"
#basename still contains leading #modpod- #basename still contains leading #modpod-
if {[string match #modpod-* $basename]} { if {[string match #modpod-* $basename]} {
set basename [string range $basename 8 end] set basename [string range $basename 8 end]
@ -689,6 +698,7 @@ namespace eval punk::mix::cli {
puts stdout "$current_source_dir/$modpath" puts stdout "$current_source_dir/$modpath"
puts stdout "to:" puts stdout "to:"
puts stdout "$podtree_copy" puts stdout "$podtree_copy"
flush stdout
file copy $current_source_dir/$modpath $podtree_copy file copy $current_source_dir/$modpath $podtree_copy
if {$tmfile_versionsegment eq $magicversion} { if {$tmfile_versionsegment eq $magicversion} {
set tmfile $buildfolder/#modpod-$basename-$module_build_version/$basename-$magicversion.tm set tmfile $buildfolder/#modpod-$basename-$module_build_version/$basename-$magicversion.tm
@ -809,6 +819,7 @@ namespace eval punk::mix::cli {
} }
} }
tarjar { tarjar {
puts -nonewline stderr "t-"
#maint - overall code structure same as pod - refactor? #maint - overall code structure same as pod - refactor?
#basename may still contain #tarjar- #basename may still contain #tarjar-
#to be obsoleted - update modpod to (optionally) use vfs::tar ? #to be obsoleted - update modpod to (optionally) use vfs::tar ?
@ -992,6 +1003,7 @@ namespace eval punk::mix::cli {
} }
file { file {
puts -nonewline stderr "f-"
set m $modpath set m $modpath
if {$tmfile_versionsegment eq $magicversion} { if {$tmfile_versionsegment eq $magicversion} {
#set basename [join [lrange $fileparts 0 end-1] -] #set basename [join [lrange $fileparts 0 end-1] -]

4
src/modules/punk/mix/base-0.1.tm
Unescape View File

@ -682,7 +682,7 @@ namespace eval punk::mix::base {
cd $base ;#cd is process-wide.. keep cd in effect for as small a scope as possible. (review for thread issues) cd $base ;#cd is process-wide.. keep cd in effect for as small a scope as possible. (review for thread issues)
#temp emission to stdout.. todo - repl telemetry channel #temp emission to stdout.. todo - repl telemetry channel
puts stdout "cksum_path: creating temporary tar archive for $path" puts stdout "\ncksum_path: creating temporary tar archive for $path"
puts -nonewline stdout " at: $archivename ..." puts -nonewline stdout " at: $archivename ..."
set tsstart [clock millis] set tsstart [clock millis]
if {[set tarpath [auto_execok tar]] ne ""} { if {[set tarpath [auto_execok tar]] ne ""} {
@ -709,7 +709,7 @@ namespace eval punk::mix::base {
set sizeinfo "(file type $ftype - tarred size [punk::lib::format_number [file size $archivename]] bytes)" set sizeinfo "(file type $ftype - tarred size [punk::lib::format_number [file size $archivename]] bytes)"
} }
set tsstart [clock millis] set tsstart [clock millis]
puts -nonewline stdout "cksum_path: calculating cksum using $opt_cksum_algorithm for $target $sizeinfo ... " puts -nonewline stdout "\ncksum_path: calculating cksum using $opt_cksum_algorithm for $target $sizeinfo ... "
set cksum [{*}$cksum_command $archivename] set cksum [{*}$cksum_command $archivename]
set tsend [clock millis] set tsend [clock millis]
set ms [expr {$tsend - $tsstart}] set ms [expr {$tsend - $tsstart}]

12
src/modules/punk/mix/cli-999999.0a1.0.tm
Unescape View File

@ -599,6 +599,12 @@ namespace eval punk::mix::cli {
if {[string match "foobar" $current_source_dir]} { if {[string match "foobar" $current_source_dir]} {
set is_interesting 1 set is_interesting 1
} }
#debug for issues on non-windows platforms.
if {$::tcl_platform(platform) ne "windows"} {
set is_interesting 1
}
if {$is_interesting} { if {$is_interesting} {
puts "build_modules_from_source_to_base >>> module $current_source_dir/$modpath" puts "build_modules_from_source_to_base >>> module $current_source_dir/$modpath"
} }
@ -609,10 +615,13 @@ namespace eval punk::mix::cli {
#split_modulename_version version part will be empty if not valid tcl version #split_modulename_version version part will be empty if not valid tcl version
#last segment doesn't look even slightly versiony - fail. #last segment doesn't look even slightly versiony - fail.
puts stderr "ERROR: Unable to confirm file $current_source_dir/$modpath is a reasonably versioned .tm module - ABORTING." puts stderr "ERROR: Unable to confirm file $current_source_dir/$modpath is a reasonably versioned .tm module - ABORTING."
flush stderr
after 1000
exit 1 exit 1
} }
switch -- $modtype { switch -- $modtype {
pod { pod {
puts -nonewline stderr "p-"
#basename still contains leading #modpod- #basename still contains leading #modpod-
if {[string match #modpod-* $basename]} { if {[string match #modpod-* $basename]} {
set basename [string range $basename 8 end] set basename [string range $basename 8 end]
@ -689,6 +698,7 @@ namespace eval punk::mix::cli {
puts stdout "$current_source_dir/$modpath" puts stdout "$current_source_dir/$modpath"
puts stdout "to:" puts stdout "to:"
puts stdout "$podtree_copy" puts stdout "$podtree_copy"
flush stdout
file copy $current_source_dir/$modpath $podtree_copy file copy $current_source_dir/$modpath $podtree_copy
if {$tmfile_versionsegment eq $magicversion} { if {$tmfile_versionsegment eq $magicversion} {
set tmfile $buildfolder/#modpod-$basename-$module_build_version/$basename-$magicversion.tm set tmfile $buildfolder/#modpod-$basename-$module_build_version/$basename-$magicversion.tm
@ -809,6 +819,7 @@ namespace eval punk::mix::cli {
} }
} }
tarjar { tarjar {
puts -nonewline stderr "t-"
#maint - overall code structure same as pod - refactor? #maint - overall code structure same as pod - refactor?
#basename may still contain #tarjar- #basename may still contain #tarjar-
#to be obsoleted - update modpod to (optionally) use vfs::tar ? #to be obsoleted - update modpod to (optionally) use vfs::tar ?
@ -992,6 +1003,7 @@ namespace eval punk::mix::cli {
} }
file { file {
puts -nonewline stderr "f-"
set m $modpath set m $modpath
if {$tmfile_versionsegment eq $magicversion} { if {$tmfile_versionsegment eq $magicversion} {
#set basename [join [lrange $fileparts 0 end-1] -] #set basename [join [lrange $fileparts 0 end-1] -]

Write Preview
Loading…
Cancel
Save