Set Ninja as default build tool and add --make flag to switch back (nasa#260)

* Set Ninja as default for fprime-util generate

* Apply black formatter

* fix argument for Ninja being the default

Author: rmzmrnn

.github/workflows/integration-tests.yml

@@ -40,18 +40,18 @@ jobs:
       - name: Test generation and building on Ref
         working-directory: fprime/Ref
         run: |
-          fprime-util generate
+          fprime-util generate --make
           fprime-util build
           fprime-util hash-to-file 0x72ad3277
       - name: Test generation and building on Ref with Ninja
         working-directory: fprime/Ref
         run: |
-          fprime-util generate --ninja --build-cache ./build-ninja
+          fprime-util generate --build-cache ./build-ninja
           fprime-util build --build-cache ./build-ninja
           fprime-util hash-to-file 0x72ad3277 --build-cache ./build-ninja
       - name: Test special generation on Ref
         working-directory: fprime/Ref
         run: |
-          fprime-util generate --build-cache ./special-cache --ut -DFPRIME_ENABLE_AUTOCODER_UTS=OFF
+          fprime-util generate --make --build-cache ./special-cache --ut -DFPRIME_ENABLE_AUTOCODER_UTS=OFF
           fprime-util build --build-cache ./special-cache
           fprime-util hash-to-file 0x2ed4bda6 --build-cache ./special-cache

src/fprime/fbuild/cli.py

@@ -1,4 +1,4 @@
-""" fprime.fbuild.cli: fbuild command line processing
+"""fprime.fbuild.cli: fbuild command line processing
 
 Command line processing functions for fbuild (fprime build system targets) of "generate", "purge", and build system
 target operations.
@@ -64,8 +64,14 @@ def run_fbuild_cli(
             cmake_args["ENABLE_SANITIZER_UNDEFINED_BEHAVIOR"] = "OFF"
         if toolchain is not None:
             cmake_args["CMAKE_TOOLCHAIN_FILE"] = toolchain
-        if parsed.ninja:
+
+        if parsed.make:
+            # No need to change CMAKE_GENERATOR since the default is Unix Makefiles
+            pass
+        else:
+            # Sets Ninja as the default build system
             cmake_args["CMAKE_GENERATOR"] = "Ninja"
+
         build.generate(cmake_args)
     elif parsed.command == "purge":
         # Since purge does not load its "base", we need to overload the platform
@@ -248,9 +254,9 @@ def add_special_targets(
         action="store_true",
     )
     generate_parser.add_argument(
-        "--ninja",
+        "--make",
         action="store_true",
-        help="Use the Ninja build system instead of Unix Makefiles",
+        help="Use the Unix Makefiles build system instead of Ninja",
     )
     # The following option is specified only to show up in --help.
     # It is not handled by argparse, but in fprime.util.cli:validate()