Skip to content

Commit 9bfbff3

Browse files
committed
Add cosmic-bg, iced-workspace-applet, user-color-editor
1 parent 05f6577 commit 9bfbff3

File tree

6 files changed

+31
-1
lines changed

6 files changed

+31
-1
lines changed

.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
.vscode
2-
cosmic-sysext
2+
cosmic-sysext
3+
*_build

.gitmodules

+9
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,12 @@
3131
[submodule "cosmic-osd"]
3232
path = cosmic-osd
3333
url = https://github.com/pop-os/cosmic-osd.git
34+
[submodule "cosmic-bg"]
35+
path = cosmic-bg
36+
url = https://github.com/pop-os/cosmic-bg.git
37+
[submodule "user-color-editor"]
38+
path = user-color-editor
39+
url = https://github.com/pop-os/user-color-editor.git
40+
[submodule "iced-workspaces-applet"]
41+
path = iced-workspaces-applet
42+
url = https://github.com/pop-os/iced-workspaces-applet.git

cosmic-bg

Submodule cosmic-bg added at ec228ef

iced-workspaces-applet

Submodule iced-workspaces-applet added at 64b32cf

justfile

+17
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,45 @@
11
just := just_executable()
22
make := `which make`
3+
meson := `which meson`
4+
5+
_meson_build dir:
6+
mkdir -p {{dir}}_build
7+
{{ meson }} setup --reconfigure {{dir}}_build {{dir}} --prefix=/usr -Dvendor=false
8+
{{ meson }} compile -C {{dir}}_build
9+
10+
_meson_install dir destdir:
11+
{{ meson }} install -C {{dir}}_build --destdir={{destdir}}
312

413
build:
14+
mkdir -p build
515
{{ just }} cosmic-applets/all
616
{{ make }} -C cosmic-applet-host all
717
{{ just }} cosmic-applibrary/all
18+
{{ just }} _meson_build cosmic-bg
819
{{ make }} -C cosmic-comp all
920
{{ just }} cosmic-launcher/all
1021
{{ make }} -C cosmic-osd all
1122
{{ make }} -C cosmic-panel all
1223
{{ make }} -C cosmic-settings-daemon all
1324
{{ just }} cosmic-session/all
25+
{{ just }} _meson_build iced-workspaces-applet
26+
{{ just }} _meson_build user-color-editor
1427
{{ make }} -C xdg-desktop-portal-cosmic all
1528

1629
sysext dir=`echo $(pwd)/cosmic-sysext` version=("nightly-" + `git rev-parse --short HEAD`): build && (_extension_release dir version)
1730
@mkdir -p {{dir}}/usr/lib/extension-release.d/
1831
{{ just }} rootdir={{dir}} cosmic-applets/install
1932
{{ make }} -C cosmic-applet-host install DESTDIR={{dir}} prefix=/usr
2033
{{ just }} rootdir={{dir}} cosmic-applibrary/install
34+
{{ just }} _meson_install cosmic-bg {{dir}}
2135
{{ make }} -C cosmic-comp install DESTDIR={{dir}}
2236
{{ just }} rootdir={{dir}} cosmic-launcher/install
2337
{{ make }} -C cosmic-osd install DESTDIR={{dir}} prefix=/usr
2438
{{ make }} -C cosmic-panel install DESTDIR={{dir}} prefix=/usr
2539
{{ make }} -C cosmic-settings-daemon install DESTDIR={{dir}} prefix=/usr
2640
{{ just }} rootdir={{dir}} cosmic-session/install
41+
{{ just }} _meson_install iced-workspaces-applet {{dir}}
42+
{{ just }} _meson_install user-color-editor {{dir}}
2743
{{ make }} -C xdg-desktop-portal-cosmic install DESTDIR={{dir}} prefix=/usr
2844

2945
_extension_release dir version:
@@ -40,6 +56,7 @@ clean:
4056
rm -rf cosmic-applets/target
4157
rm -rf cosmic-applet-host/target
4258
rm -rf cosmic-applibrary/target
59+
rm -rf cosmic-bg_build
4360
rm -rf cosmic-comp/target
4461
rm -rf cosmic-launcher/target
4562
rm -rf cosmic-panel/target

user-color-editor

Submodule user-color-editor added at f71f16f

0 commit comments

Comments
 (0)