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

Merge pull request #2034 from sarahmarshy/patch-1 

[Exporters] Conflicting zip name
pull/2037/head
Martin Kojtal 2016-06-28 07:28:41 +02:00 committed by GitHub
parent 5994173d39 beb0be99d8
commit 96e533c361
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/export/__init__.py
View File

@ -58,7 +58,7 @@ def online_build_url_resolver(url):
def export(project_path, project_name, ide, target, destination='/tmp/', def export(project_path, project_name, ide, target, destination='/tmp/',
tempdir=None, clean=True, extra_symbols=None, zip=True, sources_relative=False, build_url_resolver=online_build_url_resolver): tempdir=None, clean=True, extra_symbols=None, make_zip=True, sources_relative=False, build_url_resolver=online_build_url_resolver):
# Convention: we are using capitals for toolchain and target names # Convention: we are using capitals for toolchain and target names
if target is not None: if target is not None:
target = target.upper() target = target.upper()
@ -136,7 +136,7 @@ def export(project_path, project_name, ide, target, destination='/tmp/',
# copy .hgignore file to exported direcotry as well. # copy .hgignore file to exported direcotry as well.
if exists(os.path.join(exporter.TEMPLATE_DIR,'.hgignore')): if exists(os.path.join(exporter.TEMPLATE_DIR,'.hgignore')):
copy(os.path.join(exporter.TEMPLATE_DIR,'.hgignore'), tempdir) copy(os.path.join(exporter.TEMPLATE_DIR,'.hgignore'), tempdir)
if zip: if make_zip:
zip_path = zip_working_directory_and_clean_up(tempdir, destination, project_name, clean) zip_path = zip_working_directory_and_clean_up(tempdir, destination, project_name, clean)
else: else:
zip_path = destination zip_path = destination