diff --git a/.gitignore b/.gitignore index 1837f65..555f77d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .vscode -cosmic-sysext \ No newline at end of file +cosmic-sysext +*_build \ No newline at end of file diff --git a/.gitmodules b/.gitmodules index 16ddd7f..bfc3c35 100644 --- a/.gitmodules +++ b/.gitmodules @@ -31,3 +31,12 @@ [submodule "cosmic-osd"] path = cosmic-osd url = https://github.com/pop-os/cosmic-osd.git +[submodule "cosmic-bg"] + path = cosmic-bg + url = https://github.com/pop-os/cosmic-bg.git +[submodule "user-color-editor"] + path = user-color-editor + url = https://github.com/pop-os/user-color-editor.git +[submodule "iced-workspaces-applet"] + path = iced-workspaces-applet + url = https://github.com/pop-os/iced-workspaces-applet.git diff --git a/cosmic-bg b/cosmic-bg new file mode 160000 index 0000000..ec228ef --- /dev/null +++ b/cosmic-bg @@ -0,0 +1 @@ +Subproject commit ec228ef6a1c6572ee7b42739b4b25a4e33fedb1f diff --git a/iced-workspaces-applet b/iced-workspaces-applet new file mode 160000 index 0000000..64b32cf --- /dev/null +++ b/iced-workspaces-applet @@ -0,0 +1 @@ +Subproject commit 64b32cf00dcc488f08b381133541fcb82f56eed7 diff --git a/justfile b/justfile index 8ddbb60..e19e65f 100644 --- a/justfile +++ b/justfile @@ -1,16 +1,29 @@ just := just_executable() make := `which make` +meson := `which meson` + +_meson_build dir: + mkdir -p {{dir}}_build + {{ meson }} setup --reconfigure {{dir}}_build {{dir}} --prefix=/usr -Dvendor=false + {{ meson }} compile -C {{dir}}_build + +_meson_install dir destdir: + {{ meson }} install -C {{dir}}_build --destdir={{destdir}} build: + mkdir -p build {{ just }} cosmic-applets/all {{ make }} -C cosmic-applet-host all {{ just }} cosmic-applibrary/all + {{ just }} _meson_build cosmic-bg {{ make }} -C cosmic-comp all {{ just }} cosmic-launcher/all {{ make }} -C cosmic-osd all {{ make }} -C cosmic-panel all {{ make }} -C cosmic-settings-daemon all {{ just }} cosmic-session/all + {{ just }} _meson_build iced-workspaces-applet + {{ just }} _meson_build user-color-editor {{ make }} -C xdg-desktop-portal-cosmic all sysext dir=`echo $(pwd)/cosmic-sysext` version=("nightly-" + `git rev-parse --short HEAD`): build && (_extension_release dir version) @@ -18,12 +31,15 @@ sysext dir=`echo $(pwd)/cosmic-sysext` version=("nightly-" + `git rev-parse --sh {{ just }} rootdir={{dir}} cosmic-applets/install {{ make }} -C cosmic-applet-host install DESTDIR={{dir}} prefix=/usr {{ just }} rootdir={{dir}} cosmic-applibrary/install + {{ just }} _meson_install cosmic-bg {{dir}} {{ make }} -C cosmic-comp install DESTDIR={{dir}} {{ just }} rootdir={{dir}} cosmic-launcher/install {{ make }} -C cosmic-osd install DESTDIR={{dir}} prefix=/usr {{ make }} -C cosmic-panel install DESTDIR={{dir}} prefix=/usr {{ make }} -C cosmic-settings-daemon install DESTDIR={{dir}} prefix=/usr {{ just }} rootdir={{dir}} cosmic-session/install + {{ just }} _meson_install iced-workspaces-applet {{dir}} + {{ just }} _meson_install user-color-editor {{dir}} {{ make }} -C xdg-desktop-portal-cosmic install DESTDIR={{dir}} prefix=/usr _extension_release dir version: @@ -40,6 +56,7 @@ clean: rm -rf cosmic-applets/target rm -rf cosmic-applet-host/target rm -rf cosmic-applibrary/target + rm -rf cosmic-bg_build rm -rf cosmic-comp/target rm -rf cosmic-launcher/target rm -rf cosmic-panel/target diff --git a/user-color-editor b/user-color-editor new file mode 160000 index 0000000..f71f16f --- /dev/null +++ b/user-color-editor @@ -0,0 +1 @@ +Subproject commit f71f16f8fb4957b46e3203afcaf095c330093c98