Exports and builds with progen yaml file

Author: sarahmarshy

tools/export/exporters.py

@@ -8,6 +8,7 @@
 from contextlib import closing
 from zipfile import ZipFile, ZIP_DEFLATED
 from operator import add
+import yaml
 
 from tools.utils import mkdir
 from tools.toolchains import TOOLCHAIN_CLASSES
@@ -19,6 +20,7 @@
 
 from tools.config import Config
 
+
 class OldLibrariesException(Exception): pass
 
 class FailedBuildException(Exception) : pass
@@ -109,19 +111,33 @@ def progen_get_project_data(self):
         }
         return project_data
 
+    def progen_make_yaml(self, project_data, name):
+        fname = os.path.join(project_data['common']['export_dir'][0], "projects.yaml")
+        project_data['common']['export_dir'] = project_data['common']['export_dir'][0]
+        new_data = {"projects":{name:project_data}}
+        if os.path.isfile(fname):
+            os.remove(fname)
+        with open(fname, 'w+') as f:
+            f.write(yaml.dump(new_data, default_flow_style=False))
+
+        return fname
+
     def progen_gen_file(self, tool_name, project_data, progen_build=False):
         """" Generate project using ProGen Project API """
-        settings = ProjectSettings()
-        project = Project(self.program_name, [project_data], settings)
-        # TODO: Fix this, the inc_dirs are not valid (our scripts copy files), therefore progen
-        # thinks it is not dict but a file, and adds them to workspace.
-        project.project['common']['include_paths'] = self.resources.inc_dirs
-        project.generate(tool_name, copied=not self.sources_relative)
-        if progen_build:
-            print("Project exported, building...")
-            result = project.build(tool_name)
-            if result == -1:
-                raise FailedBuildException("Build Failed")
+        #project_data['common']['include_paths'] = self.resources.inc_dirs
+        yaml_file = self.progen_make_yaml(project_data, self.program_name)
+        generator = Generator(yaml_file)
+
+        for project in generator.generate(''):
+            #print diff(p, project.project)
+            project.project['common']['include_paths'] = self.resources.inc_dirs
+            if project.generate(tool_name, copied=not self.sources_relative) == -1:
+                return -1
+            if progen_build:
+                print "Project exported, now building..."
+                if project.build(tool_name) == -1:
+                    raise FailedBuildException("Build Failed")
+        return 0
 
     def __scan_all(self, path):
         resources = []

tools/test/export/build_test.py

@@ -21,6 +21,7 @@
 import argparse
 import os
 import shutil
+import yaml
 from os.path import join, abspath, dirname, exists, basename
 r=dirname(__file__)
 ROOT = abspath(join(r, "..","..",".."))
@@ -87,10 +88,18 @@ def handle_project_files(tool, project_dir, target, test, clean=False):
             return
 
         #check if project files exist
-        if not clean and os.path.exists(project_files_dir):
+        if os.path.exists(project_files_dir):
             shutil.rmtree(project_files_dir, ignore_errors=True)
         os.rename(project_dir, project_files_dir)
 
+        #change yaml file to reference new project file location
+        yaml_file = os.path.join(project_files_dir, 'projects.yaml')
+        with open(yaml_file, 'r+') as f:
+            proj_dict = yaml.load(f)
+            proj_dict["projects"][test]["common"]["export_dir"] = project_files_dir
+            with open(yaml_file, 'w+') as outf:
+                outf.write(yaml.dump(proj_dict, default_flow_style=False))
+
     def generate_and_build(self, tests, clean=False):
 
         #build results