core: Move to hyprutils for util functions (#48)

* move to hyprutils * Nix: add hyprutils dep --------- Co-authored-by: Mihai Fufezan <[email protected]>
hyprwm · Jun 8, 2024 · ec6938c · ec6938c
1 parent 87d5d98
commit ec6938c
Show file tree

Hide file tree

Showing 8 changed files with 102 additions and 242 deletions.
diff --git a/.github/workflows/arch.yml b/.github/workflows/arch.yml
@@ -2,39 +2,6 @@ name: Build & Test (Arch)
 
 on: [push, pull_request, workflow_dispatch]
 jobs:
-  gcc:
-    name: "gcc build / clang test"
-    runs-on: ubuntu-latest
-    container:
-      image: archlinux
-    steps:
-      - name: Checkout repository actions
-        uses: actions/checkout@v4
-        with:
-          sparse-checkout: .github/actions
-
-      - name: Get required pkgs
-        run: |
-          sed -i 's/SigLevel    = Required DatabaseOptional/SigLevel    = Optional TrustAll/' /etc/pacman.conf
-          pacman --noconfirm --noprogressbar -Syyu
-          pacman --noconfirm --noprogressbar -Sy gcc base-devel cmake clang libc++
-
-      - name: Build hyprlang with gcc
-        run: |
-          CC="/usr/bin/gcc" CXX="/usr/bin/g++" cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX:PATH=/usr -S . -B ./build
-          CC="/usr/bin/gcc" CXX="/usr/bin/g++" cmake --build ./build --config Release --target hyprlang -j`nproc 2>/dev/null || getconf NPROCESSORS_CONF`
-          cmake --install ./build
-
-      - name: Build tests with clang
-        run: |
-          rm -rf ./build
-          CC="/usr/bin/clang" CXX="/usr/bin/clang++" cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_CXX_FLAGS="-stdlib=libc++" -S . -B ./build
-          CC="/usr/bin/clang" CXX="/usr/bin/clang++" cmake --build ./build --config Release --target tests -j`nproc 2>/dev/null || getconf NPROCESSORS_CONF`
-
-      - name: Run tests
-        run: |
-          cd ./build && ctest --output-on-failure
-
   asan:
     name: "gcc build / ASan tests"
     runs-on: ubuntu-latest
@@ -50,7 +17,11 @@ jobs:
         run: |
           sed -i 's/SigLevel    = Required DatabaseOptional/SigLevel    = Optional TrustAll/' /etc/pacman.conf
           pacman --noconfirm --noprogressbar -Syyu
-          pacman --noconfirm --noprogressbar -Sy gcc base-devel cmake clang
+          pacman --noconfirm --noprogressbar -Sy gcc base-devel cmake clang git
+
+      - name: Get hyprutils-git
+        run: |
+          git clone https://github.com/hyprwm/hyprutils && cd hyprutils && cmake -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX:PATH=/usr -B build && cmake --build build --target hyprutils && cmake --install build
 
       - name: Build with gcc
         run: |
@@ -77,7 +48,11 @@ jobs:
         run: |
           sed -i 's/SigLevel    = Required DatabaseOptional/SigLevel    = Optional TrustAll/' /etc/pacman.conf
           pacman --noconfirm --noprogressbar -Syyu
-          pacman --noconfirm --noprogressbar -Sy gcc base-devel cmake clang
+          pacman --noconfirm --noprogressbar -Sy gcc base-devel cmake clang git
+
+      - name: Get hyprutils-git
+        run: |
+          git clone https://github.com/hyprwm/hyprutils && cd hyprutils && cmake -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX:PATH=/usr -B build && cmake --build build --target hyprutils && cmake --install build
 
       - name: Build with gcc
         run: |
@@ -104,7 +79,11 @@ jobs:
         run: |
           sed -i 's/SigLevel    = Required DatabaseOptional/SigLevel    = Optional TrustAll/' /etc/pacman.conf
           pacman --noconfirm --noprogressbar -Syyu
-          pacman --noconfirm --noprogressbar -Sy gcc base-devel cmake clang
+          pacman --noconfirm --noprogressbar -Sy gcc base-devel cmake clang git
+
+      - name: Get hyprutils-git
+        run: |
+          git clone https://github.com/hyprwm/hyprutils && cd hyprutils && cmake -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX:PATH=/usr -B build && cmake --build build --target hyprutils && cmake --install build
 
       - name: Build with gcc
         run: |
@@ -131,7 +110,11 @@ jobs:
         run: |
           sed -i 's/SigLevel    = Required DatabaseOptional/SigLevel    = Optional TrustAll/' /etc/pacman.conf
           pacman --noconfirm --noprogressbar -Syyu
-          pacman --noconfirm --noprogressbar -Sy gcc base-devel cmake clang libc++
+          pacman --noconfirm --noprogressbar -Sy gcc base-devel cmake clang libc++ git
+
+      - name: Get hyprutils-git
+        run: |
+          git clone https://github.com/hyprwm/hyprutils && cd hyprutils && cmake -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX:PATH=/usr -B build && cmake --build build --target hyprutils && cmake --install build
 
       - name: Build hyprlang with clang
         run: |

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -28,6 +28,11 @@ add_compile_definitions(HYPRLANG_INTERNAL)
 
 set(CMAKE_CXX_STANDARD 23)
 
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(deps REQUIRED IMPORTED_TARGET
+    hyprutils>=0.1.1
+)
+
 file(GLOB_RECURSE SRCFILES CONFIGURE_DEPENDS "src/*.cpp" "include/hyprlang.hpp")
 
 add_library(hyprlang SHARED ${SRCFILES})
@@ -40,6 +45,8 @@ set_target_properties(hyprlang PROPERTIES
     SOVERSION 2
     PUBLIC_HEADER include/hyprlang.hpp)
 
+target_link_libraries(hyprlang PkgConfig::deps)
+
 if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     # for std::expected.
     # probably evil. Arch's clang is very outdated tho...
@@ -55,12 +62,12 @@ install(TARGETS hyprlang)
 add_custom_target(tests)
 
 add_executable(hyprlang_test "tests/parse/main.cpp")
-target_link_libraries(hyprlang_test PRIVATE hyprlang)
+target_link_libraries(hyprlang_test PRIVATE hyprlang hyprutils)
 add_test(NAME "Parsing" WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests COMMAND hyprlang_test "parse")
 add_dependencies(tests hyprlang_test)
 
 add_executable(hyprlang_fuzz "tests/fuzz/main.cpp")
-target_link_libraries(hyprlang_fuzz PRIVATE hyprlang)
+target_link_libraries(hyprlang_fuzz PRIVATE hyprlang hyprutils)
 add_test(NAME "Fuzz" WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests COMMAND hyprlang_fuzz "fuzz")
 add_dependencies(tests hyprlang_fuzz)
 

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -4,13 +4,20 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
     systems.url = "github:nix-systems/default-linux";
+
+    hyprutils = {
+      url = "github:hyprwm/hyprutils";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.systems.follows = "systems";
+    };
   };
 
   outputs = {
     self,
     nixpkgs,
     systems,
-  }: let
+    ...
+  } @ inputs: let
     inherit (nixpkgs) lib;
     eachSystem = lib.genAttrs (import systems);
     pkgsFor = eachSystem (system:
@@ -26,13 +33,16 @@
   in {
     overlays = {
       default = self.overlays.hyprlang;
-      hyprlang = final: prev: {
-        hyprlang = final.callPackage ./nix/default.nix {
-          stdenv = final.gcc13Stdenv;
-          version = "0.pre" + "+date=" + (mkDate (self.lastModifiedDate or "19700101")) + "_" + (self.shortRev or "dirty");
-        };
-        hyprlang-with-tests = final.hyprlang.override {doCheck = true;};
-      };
+      hyprlang = lib.composeManyExtensions [
+        inputs.hyprutils.overlays.default
+        (final: prev: {
+          hyprlang = final.callPackage ./nix/default.nix {
+            stdenv = final.gcc13Stdenv;
+            version = "0.pre" + "+date=" + (mkDate (self.lastModifiedDate or "19700101")) + "_" + (self.shortRev or "dirty");
+          };
+          hyprlang-with-tests = final.hyprlang.override {doCheck = true;};
+        })
+      ];
     };
 
     packages = eachSystem (system: {

diff --git a/nix/default.nix b/nix/default.nix
@@ -2,6 +2,8 @@
   lib,
   stdenv,
   cmake,
+  hyprutils,
+  pkg-config,
   version ? "git",
   doCheck ? false,
 }:
@@ -10,7 +12,12 @@ stdenv.mkDerivation {
   inherit version doCheck;
   src = ../.;
 
-  nativeBuildInputs = [cmake];
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ];
+
+  buildInputs = [hyprutils];
 
   outputs = ["out" "dev"];
 

diff --git a/src/VarList.cpp b/src/VarList.cpp
diff --git a/src/VarList.hpp b/src/VarList.hpp