Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
TASTE
orchestrator
Commits
0cae10e0
Commit
0cae10e0
authored
May 04, 2018
by
yoogx
Browse files
* Do not copy ocarina_components.aadl, this causes conflicts in the build procedure
parent
5521d0fd
Changes
1
Hide whitespace changes
Inline
Side-by-side
orchestrator/taste-orchestrator.py
View file @
0cae10e0
...
...
@@ -1919,7 +1919,6 @@ def InvokeBuildSupport(i_aadlFile, depl_aadlFile, bKeepCase, bDebug, cvAttribute
dv
=
"D_view_aadlv2.aadl"
dbgOption
=
" -g "
if
bDebug
else
""
shutil
.
copy
(
depl_aadlFile
,
"."
)
# mysystem("cp $(ocarina-config --resources)/AADLv2/ocarina_components.aadl .")
mysystem
(
'cleanupDV.pl "%s" > a_temp_name && mv a_temp_name "%s"'
%
(
os
.
path
.
basename
(
depl_aadlFile
),
os
.
path
.
basename
(
depl_aadlFile
)))
converterFlag
=
""
if
not
any
(
'Taste::version'
in
x
for
x
in
open
(
depl_aadlFile
).
readlines
()):
...
...
@@ -2363,7 +2362,7 @@ end ASSERT_System.Impl;
sys
.
stdout
.
flush
()
break
mysystem
(
"cp $(ocarina-config --resources)/AADLv2/ocarina_components.aadl ."
)
#
mysystem("cp $(ocarina-config --resources)/AADLv2/ocarina_components.aadl .")
mysystem
(
'cleanupDV.pl "%s" > a_temp_name && mv a_temp_name "%s"'
%
(
os
.
path
.
basename
(
depl_aadlFile
),
os
.
path
.
basename
(
depl_aadlFile
)))
if
invokeOcarina
:
# banner("Invoking ocarina")
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment