Commit 11f1ad22 authored by Thanassis Tsiodras's avatar Thanassis Tsiodras
Browse files
parents 308dad6b 31ae3e22
...@@ -22,6 +22,7 @@ import time ...@@ -22,6 +22,7 @@ import time
import glob import glob
import logging import logging
import multiprocessing import multiprocessing
import xml.sax.saxutils
# File handle where build log (log.txt) is # File handle where build log (log.txt) is
g_log = None g_log = None
...@@ -504,7 +505,7 @@ def CheckDirectives(baseDir): ...@@ -504,7 +505,7 @@ def CheckDirectives(baseDir):
while True: while True:
findCO = re.match(pattern, data) findCO = re.match(pattern, data)
if findCO: if findCO:
opt = findCO.group(1) opt = xml.sax.saxutils.unescape(findCO.group(1))
data = findCO.group(2) data = findCO.group(2)
partition = g_fromFunctionToPartition[baseDir] partition = g_fromFunctionToPartition[baseDir]
target.setdefault(partition, []).append(opt) target.setdefault(partition, []).append(opt)
...@@ -1919,7 +1920,6 @@ def InvokeBuildSupport(i_aadlFile, depl_aadlFile, bKeepCase, bDebug, cvAttribute ...@@ -1919,7 +1920,6 @@ def InvokeBuildSupport(i_aadlFile, depl_aadlFile, bKeepCase, bDebug, cvAttribute
dv = "D_view_aadlv2.aadl" dv = "D_view_aadlv2.aadl"
dbgOption = " -g " if bDebug else "" dbgOption = " -g " if bDebug else ""
shutil.copy(depl_aadlFile, ".") 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))) mysystem('cleanupDV.pl "%s" > a_temp_name && mv a_temp_name "%s"' % (os.path.basename(depl_aadlFile), os.path.basename(depl_aadlFile)))
converterFlag = "" converterFlag = ""
if not any('Taste::version' in x for x in open(depl_aadlFile).readlines()): if not any('Taste::version' in x for x in open(depl_aadlFile).readlines()):
...@@ -2363,7 +2363,7 @@ end ASSERT_System.Impl; ...@@ -2363,7 +2363,7 @@ end ASSERT_System.Impl;
sys.stdout.flush() sys.stdout.flush()
break 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))) mysystem('cleanupDV.pl "%s" > a_temp_name && mv a_temp_name "%s"' % (os.path.basename(depl_aadlFile), os.path.basename(depl_aadlFile)))
if invokeOcarina: if invokeOcarina:
# banner("Invoking ocarina") # banner("Invoking ocarina")
......
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