Skip to content

GitLab

E
ellidiss-release
Commit d1ae8739 authored by Jerome Legrand's avatar Jerome Legrand
Browse files
Options

Merge branch 'master' of https://gitrepos.estec.esa.int/taste/ellidiss-release

parents 5218ebb4 eb2c2da6
Show whitespace changes
Inline Side-by-side
Showing with 178 additions and 172 deletions
TASTE-linux/bin/TASTE
View file @ d1ae8739
No preview for this file type
TASTE-linux/changelog.txt
View file @ d1ae8739
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
......
TASTE-linux/config/TasteConfig.ini
View file @ d1ae8739
......@@ -15,6 +15,7 @@ namespace eval TasteConfig {
"asn2aadlPath" "asn2aadlPlus" \
"mscEditor" "taste-edit-msc" \
"mscCreator" "taste-create-msc" \
"check-deployment-target" "false" \
}
variable accelerators { \
......
TASTE-linux/config/externalTools/README
View file @ d1ae8739
......@@ -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:
......
TASTE-linux/config/externalTools/build_c.tcl
View file @ d1ae8739
......@@ -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
......
TASTE-linux/config/externalTools/cleanup.tcl
View file @ d1ae8739
......@@ -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
......
TASTE-linux/config/externalTools/concurrencyview.tcl 100644 → 100755
View file @ d1ae8739
......@@ -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" ]
::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 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 ]
set res [ catch { exec taste-edit-concurrency-view ${ivFilename} ${dvFilename} ${dtFilename} 2>@1 } errMsg ]
if { [file exists "$tempdir/ConcurrencyView/process.aadl" ] } {
if { $res == 0 } {
if { [file exists "ConcurrencyView/process.aadl" ] } {
file delete -force "$cvFilename"
file copy -force "$tempdir/ConcurrencyView/process.aadl" "$cvFilename"
file copy -force "ConcurrencyView/process.aadl" "$cvFilename"
set chan [open "$cvFilename" a+ ]
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 content [read -nonewline $fin]
close $fin
puts $chan $content
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
} else {
return [list 1 [list "buildsupport error:\n$errMsg" ] ]
}
::API::HMI::loadUI "$cvFilename" "concurrencyview"
}
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" ] ]
}
}
}
TASTE-linux/config/externalTools/generate_database.tcl
View file @ d1ae8739
......@@ -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
......
TASTE-linux/config/externalTools/generate_skeletons.tcl
View file @ d1ae8739
......@@ -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
......
TASTE-linux/config/externalTools/micropython_kate.tcl 0 → 100755
View file @ d1ae8739
package provide micropython_kate 0.1
# C code editor (using Kate)
lappend auto_path .
namespace eval micropython_kate {
# Graphical name of the operation
proc getLabel {} {
return "Edit Micropython source code"
}
# Name of the application this script can be used with
# shall be either InterfaceView or DeploymentView
proc getApplication {} {
return "InterfaceView"
}
# Names of the object this script can be used on
proc getApplyTo {} {
return [list { "Function" {"Source_Language" "Micropython"} } ]
}
# List of way to manage output in the Framework
# Could be an empty list or one or both of 'dialogBox' and 'statusBar'
proc getOutputManagement {} {
## Ticket mantis 0000625
return [list statusBar dialogBoxOnError]
}
proc micropython_kate { args } {
set params [lindex $args 0]
set aadlFilePath [Parameter::getParameter $params aadlFilePath]
set aadlId [Parameter::getParameter $params id]
return [c_internal $aadlFilePath $aadlId]
}
# the line "exec {*}[auto_execok $::installationPath/config/externalTools/test.bat]"
# ask the current OS which software is to be used to open the file test.bat
# to launch using the absolute path, read the template2.tcl_
# synchronous call
proc c_internal { aadlFilePath aadlId } {
## Ticket mantis 0000625
set initialPath [pwd]
cd [file dirname $aadlFilePath]
set msg ""
set scriptPath [auto_execok "taste-generate-skeletons"]
if { $scriptPath != "" } {
set errNumb [catch { exec -ignorestderr {*}$scriptPath 2>@1 } errMsg ]
} else {
set errNumb -1
set errMsg "Unknown command taste-generate-skeletons."
}
## Ticket mantis 0000632
set aadlId [string tolower $aadlId 0 end]
set fileBaseName [file normalize "[pwd]/$aadlId" ]
if { $errNumb == 0 && [file exists $fileBaseName ] } {
if { [auto_execok kate] == "" } {
set errNumb -1
set msg [list "Error in execution of \"kate ${fileBaseName}/${aadlId}.py: unknown file kate" ]
} else {
ToolsOthers::execAsynchronouslyWithResponse [list "[auto_execok kate] ${fileBaseName}/${aadlId}.py" ] \
"::micropython_kateres" "Kate error report" "The execution of kate stopped with error"
}
} elseif { $errNumb != 0 } {
set errNumb -1
set msg [list "Error in execution of \"taste-generate-skeletons $aadlFilePath\":\n$errMsg" ]
} else {
set errNumb -1
set msg [list "Cannot find files:\n-${fileBaseName}/${aadlId}.py" ]
}
cd $initialPath
return [list $errNumb $msg]
}
# asynchronous call
#proc template_internal { aadlFilePath aadlId } {
# exec {*}[auto_execok $::installationPath/config/externalTools/test.bat] $aadlFilePath $aadlId &
# return ""
#}
}
TASTE-linux64/bin/TASTE
View file @ d1ae8739
No preview for this file type
TASTE-linux64/changelog.txt
View file @ d1ae8739
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
......
TASTE-linux64/config/TasteConfig.ini
View file @ d1ae8739
......@@ -15,6 +15,7 @@ namespace eval TasteConfig {
"asn2aadlPath" "asn2aadlPlus" \
"mscEditor" "taste-edit-msc" \
"mscCreator" "taste-create-msc" \
"check-deployment-target" "false" \
}
variable accelerators { \
......
TASTE-linux64/config/externalTools/README
View file @ d1ae8739
......@@ -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:
......
TASTE-linux64/config/externalTools/build_c.tcl
View file @ d1ae8739
......@@ -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
......
TASTE-linux64/config/externalTools/cleanup.tcl
View file @ d1ae8739
......@@ -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
......
TASTE-linux64/config/externalTools/concurrencyview.tcl
View file @ d1ae8739
......@@ -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" ]
::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 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 ]
set res [ catch { exec taste-edit-concurrency-view ${ivFilename} ${dvFilename} ${dtFilename} 2>@1 } errMsg ]
if { [file exists "$tempdir/ConcurrencyView/process.aadl" ] } {
if { $res == 0 } {
if { [file exists "ConcurrencyView/process.aadl" ] } {
file delete -force "$cvFilename"
file copy -force "$tempdir/ConcurrencyView/process.aadl" "$cvFilename"
file copy -force "ConcurrencyView/process.aadl" "$cvFilename"
set chan [open "$cvFilename" a+ ]
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 content [read -nonewline $fin]
close $fin
puts $chan $content
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
} else {
return [list 1 [list "buildsupport error:\n$errMsg" ] ]
}
::API::HMI::loadUI "$cvFilename" "concurrencyview"
}
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" ] ]
}
}
}
TASTE-linux64/config/externalTools/generate_database.tcl
View file @ d1ae8739
......@@ -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
......
TASTE-linux64/config/externalTools/generate_skeletons.tcl
View file @ d1ae8739
......@@ -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