瀏覽代碼

tools: Force the order of cmake generators

Roland Dobai 6 年之前
父節點
當前提交
0f191c3366
共有 1 個文件被更改,包括 7 次插入6 次删除
  1. 7 6
      tools/idf_py_actions/constants.py

+ 7 - 6
tools/idf_py_actions/constants.py

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