Merge branch 'main' of github.com:ZephyrCodesStuff/logparser

Author: ZephyrCodesStuff

.github/workflows/ci.yml

@@ -42,27 +42,22 @@ jobs:
       - name: Checkout repository (uses git)
         uses: actions/checkout@v4
 
-      - name: Configure with CMake (Windows, use preinstalled GCC)
+      - name: Configure with CMake (Windows, MSVC)
         if: matrix.name == 'windows-x86_64'
         shell: pwsh
         run: |
-          Write-Host "Configuring with preinstalled GCC and Ninja on Windows"
-          # build argument array: basic args
-          $args = @('-S', 'parsers/cpp', '-B', 'build', '-G', 'Ninja')
-          # append environment CMAKE_* defs
+          Write-Host "Configuring with Visual Studio 2022 (MSVC) on Windows"
+          $args = @('-S', 'parsers/cpp', '-B', 'build', '-G', 'Visual Studio 17 2022', '-A', 'x64')
           Get-ChildItem env:CMAKE_* | ForEach-Object { $args += "-D$($_.Name)=$($_.Value)" }
-          # set compilers explicitly to the preinstalled gcc/g++
-          $args += '-DCMAKE_C_COMPILER=gcc'
-          $args += '-DCMAKE_CXX_COMPILER=g++'
           Write-Host "Running: cmake $($args -join ' ')"
           & cmake @args
 
-      - name: Build (Windows using preinstalled GCC/Ninja)
+      - name: Build (Windows with MSVC)
         if: matrix.name == 'windows-x86_64'
         shell: pwsh
         run: |
-          Write-Host "Building with Ninja using preinstalled GCC"
-          cmake --build build --parallel
+          Write-Host "Building with MSVC using CMake"
+          cmake --build build --config Release --parallel
 
       - name: Configure with CMake (macOS/Linux)
         if: matrix.name != 'windows-x86_64'

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2025 zeph
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

parsers/cpp/CMakeLists.txt

@@ -1,6 +1,14 @@
 cmake_minimum_required(VERSION 2.8.12...3.15)
 project(logfile_parser_cpp LANGUAGES CXX)
 
+# Use the static runtime on MSVC so the produced binaries do not depend on the
+# redistributable DLLs. This also matches the statically built ANTLR runtime.
+if(MSVC)
+    set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+endif()
+
+set(_antlr_runtime_is_static OFF)
+
 # Prefer a known Homebrew install or project-local jar if present
 if(NOT ANTLR_EXECUTABLE)
     if(EXISTS "/opt/homebrew/Cellar/antlr/4.13.2/antlr-4.13.2-complete.jar")
@@ -24,19 +32,30 @@ if(NOT TARGET ANTLR4::Runtime AND NOT TARGET ANTLR::Runtime)
 
     include(FetchContent)
 
+    # Ensure the fetched ANTLR runtime is built statically. This keeps the
+    # Windows binary self-contained and avoids shipping libantlr4 DLLs.
+    set(ANTLR4_BUILD_SHARED OFF CACHE BOOL "Build ANTLR4 shared runtime" FORCE)
+    set(ANTLR4_BUILD_STATIC ON CACHE BOOL "Build ANTLR4 static runtime" FORCE)
+    set(ANTLR4_INSTALL OFF CACHE BOOL "Skip installing ANTLR4 runtime" FORCE)
+    if(MSVC)
+        set(ANTLR4_WITH_STATIC_CRT ON CACHE BOOL "Link ANTLR4 runtime against the static Microsoft CRT" FORCE)
+    endif()
+
     # Only fetch/build if we don't already have runtime variables pointing to a prebuilt lib.
     if(NOT DEFINED ANTLR_RUNTIME_LIBRARY AND NOT DEFINED ANTLR_LIBRARY)
         message(STATUS "Attempting to FetchContent antlr/antlr4 to build the C++ runtime")
 
+        # Define the ANTLR 4 branch / commit hash
+        set(ANTLR4_TAG bd8f9930d053ec6a83e7d751e8c6f69138957665)
+
         FetchContent_Declare(
             antlr4
             GIT_REPOSITORY https://github.com/antlr/antlr4.git
-            # Pin to a compatible version (change tag if you want a different release)
-            GIT_TAG 4.13.2
+            GIT_TAG ${ANTLR4_TAG} # dev as of 2025-10-16
         )
 
-    # This will clone into the build directory and make antlr4_SOURCE_DIR available.
-    FetchContent_MakeAvailable(antlr4)
+        # This will clone into the build directory and make antlr4_SOURCE_DIR available.
+        FetchContent_MakeAvailable(antlr4)
 
         # Make ANTLR CMake helper macros discoverable if provided by the fetched source.
         if(DEFINED antlr4_SOURCE_DIR)
@@ -70,19 +89,20 @@ if(NOT TARGET ANTLR4::Runtime AND NOT TARGET ANTLR::Runtime)
         endif()
 
         # Create alias targets matching common Find module conventions so existing code can link unchanged.
-        if(TARGET antlr4_shared)
+        if(TARGET antlr4_static)
             if(NOT TARGET ANTLR4::Runtime)
-                add_library(ANTLR4::Runtime ALIAS antlr4_shared)
+                add_library(ANTLR4::Runtime ALIAS antlr4_static)
             endif()
             if(NOT TARGET ANTLR::Runtime)
-                add_library(ANTLR::Runtime ALIAS antlr4_shared)
+                add_library(ANTLR::Runtime ALIAS antlr4_static)
             endif()
-        elseif(TARGET antlr4_static)
+            set(_antlr_runtime_is_static ON)
+        elseif(TARGET antlr4_shared)
             if(NOT TARGET ANTLR4::Runtime)
-                add_library(ANTLR4::Runtime ALIAS antlr4_static)
+                add_library(ANTLR4::Runtime ALIAS antlr4_shared)
             endif()
             if(NOT TARGET ANTLR::Runtime)
-                add_library(ANTLR::Runtime ALIAS antlr4_static)
+                add_library(ANTLR::Runtime ALIAS antlr4_shared)
             endif()
         else()
             message(STATUS "FetchContent provided antlr4 but runtime targets not found; will try bundled runtime or Find module variables")
@@ -109,6 +129,11 @@ set_target_properties(logparser PROPERTIES
     CXX_EXTENSIONS NO
 )
 
+# For Windows, we have to define `NOMINMAX` to prevent Windows headers from defining `min` and `max` macros.
+if(MSVC)
+    target_compile_definitions(logparser PRIVATE NOMINMAX)
+endif()
+
 # Link to the ANTLR runtime. Support several possible Find module conventions.
 if(TARGET ANTLR4::Runtime)
     target_link_libraries(logparser PRIVATE ANTLR4::Runtime)
@@ -122,6 +147,10 @@ else()
     message(FATAL_ERROR "ANTLR runtime target or variables not found. Verify FindANTLR.cmake")
 endif()
 
+if(_antlr_runtime_is_static)
+    target_compile_definitions(logparser PRIVATE ANTLR4CPP_STATIC)
+endif()
+
 # Add include directories if the find module provided them
 if(DEFINED ANTLR_RUNTIME_INCLUDE_DIR)
     target_include_directories(logparser PRIVATE ${ANTLR_RUNTIME_INCLUDE_DIR})

parsers/cpp/main.cpp

@@ -286,7 +286,7 @@ bool parse_file_into_csv( const fs::path& input_file,
     if ( !fs::exists( input_file ) )
     {
         std::cerr << "File not found: " << input_file << '\n';
-        return 2;
+        return false;
     }
 
     // read file into memory via mmap