Commit 9556a7d5 authored by Maxime Perrotin's avatar Maxime Perrotin

Call taste-edit-concurrency-view, not buildsupport

parent 30305be5
...@@ -169,14 +169,14 @@ namespace eval concurrencyview { ...@@ -169,14 +169,14 @@ namespace eval concurrencyview {
file delete -force $tempdir file delete -force $tempdir
file mkdir $tempdir file mkdir $tempdir
set res [ catch { exec buildsupport -i ${ivFilename} -c ${dvFilename} -d ${dtFilename} ${AADL_IV_PROPERTIES} ${AADL_DV_PROPERTIES} ${OCARINA_COMPONENTS} -glue -gw -o ${tempdir} 2>@1 } errMsg ] set res [ catch { exec taste-edit-concurrency-view 2>@1 } errMsg ]
if { [file exists "$tempdir/ConcurrencyView/process.aadl" ] } { if { [file exists "./ConcurrencyView/process.aadl" ] } {
file delete -force "$cvFilename" file delete -force "$cvFilename"
file copy -force "$tempdir/ConcurrencyView/process.aadl" "$cvFilename" file copy -force "./ConcurrencyView/process.aadl" "$cvFilename"
set chan [open "$cvFilename" a+ ] set chan [open "$cvFilename" a+ ]
fconfigure $chan -translation lf fconfigure $chan -translation lf
foreach threadFile [glob -nocomplain -type f -directory "$tempdir/ConcurrencyView" *_Thread.aadl ] { foreach threadFile [glob -nocomplain -type f -directory "./ConcurrencyView" *_Thread.aadl ] {
set fin [ open $threadFile r ] set fin [ open $threadFile r ]
set content [read -nonewline $fin] set content [read -nonewline $fin]
close $fin close $fin
...@@ -189,7 +189,7 @@ namespace eval concurrencyview { ...@@ -189,7 +189,7 @@ namespace eval concurrencyview {
puts $chan $content puts $chan $content
close $chan close $chan
} else { } else {
return [list 1 [list "buildsupport error:\n$errMsg" ] ] return [list 1 [list "Concurrency View Generation Error:\n$errMsg" ] ]
} }
::API::HMI::loadUI "$cvFilename" "concurrencyview" ::API::HMI::loadUI "$cvFilename" "concurrencyview"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment