Browse Source

update project_layouts

master
Julian Noble 2 months ago
parent
commit
eb1fd7d6c5
  1. 2
      src/project_layouts/custom/_project/punk.basic/src/make.tcl
  2. 11
      src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk-0.1.tm
  3. 2
      src/project_layouts/custom/_project/punk.project-0.1/src/make.tcl
  4. 11
      src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk-0.1.tm
  5. 2
      src/project_layouts/custom/_project/punk.shell-0.1/src/make.tcl

2
src/project_layouts/custom/_project/punk.basic/src/make.tcl

@ -1828,7 +1828,6 @@ if {$::punkboot::command eq "bootsupport"} {
package vcompare $v1 $v2 package vcompare $v1 $v2
} }
proc bootsupport_localupdate {projectroot} { proc bootsupport_localupdate {projectroot} {
set bootsupport_modules [list] ;#variable populated by include_modules.config file - review
set sourcefolder $projectroot/src set sourcefolder $projectroot/src
set bootmodulefolders [glob -nocomplain -dir $sourcefolder/bootsupport -type d -tails modules modules_tcl*] set bootmodulefolders [glob -nocomplain -dir $sourcefolder/bootsupport -type d -tails modules modules_tcl*]
@ -1840,6 +1839,7 @@ if {$::punkboot::command eq "bootsupport"} {
set which "" set which ""
} }
set bootsupport_config $projectroot/src/bootsupport/modules$which/include_modules.config ;# set bootsupport_config $projectroot/src/bootsupport/modules$which/include_modules.config ;#
set bootsupport_modules [list] ;#variable populated by include_modules.config file - initialise empty for each bm folder
if {[file exists $bootsupport_config]} { if {[file exists $bootsupport_config]} {
set targetroot $projectroot/src/bootsupport/modules$which set targetroot $projectroot/src/bootsupport/modules$which
source $bootsupport_config ;#populate $bootsupport_modules with project-specific list source $bootsupport_config ;#populate $bootsupport_modules with project-specific list

11
src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk-0.1.tm

@ -7941,7 +7941,13 @@ namespace eval punk {
set t [textblock::class::table new -show_hseps 0 -show_header 1 -ansiborder_header [a+ web-green]] set t [textblock::class::table new -show_hseps 0 -show_header 1 -ansiborder_header [a+ web-green]]
foreach {v vinfo} $otherenv_config { foreach {v vinfo} $otherenv_config {
if {[info exists ::env($v)]} { if {[info exists ::env($v)]} {
set c2 [set ::env($v)] set env_val [set ::env($v)]
if {[string match "*_TM_PATH" $v]} {
set entries [split $env_val $::tcl_platform(pathSeparator)]
set c2 [join $entries \n]
} else {
set c2 $::env($v)
}
} else { } else {
set c2 "(NOT SET)" set c2 "(NOT SET)"
} }
@ -7952,7 +7958,8 @@ namespace eval punk {
set othertable [$t print] set othertable [$t print]
$t destroy $t destroy
append text [textblock::join -- $punktable " " $othertable]\n #append text [textblock::join -- $punktable " " $othertable]\n
append text $punktable\n$othertable\n
} else { } else {
append text $linesep\n append text $linesep\n

2
src/project_layouts/custom/_project/punk.project-0.1/src/make.tcl

@ -1828,7 +1828,6 @@ if {$::punkboot::command eq "bootsupport"} {
package vcompare $v1 $v2 package vcompare $v1 $v2
} }
proc bootsupport_localupdate {projectroot} { proc bootsupport_localupdate {projectroot} {
set bootsupport_modules [list] ;#variable populated by include_modules.config file - review
set sourcefolder $projectroot/src set sourcefolder $projectroot/src
set bootmodulefolders [glob -nocomplain -dir $sourcefolder/bootsupport -type d -tails modules modules_tcl*] set bootmodulefolders [glob -nocomplain -dir $sourcefolder/bootsupport -type d -tails modules modules_tcl*]
@ -1840,6 +1839,7 @@ if {$::punkboot::command eq "bootsupport"} {
set which "" set which ""
} }
set bootsupport_config $projectroot/src/bootsupport/modules$which/include_modules.config ;# set bootsupport_config $projectroot/src/bootsupport/modules$which/include_modules.config ;#
set bootsupport_modules [list] ;#variable populated by include_modules.config file - initialise empty for each bm folder
if {[file exists $bootsupport_config]} { if {[file exists $bootsupport_config]} {
set targetroot $projectroot/src/bootsupport/modules$which set targetroot $projectroot/src/bootsupport/modules$which
source $bootsupport_config ;#populate $bootsupport_modules with project-specific list source $bootsupport_config ;#populate $bootsupport_modules with project-specific list

11
src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk-0.1.tm

@ -7941,7 +7941,13 @@ namespace eval punk {
set t [textblock::class::table new -show_hseps 0 -show_header 1 -ansiborder_header [a+ web-green]] set t [textblock::class::table new -show_hseps 0 -show_header 1 -ansiborder_header [a+ web-green]]
foreach {v vinfo} $otherenv_config { foreach {v vinfo} $otherenv_config {
if {[info exists ::env($v)]} { if {[info exists ::env($v)]} {
set c2 [set ::env($v)] set env_val [set ::env($v)]
if {[string match "*_TM_PATH" $v]} {
set entries [split $env_val $::tcl_platform(pathSeparator)]
set c2 [join $entries \n]
} else {
set c2 $::env($v)
}
} else { } else {
set c2 "(NOT SET)" set c2 "(NOT SET)"
} }
@ -7952,7 +7958,8 @@ namespace eval punk {
set othertable [$t print] set othertable [$t print]
$t destroy $t destroy
append text [textblock::join -- $punktable " " $othertable]\n #append text [textblock::join -- $punktable " " $othertable]\n
append text $punktable\n$othertable\n
} else { } else {
append text $linesep\n append text $linesep\n

2
src/project_layouts/custom/_project/punk.shell-0.1/src/make.tcl

@ -1828,7 +1828,6 @@ if {$::punkboot::command eq "bootsupport"} {
package vcompare $v1 $v2 package vcompare $v1 $v2
} }
proc bootsupport_localupdate {projectroot} { proc bootsupport_localupdate {projectroot} {
set bootsupport_modules [list] ;#variable populated by include_modules.config file - review
set sourcefolder $projectroot/src set sourcefolder $projectroot/src
set bootmodulefolders [glob -nocomplain -dir $sourcefolder/bootsupport -type d -tails modules modules_tcl*] set bootmodulefolders [glob -nocomplain -dir $sourcefolder/bootsupport -type d -tails modules modules_tcl*]
@ -1840,6 +1839,7 @@ if {$::punkboot::command eq "bootsupport"} {
set which "" set which ""
} }
set bootsupport_config $projectroot/src/bootsupport/modules$which/include_modules.config ;# set bootsupport_config $projectroot/src/bootsupport/modules$which/include_modules.config ;#
set bootsupport_modules [list] ;#variable populated by include_modules.config file - initialise empty for each bm folder
if {[file exists $bootsupport_config]} { if {[file exists $bootsupport_config]} {
set targetroot $projectroot/src/bootsupport/modules$which set targetroot $projectroot/src/bootsupport/modules$which
source $bootsupport_config ;#populate $bootsupport_modules with project-specific list source $bootsupport_config ;#populate $bootsupport_modules with project-specific list

Loading…
Cancel
Save