standarizing cmake builds

tasks/src/aquamarine.yml

@@ -3,13 +3,10 @@
 - name: Remove existing install {{ pkg }}
   when:
     - aquamarine.clean
-  become: true
-  loop: "{{ aquamarine.installed_files }}"
-  loop_control:
-    loop_var: file
-  ansible.builtin.file:
-    state: absent
-    path: "{{ hyprland.prefix }}/{{ file }}"
+  vars:
+    file_list: "{{ srcconfig.aquamarine.build_installed_files }}"
+  ansible.builtin.include_tasks:
+    files: helpers/clean_install.yml
 
 - name: Check for installed {{ pkg }}
   register: stat_aquamarine_inst
@@ -22,7 +19,10 @@
   block:
     - name: Do repo clone {{ pkg }}
       vars:
-        repo: "{{ aquamarine }}"
+        src_pkg: aquamarine
+        src_path: "{{ srcconfig.aquamarine.src_path }}"
+        src_gitrepo: "{{ srcconfig.aquamarine.gitrepo }}"
+        src_version: "{{ aquamarine.vers }}"
       ansible.builtin.include_tasks:
         file: helpers/git.yml
 
@@ -37,6 +37,11 @@
 
     - name: Do build and install {{ pkg }}
       vars:
-        repo: "{{ aquamarine }}"
+        src_path: "{{ srcconfig.aquamarine.src_path }}"
+        configure: "{{ srcconfig.aquamarine.configure }}"
+        build_creates: "{{ srcconfig.aquamarine.build_creates }}"
+        build: "{{ srcconfig.aquamarine.build }}"
+        install_creates: "{{ srcconfig.aquamarine.install_creates }}"
+        install: "{{ srcconfig.aquamarine.install }}"
       ansible.builtin.include_tasks:
         file: helpers/cmake_build.yml

tasks/src/hyprcursor.yml

@@ -3,13 +3,10 @@
 - name: Remove existing install of {{ pkg }}
   when:
     - hyprcursor.clean
-  become: true
-  loop: "{{ hyprcursor.installed_files }}"
-  loop_control:
-    loop_var: file
-  ansible.builtin.file:
-    state: absent
-    path: "{{ hyprland.prefix }}/{{ file }}"
+  vars:
+    file_list: "{{ srcconfig.hyprcursor.build_installed_files }}"
+  ansible.builtin.include_tasks:
+    file: helpers/clean_install.yml
 
 - name: Check for installed {{ pkg }}
   register: stat_hyprcursor_inst
@@ -20,49 +17,22 @@
   when:
     - not stat_hyprcursor_inst.stat.exists
   block:
-    - name: Clone git repository {{ pkg }}
-      ansible.builtin.git:
-        depth: 1
-        force: true
-        dest: "{{ hyprcursor.git_path }}"
-        repo: "{{ hyprcursor.repo }}"
-        version: "{{ hyprcursor.vers }}"
+    - name: Do repo clone {{ pkg }}
+      vars:
+        src_pkg: hyprcursor
+        src_path: "{{ srcconfig.hyprcursor.src_path }}"
+        src_gitrepo: "{{ srcconfig.hyprcursor.gitrepo }}"
+        src_version: "{{ hyprcursor.vers }}"
+      ansible.builtin.include_tasks:
+        file: helpers/git.yml
 
-    - name: Configure {{ pkg }}
-      ansible.builtin.command:
-        creates: "{{ hyprcursor.git_path }}/build"
-        chdir: "{{ hyprcursor.git_path }}"
-        argv:
-          - cmake
-          - --no-warn-unused-cli
-          - DCMAKE_BUILD_TYPE=Release
-          - -DCMAKE_INSTALL_PREFIX={{ hyprland.prefix }}
-          - -S
-          - .
-          - -B
-          - ./build
-
-    - name: Build {{ pkg }}
-      ansible.builtin.command:
-        creates: "{{ hyprcursor.git_path }}/build/hyprcursor.so"
-        chdir: "{{ hyprcursor.git_path }}"
-        argv:
-          - cmake
-          - --build
-          - ./build
-          - --config
-          - Release
-          - --target
-          - all
-          - -j
-          - "{{ ansible_processor_nproc | int }}"
-
-    - name: Install {{ pkg }}
-      become: true
-      ansible.builtin.command:
-        creates: "{{ path.bin }}/hyprcursor"
-        chdir: "{{ hyprcursor.git_path }}"
-        argv:
-          - cmake
-          - --install
-          - ./build
+    - name: CMake build and install {{ pkg }}
+      vars:
+        src_path: "{{ srcconfig.hyprcursor.src_path }}"
+        configure: "{{ srcconfig.hyprcursor.configure }}"
+        build_creates: "{{ srcconfig.hyprcursor.build_creates }}"
+        build: "{{ srcconfig.hyprcursor.build }}"
+        install_creates: "{{ srcconfig.hyprcursor.install_creates }}"
+        install: "{{ srcconfig.hyprcursor.install }}"
+      ansible.builtin.include_tasks:
+        file: helpers/cmake_build.yml