ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Move all generated file paths to FileRefs in the exporters. 

The FileRefs allow you to preserve the correct file paths in the online
compiler. It also allows you to preserve the correct file paths for
generated files.
pull/9967/head
Brian Daniels 2019-03-06 11:01:06 -06:00
parent e239549585
commit 3b4a463dce
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/export/__init__.py
View File

@ -164,7 +164,7 @@ def _inner_zip_export(resources, prj_files, inc_repos):
to_zip = sum((resources.get_file_refs(ftype) for ftype to_zip = sum((resources.get_file_refs(ftype) for ftype
in Resources.ALL_FILE_TYPES), in Resources.ALL_FILE_TYPES),
[]) [])
to_zip.extend(FileRef(basename(pfile), pfile) for pfile in prj_files) to_zip.extend(prj_files)
for dest, source in resources.get_file_refs(FileType.BLD_REF): for dest, source in resources.get_file_refs(FileType.BLD_REF):
target_dir, _ = splitext(dest) target_dir, _ = splitext(dest)
dest = join(target_dir, ".bld", "bldrc") dest = join(target_dir, ".bld", "bldrc")

20
tools/export/exporters.py
View File

@ -27,7 +27,7 @@ import copy
from tools.targets import TARGET_MAP from tools.targets import TARGET_MAP
from tools.utils import mkdir from tools.utils import mkdir
from tools.resources import FileType from tools.resources import FileType, FileRef
"""Just a template for subclassing""" """Just a template for subclassing"""
@ -95,9 +95,17 @@ class Exporter(object):
resources.win_to_unix() resources.win_to_unix()
self.resources = resources self.resources = resources
self.generated_files = [] self.generated_files = []
getting_started_name = "GettingStarted.html"
dot_mbed_name = ".mbed"
self.static_files = ( self.static_files = (
join(self.TEMPLATE_DIR, "GettingStarted.html"), FileRef(
join(self.TEMPLATE_DIR, ".mbed"), getting_started_name,
join(self.TEMPLATE_DIR, getting_started_name)
),
FileRef(
dot_mbed_name,
join(self.TEMPLATE_DIR, dot_mbed_name)
),
) )
self.builder_files_dict = {} self.builder_files_dict = {}
self.add_config() self.add_config()
@ -204,7 +212,7 @@ class Exporter(object):
mkdir(dirname(target_path)) mkdir(dirname(target_path))
logging.debug("Generating: %s", target_path) logging.debug("Generating: %s", target_path)
open(target_path, "w").write(target_text) open(target_path, "w").write(target_text)
self.generated_files += [target_path] self.generated_files += [FileRef(target_file, target_path)]
def gen_file_nonoverwrite(self, template_file, data, target_file, **kwargs): def gen_file_nonoverwrite(self, template_file, data, target_file, **kwargs):
"""Generates or selectively appends a project file from a template""" """Generates or selectively appends a project file from a template"""
@ -221,7 +229,7 @@ class Exporter(object):
else: else:
logging.debug("Generating: %s", target_path) logging.debug("Generating: %s", target_path)
open(target_path, "w").write(target_text) open(target_path, "w").write(target_text)
self.generated_files += [target_path] self.generated_files += [FileRef(template_file, target_path)]
def _gen_file_inner(self, template_file, data, target_file, **kwargs): def _gen_file_inner(self, template_file, data, target_file, **kwargs):
"""Generates a project file from a template using jinja""" """Generates a project file from a template using jinja"""
@ -237,7 +245,7 @@ class Exporter(object):
target_path = join(self.export_dir, target_file) target_path = join(self.export_dir, target_file)
logging.debug("Generating: %s", target_path) logging.debug("Generating: %s", target_path)
open(target_path, "w").write(target_text) open(target_path, "w").write(target_text)
self.generated_files += [target_path] self.generated_files += [FileRef(target_file, target_path)]
def make_key(self, src): def make_key(self, src):
"""From a source file, extract group name """From a source file, extract group name