spadix-cli 0.7.5__py3-none-any.whl → 0.7.6__py3-none-any.whl

spadix_cli/__init__.py

@@ -27,7 +27,7 @@ from sys import stderr
 
 from lark import Lark, Transformer, v_args
 
-__version__ = '0.7.5'
+__version__ = '0.7.6'
 
 ###############################################################################
 USAGE = """
@@ -40,10 +40,11 @@ spadix [Global options] [command] [command options] ...
 
 [Global options]
 --version  : Print spadix\' version and exit`
---no-console  : Don't use the default console mode: `--event-handlers console_direct+`
+--no-console  : Don't use the default console mode: `--event-handlers console_cohesion+`
 --no-root-check  : Don't check that spadix being started from the root of a git project
 --dry-run  : Don't run `colcon` command, instead print the command line and exit
 --ninja    : Use Ninja during the build. Ignored if it's not a build
+--non-ninja  : Do not use Ninja (overrides default on non-Windows)
 
 Commands:
 clean  :Clean all packages (`rm -rf log install build`)
@@ -248,7 +249,7 @@ class command_line_parser:
         self.dry_run = False
         self.is_test = False
         self.is_parallel_overridden = False
-        self.use_ninja = False
+        self.use_ninja = not is_windows()
 
     ###########################################################################
     # Extract global options form the provided arguments
@@ -268,6 +269,8 @@ class command_line_parser:
                         self.dry_run = True
                     elif arg == '--ninja':
                         self.use_ninja = True
+                    elif arg == '--non-ninja':
+                        self.use_ninja = False
                     else:
                         self.cmd_line.append(arg)
                 else:
@@ -279,7 +282,7 @@ class command_line_parser:
             self.cmd_line.append('--merge-install')
         if not self.no_console:
             self.cmd_line.append('--event-handlers')
-            self.cmd_line.append('console_direct+')
+            self.cmd_line.append('console_cohesion+')
 
     ###########################################################################
     def parse_package_list(self, list_string):
@@ -315,6 +318,7 @@ class command_line_parser:
         if self.use_ninja:
             cmake_args.append(" -GNinja")
 
+        user_set_cmake_build_type = False
         is_debug = False
         if is_windows():
             is_debug = True
@@ -333,6 +337,11 @@ class command_line_parser:
                 elif arg == '--cmake-args':
                     expect_cmake_args = True
                     continue
+                elif arg.startswith('-D'):
+                    cmake_args.append(' ' + arg)
+                    if 'CMAKE_BUILD_TYPE' in arg:
+                        user_set_cmake_build_type = True
+                    continue
                 elif arg == '--build-base':
                     self.cmd_line.append(arg)
                     expect_BUILD_BASE = True
@@ -530,10 +539,12 @@ class command_line_parser:
                     self.cmd_line.append(arg)
 
         if self.is_build:
-            if is_debug:
-                cmake_args.append(' -DCMAKE_BUILD_TYPE=Debug')
-            else:
-                cmake_args.append(' -DCMAKE_BUILD_TYPE=Release')
+            if not user_set_cmake_build_type and not any(
+                    'CMAKE_BUILD_TYPE' in a for a in cmake_args):
+                if is_debug:
+                    cmake_args.append(' -DCMAKE_BUILD_TYPE=Debug')
+                else:
+                    cmake_args.append(' -DCMAKE_BUILD_TYPE=RelWithDebInfo')
 
             if len(cmake_args) > 1:
                 self.cmd_line.extend(cmake_args)

{spadix_cli-0.7.5.dist-info → spadix_cli-0.7.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: spadix-cli
-Version: 0.7.5
+Version: 0.7.6
 Summary: A friendly wrapper for colcon
 Home-page: https://pronto.ai
 Author: Serge Nikulin
@@ -34,6 +34,7 @@ Dynamic: summary
 # Spadix, a friendly wrapper for `colcon`
 
 Copyright (C) 2021-2024 SafeAI
+
 Copyright (C) 2025 Pronto.AI
 
 ## Why?
@@ -64,9 +65,11 @@ Usage:
 spadix [Global options] [command] [command options] ...
 
 [Global options]
---no-merge  : Don't use --merge-install option for colcon
---no-console  : Don't use the default console mode: `--event-handlers console_direct+`
---no-root-check  : Don't check that spadix being started from the root of a git project
+--no-merge  : Do not use --merge-install option for colcon
+--no-console  : Do not use the default console mode: `--event-handlers console_cohesion+`
+--no-root-check  : Do not check that spadix being started from the root of a git project
+--ninja  : Use Ninja for building when available
+--non-ninja  : Do not use Ninja for building, even if it is available
 
 Commands:
 clean  :Clean all projects (essentially executes `rm -rf log install build`)

spadix_cli-0.7.6.dist-info/RECORD

@@ -0,0 +1,8 @@
+spadix_cli/__init__.py,sha256=duX95POquKI0o8ZScCQ0dIbhM1ixPPK_MdpO-8lKX18,24699
+spadix_cli/__main__.py,sha256=7uY4Swdt6Tv6oFGnYjpa15qrtmwhSt4d6y-UqNefM2U,759
+spadix_cli-0.7.6.dist-info/licenses/LICENSE,sha256=AU8-aFax2NopH_n1ja1fXDdqCOJWpuASgSgOIm5Z55w,1083
+spadix_cli-0.7.6.dist-info/METADATA,sha256=DkMfMIYahq6OabhcWtx3gWhtX9RiUBFcVKLEL42uis0,3138
+spadix_cli-0.7.6.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+spadix_cli-0.7.6.dist-info/entry_points.txt,sha256=oUDP6DnZCF5Ynkmodv1uKAoWK_uFmly093arRd7H3f0,52
+spadix_cli-0.7.6.dist-info/top_level.txt,sha256=2nIIYCRacGMBV3v38jf8tNUxx52VlCJSoklnyuF2H5A,11
+spadix_cli-0.7.6.dist-info/RECORD,,

spadix_cli-0.7.5.dist-info/RECORD

@@ -1,8 +0,0 @@
-spadix_cli/__init__.py,sha256=UMk1gTnCyZurMxphhbIFtTzCawgwL94i1YIFe4qjPZk,24106
-spadix_cli/__main__.py,sha256=7uY4Swdt6Tv6oFGnYjpa15qrtmwhSt4d6y-UqNefM2U,759
-spadix_cli-0.7.5.dist-info/licenses/LICENSE,sha256=AU8-aFax2NopH_n1ja1fXDdqCOJWpuASgSgOIm5Z55w,1083
-spadix_cli-0.7.5.dist-info/METADATA,sha256=UUBy1_Cs35RF06VEqv-O1zDAXRV9ySeJqcxtPLbHvt4,3010
-spadix_cli-0.7.5.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-spadix_cli-0.7.5.dist-info/entry_points.txt,sha256=oUDP6DnZCF5Ynkmodv1uKAoWK_uFmly093arRd7H3f0,52
-spadix_cli-0.7.5.dist-info/top_level.txt,sha256=2nIIYCRacGMBV3v38jf8tNUxx52VlCJSoklnyuF2H5A,11
-spadix_cli-0.7.5.dist-info/RECORD,,