Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'bugfix/cmake_generators' into 'master'

Browse source 
tools: Force the order of cmake generators

Closes IDF-1444

See merge request espressif/esp-idf!7836
This commit is contained in:
Ivan Grokhotkov 2020-03-03 18:33:30 +08:00
parent 54d7001654 2d97209475
commit 39aad6e9f7
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
tools/idf_py_actions/constants.py
View file

@ -1,3 +1,4 @@
import collections
import multiprocessing import multiprocessing
import os import os
import platform import platform
@ -16,23 +17,23 @@ else:
MAKE_CMD = "make" MAKE_CMD = "make"
MAKE_GENERATOR = "Unix Makefiles" MAKE_GENERATOR = "Unix Makefiles"
GENERATORS = { GENERATORS = collections.OrderedDict([
# - command: build command line # - command: build command line
# - version: version command line # - version: version command line
# - dry_run: command to run in dry run mode # - dry_run: command to run in dry run mode
# - verbose_flag: verbose flag # - verbose_flag: verbose flag
"Ninja": { ("Ninja", {
"command": ["ninja"], "command": ["ninja"],
"version": ["ninja", "--version"], "version": ["ninja", "--version"],
"dry_run": ["ninja", "-n"], "dry_run": ["ninja", "-n"],
"verbose_flag": "-v" "verbose_flag": "-v"
}, }),
MAKE_GENERATOR: { (MAKE_GENERATOR, {
"command": [MAKE_CMD, "-j", str(multiprocessing.cpu_count() + 2)], "command": [MAKE_CMD, "-j", str(multiprocessing.cpu_count() + 2)],
"version": [MAKE_CMD, "--version"], "version": [MAKE_CMD, "--version"],
"dry_run": [MAKE_CMD, "-n"], "dry_run": [MAKE_CMD, "-n"],
"verbose_flag": "VERBOSE=1", "verbose_flag": "VERBOSE=1",
} })
} ])
SUPPORTED_TARGETS = ["esp32", "esp32s2"] SUPPORTED_TARGETS = ["esp32", "esp32s2"]