Merge pull request #3330 from theotherjimmy/correct-project-profiles

Fix project profile parsing
pull/3362/head
Martin Kojtal 2016-12-02 15:50:07 +01:00 committed by GitHub
commit b08e1ec75e
1 changed files with 7 additions and 7 deletions

View File

@ -15,13 +15,12 @@ from tools.export import EXPORTERS, mcu_ide_matrix
from tools.tests import TESTS, TEST_MAP
from tools.tests import test_known, test_name_known, Test
from tools.targets import TARGET_NAMES
from tools.utils import argparse_filestring_type, argparse_many, args_error
from tools.utils import argparse_filestring_type, argparse_profile_filestring_type, argparse_many, args_error
from tools.utils import argparse_force_lowercase_type
from tools.utils import argparse_force_uppercase_type
from tools.utils import print_large_string
from tools.project_api import export_project, get_exporter_toolchain
from tools.options import extract_profile
from tools.options import extract_profile, list_profiles
def setup_project(ide, target, program=None, source_dir=None, build=None, export_path=None):
"""Generate a name, if not provided, and find dependencies
@ -172,10 +171,11 @@ def main():
dest="macros",
help="Add a macro definition")
parser.add_argument("--profile",
type=argparse_filestring_type,
default=[],
help="Toolchain profile")
parser.add_argument("--profile", dest="profile", action="append",
type=argparse_profile_filestring_type,
help="Build profile to use. Can be either path to json" \
"file or one of the default one ({})".format(", ".join(list_profiles())),
default=[])
parser.add_argument("--update-packs",
dest="update_packs",