Merge pull request #161 from horriblename/chores

horriblename · web-flow · commit 1535962f1575 · 2024-10-09T16:46:40.000+02:00
chore: update to hyprland 0.44.1 and standardize version number
diff --git a/VERSION b/VERSION
@@ -0,0 +1 @@
+v0.8.2
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,7 +1,7 @@
 {
   description = "Hyprland plugin for touch gestures";
 
-  inputs.hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1&tag=v0.42.0";
+  inputs.hyprland.url = "github:hyprwm/Hyprland";
 
   outputs = {
     self,
diff --git a/hyprload.toml b/hyprload.toml
@@ -1,6 +1,5 @@
 [hyprgrass]
 description = "Touch gestures"
-version = "0.7.0"
 author = "horriblename"
 
 [hyprgrass.build]
diff --git a/meson.build b/meson.build
@@ -1,5 +1,5 @@
 project('hyprgrass', 'cpp', 'c',
-  version: '0.7.0',
+  version: run_command('cat', join_paths(meson.project_source_root(), 'VERSION'), check: true).stdout().strip(),
   default_options: ['buildtype=release'],
 )
 
diff --git a/nix/default.nix b/nix/default.nix
@@ -10,11 +10,11 @@
   doctest,
   runTests ? false,
 }: let
-  pluginInfo = builtins.fromTOML (builtins.readFile ../hyprload.toml);
+  version = builtins.readFile ../VERSION;
 in
   gcc13Stdenv.mkDerivation {
     pname = "hyprgrass";
-    inherit (pluginInfo.hyprgrass) version;
+    inherit version;
     src = ./..;
 
     nativeBuildInputs =
diff --git a/src/main.cpp b/src/main.cpp
@@ -1,5 +1,6 @@
 #include "GestureManager.hpp"
 #include "globals.hpp"
+#include "version.hpp"
 
 #include <hyprland/src/Compositor.hpp>
 #include <hyprland/src/config/ConfigManager.hpp>
@@ -137,7 +138,7 @@ APICALL EXPORT PLUGIN_DESCRIPTION_INFO PLUGIN_INIT(HANDLE handle) {
 
     g_pGestureManager = std::make_unique<GestureManager>();
 
-    return {"hyprgrass", "Touchscreen gestures", "horriblename", "0.7"};
+    return {"hyprgrass", "Touchscreen gestures", "horriblename", HYPRGRASS_VERSION};
 }
 
 APICALL EXPORT void PLUGIN_EXIT() {
diff --git a/src/meson.build b/src/meson.build
@@ -1,5 +1,13 @@
 subdir('gestures')
 
+version_header = configure_file(
+  input: 'version.hpp.in',
+  output: 'version.hpp',
+  configuration: {
+    'HYPRGRASS_VERSION': meson.project_version()
+  }
+)
+
 shared_module('hyprgrass',
   'main.cpp',
   'GestureManager.cpp',
diff --git a/src/version.hpp.in b/src/version.hpp.in
@@ -0,0 +1 @@
+#define HYPRGRASS_VERSION "@HYPRGRASS_VERSION@"

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`description = "Hyprland plugin for touch gestures";`
`3`	`3`
`4`		`- inputs.hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1&tag=v0.42.0";`
	`4`	`+ inputs.hyprland.url = "github:hyprwm/Hyprland";`
`5`	`5`
`6`	`6`	`outputs = {`
`7`	`7`	`self,`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`project('hyprgrass', 'cpp', 'c',`
`2`		`- version: '0.7.0',`
	`2`	`+ version: run_command('cat', join_paths(meson.project_source_root(), 'VERSION'), check: true).stdout().strip(),`
`3`	`3`	`default_options: ['buildtype=release'],`
`4`	`4`	`)`
`5`	`5`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+#define HYPRGRASS_VERSION "@HYPRGRASS_VERSION@"`