diff --git a/tasks/config/hyprland.yml b/tasks/config/hyprland.yml index 42f1c96..3f5a0d5 100644 --- a/tasks/config/hyprland.yml +++ b/tasks/config/hyprland.yml @@ -6,3 +6,4 @@ pkg_deps: "{{ pkgconfig.hyprland.pkg_deps }}" build_deps: "{{ pkgconfig.hyprland.build_deps[ansible_os_family] }}" installed_files: "{{ pkgconfig.hyprland.build_installed_files }}" + git_path: "{{ d_tempdir.path }}/Hyprland" diff --git a/tasks/src/aquamarine.yml b/tasks/src/aquamarine.yml index 522d453..4cec2da 100644 --- a/tasks/src/aquamarine.yml +++ b/tasks/src/aquamarine.yml @@ -2,7 +2,7 @@ when: - hyprland_clean become: "{{ ext_become }}" - loop: aquamarine.installed_files + loop: "{{ aquamarine.installed_files }}" loop_control: loop_var: file ansible.builtin.file: @@ -34,7 +34,7 @@ - name: Build aquamarine ansible.builtin.command: - creates: "{{ aquamarine.git_path }}/build/" + creates: "{{ aquamarine.git_path }}/build/libaquamarine.so" chdir: "{{ aquamarine.git_path }}" argv: - cmake diff --git a/tasks/src/hyprcursor.yml b/tasks/src/hyprcursor.yml new file mode 100644 index 0000000..18367ae --- /dev/null +++ b/tasks/src/hyprcursor.yml @@ -0,0 +1,58 @@ +- name: Remove existing install + when: + - hyprland_clean + become: "{{ ext_become }}" + loop: "{{ hyprcursor.installed_files }}" + loop_control: + loop_var: file + ansible.builtin.file: + state: absent + path: "{{ path.prefix }}/{{ file }}" + +- name: Build and install hyprcursor + block: + - name: Clone git repository + ansible.builtin.git: + depth: 1 + dest: "{{ hyprcursor.git_path }}" + repo: "{{ hyprcursor.repo }}" + version: "{{ hyprcursor.vers }}" + + - name: Configure hyprcursor + 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={{ path.prefix }} + - -S + - . + - -B + - ./build + + - name: Build hyprcursor + 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 hyprcursor + become: "{{ ext_become }}" + ansible.builtin.command: + creates: "{{ path.bin }}/hyprcursor" + chdir: "{{ hyprcursor.git_path }}" + argv: + - cmake + - --install + - ./build diff --git a/tasks/src/hyprgraphics.yml b/tasks/src/hyprgraphics.yml new file mode 100644 index 0000000..06a1e11 --- /dev/null +++ b/tasks/src/hyprgraphics.yml @@ -0,0 +1,58 @@ +- name: Remove existing install + when: + - hyprland_clean + become: "{{ ext_become }}" + loop: "{{ hyprgraphics.installed_files }}" + loop_control: + loop_var: file + ansible.builtin.file: + state: absent + path: "{{ path.prefix }}/{{ file }}" + +- name: Build and install hyprgraphics + block: + - name: Clone git repository + ansible.builtin.git: + depth: 1 + dest: "{{ hyprgraphics.git_path }}" + repo: "{{ hyprgraphics.repo }}" + version: "{{ hyprgraphics.vers }}" + + - name: Configure hyprgraphics + ansible.builtin.command: + creates: "{{ hyprgraphics.git_path }}/build" + chdir: "{{ hyprgraphics.git_path }}" + argv: + - cmake + - --no-warn-unused-cli + - DCMAKE_BUILD_TYPE=Release + - -DCMAKE_INSTALL_PREFIX={{ path.prefix }} + - -S + - . + - -B + - ./build + + - name: Build hyprgraphics + ansible.builtin.command: + creates: "{{ hyprgraphics.git_path }}/build/libhyprgraphics.so" + chdir: "{{ hyprgraphics.git_path }}" + argv: + - cmake + - --build + - ./build + - --config + - Release + - --target + - all + - -j + - "{{ ansible_processor_nproc|int }}" + + - name: Install hyprgraphics + become: "{{ ext_become }}" + ansible.builtin.command: + creates: "{{ path.bin }}/hyprgraphics" + chdir: "{{ hyprgraphics.git_path }}" + argv: + - cmake + - --install + - ./build diff --git a/tasks/src/hyprland.yml b/tasks/src/hyprland.yml new file mode 100644 index 0000000..5256665 --- /dev/null +++ b/tasks/src/hyprland.yml @@ -0,0 +1,59 @@ +- name: Remove existing install + when: + - hyprland_clean + become: "{{ ext_become }}" + loop: "{{ hyprland.installed_files }}" + loop_control: + loop_var: file + ansible.builtin.file: + state: absent + path: "{{ path.prefix }}/{{ file }}" + +- name: Build and install hyprland + block: + - name: Clone git repository + ansible.builtin.git: + depth: 1 + dest: "{{ hyprland.git_path }}" + recursive: true + repo: "{{ hyprland.repo }}" + version: "{{ hyprland.vers }}" + + - name: Configure hyprland + ansible.builtin.command: + creates: "{{ hyprland.git_path }}/build" + chdir: "{{ hyprland.git_path }}" + argv: + - cmake + - --no-warn-unused-cli + - DCMAKE_BUILD_TYPE:STRING=Release + - -DCMAKE_INSTALL_PREFIX:PATH={{ path.prefix }} + - -S + - . + - -B + - ./build + + - name: Build hyprland + ansible.builtin.command: + creates: "{{ hyprland.git_path }}/build/Hyprland" + chdir: "{{ hyprland.git_path }}" + argv: + - cmake + - --build + - ./build + - --config + - Release + - --target + - all + - -j + - "{{ ansible_processor_nproc|int }}" + + - name: Install hyprland + become: "{{ ext_become }}" + ansible.builtin.command: + creates: "{{ path.bin }}/hyprland" + chdir: "{{ hyprland.git_path }}" + argv: + - cmake + - --install + - ./build diff --git a/tasks/src/hyprlang.yml b/tasks/src/hyprlang.yml index 763d234..f5a7754 100644 --- a/tasks/src/hyprlang.yml +++ b/tasks/src/hyprlang.yml @@ -2,7 +2,7 @@ when: - hyprland_clean become: "{{ ext_become }}" - loop: hyprlang.installed_files + loop: "{{ hyprlang.installed_files }}" loop_control: loop_var: file ansible.builtin.file: @@ -34,7 +34,7 @@ - name: Build hyprlang ansible.builtin.command: - creates: "{{ hyprlang.git_path }}/build/hyprlang.pc" + creates: "{{ hyprlang.git_path }}/build/hyprlang.so" chdir: "{{ hyprlang.git_path }}" argv: - cmake diff --git a/tasks/src/hyprutils.yml b/tasks/src/hyprutils.yml index 95595e9..9de16e0 100644 --- a/tasks/src/hyprutils.yml +++ b/tasks/src/hyprutils.yml @@ -2,7 +2,7 @@ when: - hyprland_clean become: "{{ ext_become }}" - loop: hyprutils.installed_files + loop: "{{ hyprutils.installed_files }}" loop_control: loop_var: file ansible.builtin.file: @@ -34,7 +34,7 @@ - name: Build hyprutils ansible.builtin.command: - creates: "{{ hyprutils.git_path }}/build/hyprutils.pc" + creates: "{{ hyprutils.git_path }}/build/hyprutils.so" chdir: "{{ hyprutils.git_path }}" argv: - cmake diff --git a/tasks/src/hyprwayland_scanner.yml b/tasks/src/hyprwayland_scanner.yml index 3640e5a..130fa37 100644 --- a/tasks/src/hyprwayland_scanner.yml +++ b/tasks/src/hyprwayland_scanner.yml @@ -2,7 +2,7 @@ when: - hyprland_clean become: "{{ ext_become }}" - loop: hyprwayland_scanner.installed_files + loop: "{{ hyprwayland_scanner.installed_files }}" loop_control: loop_var: file ansible.builtin.file: diff --git a/tests/setup.sh b/tests/setup.sh index 5449f44..985e1aa 100755 --- a/tests/setup.sh +++ b/tests/setup.sh @@ -22,5 +22,5 @@ echo "Building container images" for os in ${OSBUILDS[@]} do echo "Building image for ${os}" - podman build --platform linux/amd64 -f Containerfile.${os} -t ${IMAGE}:${os} . + podman build --platform linux/amd64 -f Containerfile.${os} -t localhost/${IMAGE}:${os} . done diff --git a/tests/test.sh b/tests/test.sh index e463a05..186ad87 100755 --- a/tests/test.sh +++ b/tests/test.sh @@ -6,8 +6,6 @@ set -x for os in ${OSBUILDS[@]} do - if ! podman container exists ${CONTAINER}_${os}; then - podman run --rm -it -d --platform linux/amd64 --name ${CONTAINER}_${os} -p 2222:22 ${IMAGE}:${os} - fi + podman run --rm -it -d --platform linux/amd64 --name ${CONTAINER}_${os} -p 2222:22 localhost/${IMAGE}:${os} ansible-playbook "test.yml" -i inventory.yml done diff --git a/vars/pkgs/hyprcursor.yml b/vars/pkgs/hyprcursor.yml index 4c554e8..31609d5 100644 --- a/vars/pkgs/hyprcursor.yml +++ b/vars/pkgs/hyprcursor.yml @@ -1,5 +1,5 @@ hyprcursor: - version: + version: v0.1.11 repo: "{{ hyprgitbase }}/hyprcursor" pkg_deps: - hyprlang @@ -9,4 +9,11 @@ hyprcursor: - libzip-devel - librsvg2-devel - tomlplusplus-devel - build_installed_files: [] + build_installed_files: + - lib64/libhyprcursor.so.0.1.11 + - lib64/libhyprcursor.so.0 + - lib64/libhyprcursor.so + - include/hyprcursor.hpp + - bin/hyprcursor-util + - include/hyprcursor + - lib64/pkgconfig/hyprcursor.pc diff --git a/vars/pkgs/hyprgraphics.yml b/vars/pkgs/hyprgraphics.yml index 09722fd..6306d39 100644 --- a/vars/pkgs/hyprgraphics.yml +++ b/vars/pkgs/hyprgraphics.yml @@ -1,5 +1,5 @@ hyprgraphics: - version: + version: v0.1.2 repo: "{{ hyprgitbase }}/hyprgraphics" pkg_deps: - hyprutils @@ -15,4 +15,9 @@ hyprgraphics: - file-devel - file-libs - libspng-devel - build_installed_files: [] + build_installed_files: + - lib64/libhyprgraphics.so.0.1.2 + - lib64/libhyprgraphics.so.0 + - lib64/libhyprgraphics.so + - include/hyprgraphics + - lib64/pkgconfig/hyprgraphics.pc diff --git a/vars/pkgs/hyprland.yml b/vars/pkgs/hyprland.yml index 1fbe233..5d0719b 100644 --- a/vars/pkgs/hyprland.yml +++ b/vars/pkgs/hyprland.yml @@ -2,6 +2,7 @@ hyprland: version: v0.47.2 repo: "{{ hyprgitbase }}/Hyprland" pkg_deps: + - git - hyprwayland_scanner - hyprutils - hyprlang @@ -18,7 +19,12 @@ hyprland: - libglvnd-devel - libinput-devel - libseat-devel + - libuuid-devel - libxcb-devel + - libXcursor-devel + - xcb-util-wm-devel + - xcb-util-errors-devel + - re2-devel - libxkbcommon-devel - mesa-libgbm-devel - meson @@ -32,4 +38,28 @@ hyprland: - xcb-util-renderutil-devel - xcb-util-wm-devel - xorg-x11-server-Xwayland-devel - build_installed_files: [] + build_installed_files: + - share/wayland-sessions/hyprland-uwsm.desktop + - bin/hyprctl + - share/bash-completion/completions/hyprctl + - share/fish/vendor_completions.d/hyprctl.fish + - share/zsh/site-functions/_hyprctl + - include + - include/glaze + - bin/hyprpm + - share/bash-completion/completions/hyprpm + - share/fish/vendor_completions.d/hyprpm.fish + - share/zsh/site-functions/_hyprpm + - bin/Hyprland + - share/wayland-sessions/hyprland.desktop + - share/hypr/lockdead.png + - share/hypr/lockdead2.png + - share/hypr/wall0.png + - share/hypr/wall1.png + - share/hypr/wall2.png + - share/hypr/hyprland.conf + - share/xdg-desktop-portal/hyprland-portals.conf + - share/man/man1/Hyprland.1 + - share/man/man1/hyprctl.1 + - share/pkgconfig/hyprland.pc + - include/hyprland diff --git a/vars/pkgs/hyprlang.yml b/vars/pkgs/hyprlang.yml index f3c1483..0065816 100644 --- a/vars/pkgs/hyprlang.yml +++ b/vars/pkgs/hyprlang.yml @@ -4,4 +4,13 @@ hyprlang: pkg_deps: [] build_deps: RedHat: [] - build_installed_files: [] + build_installed_files: + - lib64/libhyprlang.so.0.6.0 + - lib64/libhyprlang.so.2 + - lib64/libhyprlang.so + - include/hyprlang.hpp + - lib64/libhyprlang.so.0.6.0 + - lib64/libhyprlang.so.2 + - lib64/libhyprlang.so + - include/hyprlang.hpp + - lib64/pkgconfig/hyprlang.pc