Added CMake stuff to the venv (#298)

Author: bjackson312006

dev/Dockerfile

@@ -42,12 +42,11 @@ RUN echo "source /home/dev/scripts/alias.sh" >> ~/.bashrc
 RUN ln -sf /usr/lib/linux-tools-*/* /usr/bin/
 
 # Install cross compiler
-RUN wget -qO- https://developer.arm.com/-/media/Files/downloads/gnu-rm/10.3-2021.10/gcc-arm-none-eabi-10.3-2021.10-x86_64-linux.tar.bz2 | tar -xvj
+RUN wget -qO- https://developer.arm.com/-/media/Files/downloads/gnu/11.3.rel1/binrel/arm-gnu-toolchain-11.3.rel1-x86_64-arm-none-eabi.tar.xz | tar -xJv
 
-ENV PATH $PATH:/home/dev/gcc-arm-none-eabi-10.3-2021.10/bin
+ENV PATH $PATH:/home/dev/arm-gnu-toolchain-11.3.rel1-x86_64-arm-none-eabi/bin
 
 WORKDIR /home/app
 
 # Set up safe directory
 RUN git config --global --add safe.directory /home/app
-

ner_environment/build_system/build_system.py

@@ -47,15 +47,23 @@ def unsupported_option_cb(value:bool):
 # Build command
 # ==============================================================================
 
-@app.command(help="Build the project with GCC ARM Toolchain and Make")
+@app.command(help="Build the project with GCC ARM Toolchain and Make/CMake")
 def build(profile: str = typer.Option(None, "--profile", "-p", callback=unsupported_option_cb, help="(planned) Specify the build profile (e.g., debug, release)", show_default=True),
           clean: bool = typer.Option(False, "--clean", help="Clean the build directory before building", show_default=True)):
-
-    if clean:
-        command = ["docker", "compose", "run", "--rm", "ner-gcc-arm", "make", "clean"]
-    else:
-        command = ["docker", "compose", "run", "--rm", "ner-gcc-arm", "make", f"-j{os.cpu_count()}"]
-    run_command(command, stream_output=True)
+    is_cmake = os.path.exists("CMakeLists.txt")
+    if is_cmake: # Repo uses CMake, so execute CMake commands.
+        print("[#cccccc](ner build):[/#cccccc] [blue]CMake-based project detected.[/blue]")
+        if clean:
+            run_command_docker('cmake --build build --target clean ; find . -type d -name "build" -exec rm -rf {} +')
+            print("[#cccccc](ner build):[/#cccccc] [green]Ran build-cleaning command.[/green]")
+        else:
+            run_command_docker("mkdir -p build && cd build && cmake -DCMAKE_BUILD_TYPE=Release .. && cmake --build .", stream_output=True)
+    else: # Repo uses Make, so execute Make commands.
+        print("[#cccccc](ner build):[/#cccccc] [blue]Makefile-based project detected.[/blue]")
+        if clean:
+            run_command_docker("make clean", stream_output=True)
+        else:
+            run_command_docker(f"make -j{os.cpu_count()}", stream_output=True)
 
 # ==============================================================================
 # Clang command
@@ -333,13 +341,20 @@ def run_command(command, stream_output=False, exit_on_fail=True):
     else:
         try:
             result = subprocess.run(command, check=True, capture_output=True, text=True)
-            print(result.stdout)
+            if result.stdout and result.stdout.strip():  # Only print if stdout is not empty or just whitespace
+                print(result.stdout)
         except subprocess.CalledProcessError as e:
             print(f"Error occurred: {e}", file=sys.stderr)
             print(e.stderr, file=sys.stderr)
             if exit_on_fail:
                 sys.exit(e.returncode)
 
+def run_command_docker(command, stream_output=False):
+    """Run a command in the Docker container."""
+    docker_command = ["docker", "compose", "run", "--rm", "ner-gcc-arm", "sh", "-c", command]
+    print(f"[bold blue](ner-gcc-arm): Running command '{command}' in Docker container.")
+    run_command(docker_command, stream_output=stream_output, exit_on_fail=True)
+
 def disconnect_usbip():
     """Disconnect the current USB device."""
     command = ["sudo", "usbip", "detach", "-p", "0"]