C++ Structure update

Author: Voyrox

.github/workflows/cpp.yml

@@ -0,0 +1,33 @@
+name: C++ CI
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Cache CMake build directory
+        uses: actions/cache@v3
+        with:
+          path: |
+            src/build
+          key: ${{ runner.os }}-cmake-${{ hashFiles('src/CMakeLists.txt') }}-${{ hashFiles('src/src/**', 'src/include/**') }}
+          restore-keys: |
+            ${{ runner.os }}-cmake-
+
+      - name: Configure
+        run: cmake -S src -B src/build -DCMAKE_BUILD_TYPE=Release
+
+      - name: Build
+        run: cmake --build src/build --config Release

.github/workflows/zig.yml

@@ -24,12 +24,11 @@ test/test.o
 test/stack.yaml.lock
 test/app/test.exe
 
-.zig-cache/
-zig-out/
+src/build/
 test/Haskell/app/test.exe
 test/Haskell/app/test.hi
 test/Haskell/app/test.o
 test/Haskell/app/test
 
 test/NodeJS/node_modules/
-test/NodeJS/package-lock.json
+test/NodeJS/package-lock.json

.gitignore

@@ -1,50 +1,33 @@
-ZIG ?= zig
-OPT ?= ReleaseFast
-WINDOWS_TARGET ?= x86_64-windows-gnu
+BUILD_DIR ?= src/build
+PREFIX ?= /usr/local
+CMAKE ?= cmake
+CMAKE_BUILD_TYPE ?= Release
+ARGS ?=
 
-ifeq ($(OS),Windows_NT)
-  HOST_OS := Windows
-else
-  HOST_OS := $(shell uname -s 2>/dev/null)
-endif
-
-ifeq ($(HOST_OS),Windows)
-  DEFAULT_PREFIX ?= $(LOCALAPPDATA)/Programs/zippy
-else
-  DEFAULT_PREFIX ?= /usr/local
-endif
-
-PREFIX ?= $(DEFAULT_PREFIX)
-PREFIX_FLAG = $(if $(PREFIX),-p $(PREFIX),)
-
-.PHONY: build build-linux build-windows install clean help
+.PHONY: build run install clean help
 
 build:
-	$(ZIG) build -Doptimize=$(OPT)
-
-build-linux: build
+	$(CMAKE) -S src -B $(BUILD_DIR) -DCMAKE_BUILD_TYPE=$(CMAKE_BUILD_TYPE)
+	$(CMAKE) --build $(BUILD_DIR)
 
-build-windows:
-	$(ZIG) build -Doptimize=$(OPT) -Dtarget=$(WINDOWS_TARGET)
+run: build
+	$(BUILD_DIR)/zippy $(ARGS)
 
-install:
-	$(ZIG) build -Doptimize=$(OPT) install $(PREFIX_FLAG)
-	@echo "Installed to $(PREFIX)/bin (ensure this is on PATH)."
-	@if [ "$(HOST_OS)" = "Windows" ]; then \
-	  printf "Add to PATH (PowerShell): [Environment]::SetEnvironmentVariable(\"Path\", \"%s;$(PREFIX)/bin\", \"User\")\n" "$$(powershell -NoProfile -Command "[Environment]::GetEnvironmentVariable('Path','User')")"; \
-	else \
-	  echo "Add to PATH (bash): export PATH=\"$(PREFIX)/bin:\$$PATH\""; \
-	fi
+install: build
+	install -d $(PREFIX)/bin
+	install $(BUILD_DIR)/zippy $(PREFIX)/bin/zippy
+	@echo "Installed to $(PREFIX)/bin/zippy"
+	@echo "Add to PATH (bash): export PATH=\"$(PREFIX)/bin:\$$PATH\""
 
 clean:
-	$(ZIG) build --clean
+	rm -rf $(BUILD_DIR)
 
 help:
 	@echo "Targets:"
-	@echo "  build           Build for host (Arch/Linux)"
-	@echo "  build-windows   Cross-compile for Windows (x86_64)"
-	@echo "  install         Install to host-appropriate prefix (override with PREFIX)"
-	@echo "  clean           Remove build artifacts"
+	@echo "  build           Configure and build the C++ src in src/"
+	@echo "  run             Build and run locally (set ARGS=\"./path\")"
+	@echo "  install         Install to PREFIX/bin (default: /usr/local/bin)"
+	@echo "  clean           Remove the CMake build directory"
 	@echo "  help            Show this message"
 	@echo
-	@echo "Vars: ZIG, OPT (Debug/ReleaseSafe/ReleaseFast/ReleaseSmall), WINDOWS_TARGET, PREFIX"
+	@echo "Vars: CMAKE, BUILD_DIR, CMAKE_BUILD_TYPE, PREFIX, ARGS"

Makefile

@@ -1,19 +1,23 @@
-# Zippy: A file-watching CLI for faster edit–build–run loops
+# Zippy: A file-watching CLI for faster edit-build-run loops
 
-Zippy is a lightweight CLI that watches a file or directory and reruns your command the moment you save. It keeps your stdout clean, logs to stderr with levels, and stays out of your way during the edit–build–run loop.
+Zippy is a lightweight Linux CLI that watches a file or directory and reruns your command the moment you save. It’s ideal for C++ development, letting you see the impact of your changes immediately without waiting for a full build.
 
 ## Quick start
 
 ```bash
-# Run from source (Linux/Arch):
+# Build from source
 make build
-zig build run -- path/to/file-or-dir
+
+# Run from the local build
+./src/build/zippy ./path/to/file-or-dir
 
 # Install it globally
-sudo make install                   # /usr/local on Linux | %LOCALAPPDATA%/Programs/zippy on Windows
-sudo make install PREFIX=$HOME/.local  # user-local
+sudo make install
+
+# Or install for your user only
+make install PREFIX=$HOME/.local
 
-# Run zippy!
+# Run zippy after install
 zippy ./path
 ```
 
@@ -26,50 +30,52 @@ Zippy loads `Zippy.json` from the current working directory:
   "delay": 1000000,
   "ignore": [],
   "save_log": false,
+  "log_path": "zippy.log",
   "cmd": "make && ./build/out"
-  // OR
-  "cmd": "node index.js"
 }
 ```
 
-- `delay` (microseconds): debounce between change checks (default: 1_000_000).
-- `ignore`: reserved for future ignore patterns.
-- `cmd`: command to execute when changes occur. Placeholders: `{file}` (changed file or watched dir), `{dir}` (watched directory).
-- `save_log` (bool): when true, also write logs to `log_path` (default: `false`).
-- `log_path` (string): path to the log file when `save_log` is true (default: `zippy.log`).
-  When `save_log=true`, child command stdout/stderr is tee’d into the same log.
+- `delay` (microseconds): debounce between checks. Default: `1000000`.
+- `ignore`: parsed for compatibility and future use; currently not applied.
+- `cmd`: command to run when a change is detected. Placeholders: `{file}` and `{dir}`.
+- `save_log`: when `true`, append Zippy logs and child output to `log_path`.
+- `log_path`: log file path used when `save_log=true`. Default: `zippy.log`.
 
-Generate a starter config: `zippy --generate`.
+Generate a starter config with `zippy --generate`.
 
 ## CLI commands
 
 - `--help` show help
 - `--version` print version
-- `--commands` list commands
-- `--config` show config help
-- `--log` print the configured log file (when `save_log=true`; includes child output)
-- `--clear` truncate the configured log file (when `save_log=true`)
+- `--config` print the active config summary
+- `--log` print the configured log file when `save_log=true`
+- `--clear` truncate the configured log file when `save_log=true`
 - `--credits` show credits
 - `--generate` write `Zippy.json`
 
 ## Example session
 
 ```text
-2026-02-06 16:22:11.104 [INFO] Zippy Starting Zippy v1.3.0
-2026-02-06 16:22:11.105 [INFO] Zippy Watching: /home/user/project/src
-2026-02-06 16:22:13.412 [INFO] Zippy Running: make && ./build/out
-2026-02-06 16:22:17.998 [WARN] Zippy File changed; re-running command…
+2026-03-11 12:45:28.038 [INFO] zippy Starting Zippy v1.3.0
+2026-03-11 12:45:28.039 [INFO] zippy Watching file: /home/user/project/src/main.cpp
+2026-03-11 12:45:29.201 [INFO] zippy Running: make && ./build/out
+2026-03-11 12:45:33.812 [WARN] zippy File changed; re-running command...
 Your program output here...
 ```
 
-## Build & install
+## Build and install
+
+Prereqs:
+
+- CMake 3.16+
+- A C++20 compiler such as GCC or Clang
+- Linux or a Linux-compatible environment
+
+Commands:
 
-Prereqs: Zig 0.15.2+
+- `make build` configures and builds `src/`
+- `make run ARGS="./path"` runs the local build
+- `make install PREFIX=/path` installs `zippy` into `PREFIX/bin`
+- `make clean` removes the CMake build directory
 
-- Linux/Arch (native):
-  - `make build`
-  - `sudo make install` (defaults to `/usr/local`; override with `PREFIX=/path`)
-- Windows cross (from Linux host):
-  - `make build-windows`
-  - `make install PREFIX="$LOCALAPPDATA/Programs/zippy"`
-- Add `$(PREFIX)/bin` to your `PATH` if it isn’t already.
+After install, ensure `PREFIX/bin` is on your `PATH`.