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 #155 from bridadan/fix-binary-naming 

Fixing issue where project_name was an empty string
Martin Kojtal 2016-05-30 10:36:32 +01:00
parent 4cf7a3faf5 6e4d74bc24
commit 583ed4320d
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/build_api.py
View File

@ -22,7 +22,7 @@ import colorama
from types import ListType from types import ListType
from shutil import rmtree from shutil import rmtree
from os.path import join, exists, basename, abspath from os.path import join, exists, basename, abspath, normpath
from os import getcwd from os import getcwd
from time import time from time import time
@ -96,7 +96,8 @@ def build_project(src_path, build_path, target, toolchain_name,
# We need to remove all paths which are repeated to avoid # We need to remove all paths which are repeated to avoid
# multiple compilations and linking with the same objects # multiple compilations and linking with the same objects
src_paths = [src_paths[0]] + list(set(src_paths[1:])) src_paths = [src_paths[0]] + list(set(src_paths[1:]))
project_name = basename(src_paths[0] if src_paths[0] != "." and src_paths[0] != "./" else getcwd()) first_src_path = src_paths[0] if src_paths[0] != "." and src_paths[0] != "./" else getcwd()
project_name = basename(normpath(first_src_path))
if name is None: if name is None:
# We will use default project name based on project folder name # We will use default project name based on project folder name