uv2compdb 0.5.0__tar.gz → 0.5.1__tar.gz

{uv2compdb-0.5.0 → uv2compdb-0.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: uv2compdb
-Version: 0.5.0
+Version: 0.5.1
 Summary: Generate Compilation Database by parse Keil µVision project
 Keywords: keil,MDK,µVision,clangd,Compilation Database,compiled_commands.json
 Author: xbin

{uv2compdb-0.5.0 → uv2compdb-0.5.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "uv2compdb"
-version = "0.5.0"
+version = "0.5.1"
 description = "Generate Compilation Database by parse Keil µVision project"
 readme = "README.md"
 authors = [{ name = "xbin", email = "xbin.xu@qq.com" }]

{uv2compdb-0.5.0 → uv2compdb-0.5.1}/src/uv2compdb/main.py

@@ -2,12 +2,13 @@
 Generate Compilation Database by parse Keil µVision project.
 """
 
+import shlex
 import logging
 import argparse
 from pathlib import Path
 from importlib.metadata import version
 
-from uv2compdb.parser import UV2CompDB, split_and_strip, generate_compile_commands
+from uv2compdb.parser import UV2CompDB, generate_compile_commands
 
 __version__ = version("uv2compdb")
 logger = logging.getLogger(__name__)
@@ -80,7 +81,7 @@ def main() -> int:
         target_setting = uv2compdb.parse(args.target, args.build)
         command_objects = uv2compdb.generate_command_objects(
             target_setting,
-            split_and_strip(args.arguments, delimiter=" ") if args.arguments else [],
+            shlex.split(args.arguments) if args.arguments else [],
             args.predefined,
         )
         if not generate_compile_commands(command_objects, args.output):

{uv2compdb-0.5.0 → uv2compdb-0.5.1}/src/uv2compdb/parser.py

@@ -234,8 +234,15 @@ class UV2CompDB:
         if not (uv4_path := shutil.which("uv4")):
             return False
 
-        cmd = f"{uv4_path} -b -t {target_name} {self.project_path.resolve().as_posix()} -j0"
-        logger.info(f"Run: `{cmd}`")
+        cmd = [
+            uv4_path,
+            "-b",
+            "-t",
+            target_name,
+            self.project_path.resolve().as_posix(),
+            "-j0",
+        ]
+        logger.info(f"Run: `{subprocess.list2cmdline(cmd)}`")
         try:
             result = subprocess.run(cmd, capture_output=True, text=True)
             logger.info(
@@ -448,16 +455,18 @@ class UV2CompDB:
 
     @staticmethod
     @lru_cache(maxsize=32)
-    def _get_predefined_macros_cached(compiler: str, args_str: str) -> tuple[str, ...]:
+    def _get_predefined_macros_cached(
+        compiler: str, args: tuple[str, ...]
+    ) -> tuple[str, ...]:
         """Get predefined macros from compiler with caching."""
         if "armcc" in compiler.lower():
-            cmd = f"{compiler} {args_str} --list_macros"
+            cmd = [compiler, *args, "--list_macros"]
         elif "armclang" in compiler.lower():
-            cmd = f"{compiler} {args_str} --target=arm-arm-none-eabi -dM -E -"
+            cmd = [compiler, *args, "--target=arm-arm-none-eabi", "-dM", "-E", "-"]
         else:
             return ()
 
-        logger.info(f"Get predefined macro by: `{cmd}`")
+        logger.info(f"Get predefined macro by: `{subprocess.list2cmdline(cmd)}`")
         try:
             result = subprocess.run(cmd, capture_output=True, text=True, input="")
             if result.returncode != 0:
@@ -509,9 +518,7 @@ class UV2CompDB:
                 next(args_iter, None)
 
         return list(
-            self._get_predefined_macros_cached(
-                toolchain.compiler, " ".join(filtered_args)
-            )
+            self._get_predefined_macros_cached(toolchain.compiler, tuple(filtered_args))
         )
 
     def filter_unknown_argument(