Copy and add hw files to makefile when needed

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@2517 38d2e660-2303-0410-9eaa-f027e97ec537

diff --git a/wizard/bertos_utils.py b/wizard/bertos_utils.py
index fe346e8f12f41d8a19cb30ce736115efaa157c34..a9578d13c228e2f3a76bec8221f0ce9cbc7e5a13 100644 (file)
--- a/wizard/bertos_utils.py
+++ b/wizard/bertos_utils.py
@@ -51,6 +51,15 @@ def createBertosProject(project_info):
     prjdir = directory + "/" + os.path.basename(directory)
     shutil.rmtree(prjdir, True)
     os.mkdir(prjdir)
+    # Destination hw files
+    hwdir = prjdir + "/hw"
+    shutil.rmtree(hwdir, True)
+    os.mkdir(hwdir)
+    # Copy all the hw files
+    for module, information in project_info.info("MODULES").items():
+        for hwfile in information["hw"]:
+            string = open(sources_dir + "/" + hwfile, "r").read()
+            open(hwdir + "/" + os.path.basename(hwfile), "w").write(string)
     # Destination configurations files
     cfgdir = prjdir + "/cfg"
     shutil.rmtree(cfgdir, True)
@@ -147,12 +156,16 @@ def csrcGenerator(project_info):
         dependency_files = set([])
         # assembly sources
         asm_files = set([])
+        hwdir = os.path.basename(project_info.info("PROJECT_PATH")) + "/hw" 
         if information["enabled"]:
             if "constants" in information:
                 constants.update(information["constants"])
             cfiles, sfiles = findModuleFiles(module, project_info)
             module_files |= set(cfiles)
             asm_files |= set(sfiles)
+            for file in information["hw"]:
+                if file.endswith(".c"):
+                    module_files |= set([hwdir + "/" + os.path.basename(file)])
             for file_dependency in information["depends"]:
                 if file_dependency in files:
                     dependencyCFiles, dependencySFiles = findModuleFiles(file_dependency, project_info)
@@ -343,6 +356,14 @@ def loadModuleDefinition(first_comment):
             if harvard == "both" or harvard == "pgm_memory":
                 module_dict[module_name]["harvard"] = harvard
             del module_definition[const.MODULE_DEFINITION["module_harvard"]]
+        if const.MODULE_DEFINITION["module_hw"] in module_definition.keys():
+            hw = module_definition[const.MODULE_DEFINITION["module_hw"]]
+            del module_definition[const.MODULE_DEFINITION["module_hw"]]
+            if type(hw) == str:
+                hw = (hw, )
+            module_dict[module_name]["hw"] = hw
+        else:
+            module_dict[module_name]["hw"] = ()
         module_dict[module_name]["constants"] = module_definition
         module_dict[module_name]["enabled"] = False
     return to_be_parsed, module_dict

diff --git a/wizard/const.py b/wizard/const.py
index 8ddb7004c23f52a0fa7e845de812d60fd917771e..f776b9772cec6d6a9a48fb79c964a3de4677d7fb 100644 (file)
--- a/wizard/const.py
+++ b/wizard/const.py
@@ -69,4 +69,5 @@ MODULE_DEFINITION = {
     "module_configuration": "module_configuration",
     "module_depends": "module_depends",
     "module_harvard": "module_harvard",
+    "module_hw": "module_hw",
 }
\ No newline at end of file