Merge pull request #2026 from 0xc0170/fix_paths

Fix paths for project.py

Author: bogdanm

tools/export/__init__.py

@@ -58,7 +58,7 @@ def online_build_url_resolver(url):
 
 
 def export(project_path, project_name, ide, target, destination='/tmp/',
-           tempdir=None, clean=True, extra_symbols=None, zip=True, relative=False, build_url_resolver=online_build_url_resolver):
+           tempdir=None, clean=True, extra_symbols=None, zip=True, sources_relative=False, build_url_resolver=online_build_url_resolver):
     # Convention: we are using capitals for toolchain and target names
     if target is not None:
         target = target.upper()
@@ -75,7 +75,7 @@ def export(project_path, project_name, ide, target, destination='/tmp/',
         try:
             ide = "zip"
             exporter = zip.ZIP(target, tempdir, project_name, build_url_resolver, extra_symbols=extra_symbols)
-            exporter.scan_and_copy_resources(project_path, tempdir, relative)
+            exporter.scan_and_copy_resources(project_path, tempdir, sources_relative)
             exporter.generate()
             report['success'] = True
         except OldLibrariesException, e:
@@ -101,8 +101,8 @@ def export(project_path, project_name, ide, target, destination='/tmp/',
             if supported:
                 # target checked, export
                 try:
-                    exporter = Exporter(target, tempdir, project_name, build_url_resolver, extra_symbols=extra_symbols)
-                    exporter.scan_and_copy_resources(project_path, tempdir, relative)
+                    exporter = Exporter(target, tempdir, project_name, build_url_resolver, extra_symbols=extra_symbols, sources_relative=sources_relative)
+                    exporter.scan_and_copy_resources(project_path, tempdir, sources_relative)
                     exporter.generate()
                     report['success'] = True
                 except OldLibrariesException, e:

tools/export/exporters.py

@@ -25,7 +25,7 @@ class Exporter(object):
     TEMPLATE_DIR = dirname(__file__)
     DOT_IN_RELATIVE_PATH = False
 
-    def __init__(self, target, inputDir, program_name, build_url_resolver, extra_symbols=None):
+    def __init__(self, target, inputDir, program_name, build_url_resolver, extra_symbols=None, sources_relative=True):
         self.inputDir = inputDir
         self.target = target
         self.program_name = program_name
@@ -35,6 +35,7 @@ def __init__(self, target, inputDir, program_name, build_url_resolver, extra_sym
         self.jinja_environment = Environment(loader=jinja_loader)
         self.extra_symbols = extra_symbols
         self.config_macros = []
+        self.sources_relative = sources_relative
 
     def get_toolchain(self):
         return self.TOOLCHAIN
@@ -109,7 +110,7 @@ def progen_gen_file(self, tool_name, project_data):
         # 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=True)
+        project.generate(tool_name, copied=not self.sources_relative)
 
     def __scan_all(self, path):
         resources = []

tools/project.py

@@ -210,7 +210,7 @@
             setup_user_prj(project_dir[0], test.source_dir, test.dependencies)
 
         # Export to selected toolchain
-        tmp_path, report = export(project_dir, project_name, ide, mcu, project_dir[0], project_temp, clean=clean, zip=zip, extra_symbols=lib_symbols, relative=sources_relative)
+        tmp_path, report = export(project_dir, project_name, ide, mcu, project_dir[0], project_temp, clean=clean, zip=zip, extra_symbols=lib_symbols, sources_relative=sources_relative)
         if report['success']:
             if not zip:
                 zip_path = join(project_temp, "%s_%s" % (project_name, mcu))