Commit c4f685a1 authored by Arnaud Schach's avatar Arnaud Schach

version 2.0.22

* ticket 0000658 : Error in skeleton generation when selecting a connection
* ticket 0000659 : Repair inconsistency wrongly called
* ticket 0000660 : Exporting function to an unexisting directory raise a tcl error
* ticket 0000656 : All imports of function are refused for dataview compatibility reasons (corection added)
* ticket 0000588 : Error in external tools menu status (correction added)
* ticket 0000664 : Add possibility to export function under a specific name
* ticket 0000665 : Call save all instead of save when launching external tools
* ticket 0000666 : ConcurrencyView generation does not work
parent 9556a7d5
No preview for this file type
version 2.0.22
* ticket 0000658 : Error in skeleton generation when selecting a connection
* ticket 0000659 : Repair inconsistency wrongly called
* ticket 0000660 : Exporting function to an unexisting directory raise a tcl error
* ticket 0000656 : All imports of function are refused for dataview compatibility reasons (corection added)
* ticket 0000588 : Error in external tools menu status (correction added)
* ticket 0000664 : Add possibility to export function under a specific name
* ticket 0000665 : Call save all instead of save when launching external tools
* ticket 0000666 : ConcurrencyView generation does not work
version 2.0.21
* ticket 0000656 : All imports of function are refused for dataview compatibility reasons
* ticket 0000657 : Instantiating incompatible function raise a Tcl error
......
......@@ -21,6 +21,7 @@ The getApplyTo function shall return a list defining the kind of TASTE element t
tool can be used on
The list is of the form { { "objecttype" { "atribute1" "value1" }* }* }
If the list is [list "alwayson" ] then the external tool will be active all the time.
If the list is [list "allContext" ] then the external tool will be active all the time in all context.
The getOutputManagement function shall return a list defining the way output result of
external tool is to be managed:
......
......@@ -17,7 +17,7 @@ namespace eval build_c {
# Names of the object this script can be used on
# FIXME - it should be active all the time
proc getApplyTo {} {
return [list "alwayson" ]
return [list "allContext" ]
}
# List of way to manage output in the Framework
......
......@@ -16,7 +16,7 @@ namespace eval cleanup {
# Names of the object this script can be used on
proc getApplyTo {} {
return [list "alwayson" ]
return [list "allContext" ]
}
# List of way to manage output in the Framework
......
......@@ -105,99 +105,48 @@ namespace eval concurrencyview {
# synchronous call
proc concurrencyview_internal { } {
set generationDir "[LogManager::getLogDirectory]/buildCV"
set ivFilename "$generationDir/interfaceview.aadl"
set dvFilename "$generationDir/deployment.aadl"
## Ticket mantis 0000665
set ivFilename [ lindex [::Object::getAttribute "interfaceview" "filenames" ] 0]
set dvFilename [ lindex [::Object::getAttribute "deploymentview" "filenames" ] 0]
set dtFilename [lindex [Object::getAttribute "dataview" "filenames" ] 0 ]
#~ set hwFilenames [Object::getAttribute "hwlibrary" "filenames" ]
file delete -force "$generationDir"
file mkdir $generationDir
::API::Taste::exportIV [list "backend" "1_3" "dirname" $generationDir "selection" "all" ]
set cvFilename "[LogManager::getLogDirectory]/concurrencyview.aadl"
::API::Taste::exportDV [list "backend" "1_3" "dirname" $generationDir]
if { [file exists $ivFilename ] && [file exists $dvFilename ] && [file exists $dtFilename ] } {
#~ taste-edit-concurrency-view "$dtFilename" "$ivFilename" "$dvFilename"
set concatFilename "[LogManager::getLogDirectory]/concatenatedFile.aadl"
set cvFilename "[LogManager::getLogDirectory]/concurrencyview.aadl"
set fout [ open $concatFilename w ]
fconfigure $fout -translation lf
set fin [ open $ivFilename r ]
set content [read -nonewline $fin]
close $fin
puts $fout $content
puts $fout "\n\n"
set fin [ open $dvFilename r ]
set content [read -nonewline $fin]
close $fin
puts $fout $content
puts $fout "\n\n"
if { [file exists $dtFilename ] } {
set fin [ open $dtFilename r ]
set content [read -nonewline $fin]
close $fin
puts $fout $content
#~ puts $fout "\n\n"
}
#~ foreach hwFilename $hwFilenames {
#~ if { [file exists $hwFilename ] } {
#~ set fin [ open $hwFilename r ]
#~ set content [read -nonewline $fin]
#~ close $fin
#~ puts $fout $content
#~ puts $fout "\n\n"
#~ }
#~ }
close $fout
set res [catch { exec taste-config --prefix } tasteConfigDir ]
if { $res != 0 } {
#~ an error happend
return [list 1 [list "taste-config error: $tasteConfigDir"] ]
} else {
set AADL_IV_PROPERTIES "$tasteConfigDir/share/config_ellidiss/TASTE_IV_Properties.aadl"
set AADL_DV_PROPERTIES "$tasteConfigDir/share/config_ellidiss/TASTE_DV_Properties.aadl"
set OCARINA_COMPONENTS "$tasteConfigDir/share/ocarina/AADLv2/ocarina_components.aadl"
set res [catch { exec taste-config --prefix } tasteConfigDir ]
if { $res != 0 } {
#~ an error happend
return [list 1 [list "taste-config error: $tasteConfigDir"] ]
}
set tempdir "$generationDir/tmpConcu"
file delete -force $tempdir
file mkdir $tempdir
set res [ catch { exec taste-edit-concurrency-view 2>@1 } errMsg ]
if { [file exists "./ConcurrencyView/process.aadl" ] } {
file delete -force "$cvFilename"
file copy -force "./ConcurrencyView/process.aadl" "$cvFilename"
set chan [open "$cvFilename" a+ ]
fconfigure $chan -translation lf
foreach threadFile [glob -nocomplain -type f -directory "./ConcurrencyView" *_Thread.aadl ] {
set fin [ open $threadFile r ]
set content [read -nonewline $fin]
close $fin
puts $chan $content
puts $chan "\n\n"
}
set fin [ open $OCARINA_COMPONENTS r ]
set res [ catch { exec taste-edit-concurrency-view ${ivFilename} ${dvFilename} ${dtFilename} 2>@1 } errMsg ]
if { $res == 0 } {
if { [file exists "ConcurrencyView/process.aadl" ] } {
file delete -force "$cvFilename"
file copy -force "ConcurrencyView/process.aadl" "$cvFilename"
set chan [open "$cvFilename" a+ ]
fconfigure $chan -translation lf
foreach threadFile [glob -nocomplain -type f -directory "ConcurrencyView" *_Thread.aadl ] {
set fin [ open $threadFile r ]
set content [read -nonewline $fin]
close $fin
puts $chan $content
close $chan
} else {
return [list 1 [list "Concurrency View Generation Error:\n$errMsg" ] ]
puts $chan "\n\n"
}
set OCARINA_COMPONENTS "$tasteConfigDir/share/ocarina/AADLv2/ocarina_components.aadl"
set fin [ open $OCARINA_COMPONENTS r ]
set content [read -nonewline $fin]
close $fin
puts $chan $content
close $chan
::API::HMI::loadUI "$cvFilename" "concurrencyview"
return [list 0 ""]
}
return [list 0 ""]
} else {
return [ list -1 [list "Dataview, Interfaceview and Deploymentview shall be loaded." ] ]
return [list 1 [list "taste-edit-concurrency-view error:\n$errMsg" ] ]
}
}
}
......@@ -17,7 +17,7 @@ namespace eval generate_database {
# Names of the object this script can be used on
# FIXME - it should be active all the time
proc getApplyTo {} {
return [list "alwayson" ]
return [list "allContext" ]
}
# List of way to manage output in the Framework
......
......@@ -17,7 +17,7 @@ namespace eval generate_skeletons {
# Names of the object this script can be used on
# FIXME - it should be active all the time
proc getApplyTo {} {
return [list "alwayson" ]
return [list "allContext" ]
}
# List of way to manage output in the Framework
......
No preview for this file type
version 2.0.22
* ticket 0000658 : Error in skeleton generation when selecting a connection
* ticket 0000659 : Repair inconsistency wrongly called
* ticket 0000660 : Exporting function to an unexisting directory raise a tcl error
* ticket 0000656 : All imports of function are refused for dataview compatibility reasons (corection added)
* ticket 0000588 : Error in external tools menu status (correction added)
* ticket 0000664 : Add possibility to export function under a specific name
* ticket 0000665 : Call save all instead of save when launching external tools
* ticket 0000666 : ConcurrencyView generation does not work
version 2.0.21
* ticket 0000656 : All imports of function are refused for dataview compatibility reasons
* ticket 0000657 : Instantiating incompatible function raise a Tcl error
......
......@@ -21,6 +21,7 @@ The getApplyTo function shall return a list defining the kind of TASTE element t
tool can be used on
The list is of the form { { "objecttype" { "atribute1" "value1" }* }* }
If the list is [list "alwayson" ] then the external tool will be active all the time.
If the list is [list "allContext" ] then the external tool will be active all the time in all context.
The getOutputManagement function shall return a list defining the way output result of
external tool is to be managed:
......
......@@ -17,7 +17,7 @@ namespace eval build_c {
# Names of the object this script can be used on
# FIXME - it should be active all the time
proc getApplyTo {} {
return [list "alwayson" ]
return [list "allContext" ]
}
# List of way to manage output in the Framework
......
......@@ -16,7 +16,7 @@ namespace eval cleanup {
# Names of the object this script can be used on
proc getApplyTo {} {
return [list "alwayson" ]
return [list "allContext" ]
}
# List of way to manage output in the Framework
......
......@@ -105,99 +105,48 @@ namespace eval concurrencyview {
# synchronous call
proc concurrencyview_internal { } {
set generationDir "[LogManager::getLogDirectory]/buildCV"
set ivFilename "$generationDir/interfaceview.aadl"
set dvFilename "$generationDir/deployment.aadl"
## Ticket mantis 0000665
set ivFilename [ lindex [::Object::getAttribute "interfaceview" "filenames" ] 0]
set dvFilename [ lindex [::Object::getAttribute "deploymentview" "filenames" ] 0]
set dtFilename [lindex [Object::getAttribute "dataview" "filenames" ] 0 ]
#~ set hwFilenames [Object::getAttribute "hwlibrary" "filenames" ]
file delete -force "$generationDir"
file mkdir $generationDir
::API::Taste::exportIV [list "backend" "1_3" "dirname" $generationDir "selection" "all" ]
set cvFilename "[LogManager::getLogDirectory]/concurrencyview.aadl"
::API::Taste::exportDV [list "backend" "1_3" "dirname" $generationDir]
if { [file exists $ivFilename ] && [file exists $dvFilename ] && [file exists $dtFilename ] } {
#~ taste-edit-concurrency-view "$dtFilename" "$ivFilename" "$dvFilename"
set concatFilename "[LogManager::getLogDirectory]/concatenatedFile.aadl"
set cvFilename "[LogManager::getLogDirectory]/concurrencyview.aadl"
set fout [ open $concatFilename w ]
fconfigure $fout -translation lf
set fin [ open $ivFilename r ]
set content [read -nonewline $fin]
close $fin
puts $fout $content
puts $fout "\n\n"
set fin [ open $dvFilename r ]
set content [read -nonewline $fin]
close $fin
puts $fout $content
puts $fout "\n\n"
if { [file exists $dtFilename ] } {
set fin [ open $dtFilename r ]
set content [read -nonewline $fin]
close $fin
puts $fout $content
#~ puts $fout "\n\n"
}
#~ foreach hwFilename $hwFilenames {
#~ if { [file exists $hwFilename ] } {
#~ set fin [ open $hwFilename r ]
#~ set content [read -nonewline $fin]
#~ close $fin
#~ puts $fout $content
#~ puts $fout "\n\n"
#~ }
#~ }
close $fout
set res [catch { exec taste-config --prefix } tasteConfigDir ]
if { $res != 0 } {
#~ an error happend
return [list 1 [list "taste-config error: $tasteConfigDir"] ]
} else {
set AADL_IV_PROPERTIES "$tasteConfigDir/share/config_ellidiss/TASTE_IV_Properties.aadl"
set AADL_DV_PROPERTIES "$tasteConfigDir/share/config_ellidiss/TASTE_DV_Properties.aadl"
set OCARINA_COMPONENTS "$tasteConfigDir/share/ocarina/AADLv2/ocarina_components.aadl"
set res [catch { exec taste-config --prefix } tasteConfigDir ]
if { $res != 0 } {
#~ an error happend
return [list 1 [list "taste-config error: $tasteConfigDir"] ]
}
set tempdir "$generationDir/tmpConcu"
file delete -force $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 ]
if { [file exists "$tempdir/ConcurrencyView/process.aadl" ] } {
file delete -force "$cvFilename"
file copy -force "$tempdir/ConcurrencyView/process.aadl" "$cvFilename"
set chan [open "$cvFilename" a+ ]
fconfigure $chan -translation lf
foreach threadFile [glob -nocomplain -type f -directory "$tempdir/ConcurrencyView" *_Thread.aadl ] {
set fin [ open $threadFile r ]
set content [read -nonewline $fin]
close $fin
puts $chan $content
puts $chan "\n\n"
}
set fin [ open $OCARINA_COMPONENTS r ]
set res [ catch { exec taste-edit-concurrency-view ${ivFilename} ${dvFilename} ${dtFilename} 2>@1 } errMsg ]
if { $res == 0 } {
if { [file exists "ConcurrencyView/process.aadl" ] } {
file delete -force "$cvFilename"
file copy -force "ConcurrencyView/process.aadl" "$cvFilename"
set chan [open "$cvFilename" a+ ]
fconfigure $chan -translation lf
foreach threadFile [glob -nocomplain -type f -directory "ConcurrencyView" *_Thread.aadl ] {
set fin [ open $threadFile r ]
set content [read -nonewline $fin]
close $fin
puts $chan $content
close $chan
} else {
return [list 1 [list "buildsupport error:\n$errMsg" ] ]
puts $chan "\n\n"
}
set OCARINA_COMPONENTS "$tasteConfigDir/share/ocarina/AADLv2/ocarina_components.aadl"
set fin [ open $OCARINA_COMPONENTS r ]
set content [read -nonewline $fin]
close $fin
puts $chan $content
close $chan
::API::HMI::loadUI "$cvFilename" "concurrencyview"
return [list 0 ""]
}
return [list 0 ""]
} else {
return [ list -1 [list "Dataview, Interfaceview and Deploymentview shall be loaded." ] ]
return [list 1 [list "taste-edit-concurrency-view error:\n$errMsg" ] ]
}
}
}
......@@ -17,7 +17,7 @@ namespace eval generate_database {
# Names of the object this script can be used on
# FIXME - it should be active all the time
proc getApplyTo {} {
return [list "alwayson" ]
return [list "allContext" ]
}
# List of way to manage output in the Framework
......
......@@ -17,7 +17,7 @@ namespace eval generate_skeletons {
# Names of the object this script can be used on
# FIXME - it should be active all the time
proc getApplyTo {} {
return [list "alwayson" ]
return [list "allContext" ]
}
# List of way to manage output in the Framework
......
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