Merge branch 'master' of https://gitrepos.estec.esa.int/taste/orchestrator

orchestrator/taste-orchestrator.py

@@ -22,6 +22,7 @@ import time
 import glob
 import logging
 import multiprocessing
+import xml.sax.saxutils
 
 # File handle where build log (log.txt) is
 g_log = None
@@ -504,7 +505,7 @@ def CheckDirectives(baseDir):
                 while True:
                     findCO = re.match(pattern, data)
                     if findCO:
-                        opt = findCO.group(1)
+                        opt = xml.sax.saxutils.unescape(findCO.group(1))
                         data = findCO.group(2)
                         partition = g_fromFunctionToPartition[baseDir]
                         target.setdefault(partition, []).append(opt)
@@ -1919,7 +1920,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 +2363,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")