archives/steamos-manager
archives/steamos-manager
2
0
Fork 1
mirror of https://gitlab.steamos.cloud/holo/steamos-manager.git synced 2025-07-15 10:46:41 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'endrift/xml' into 'master'

Browse source 
XML: Move to data/interfaces, install for dbus

See merge request holo/steamos-manager!22
This commit is contained in:
Vicki Pfau 2025-07-09 16:26:10 -07:00
commit c7088252d2
5 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Makefile
View file

@ -16,6 +16,7 @@ test:
@cargo test
install: target/release/steamos-manager target/release/steamosctl
install -d -m0755 "$(DESTDIR)/usr/share/dbus-1/interaces/"
install -d -m0755 "$(DESTDIR)/usr/share/dbus-1/services/"
install -d -m0755 "$(DESTDIR)/usr/share/dbus-1/system-services/"
install -d -m0755 "$(DESTDIR)/usr/share/dbus-1/system.d/"
@ -29,6 +30,8 @@ install: target/release/steamos-manager target/release/steamosctl
install -m644 "data/platform.toml" "$(DESTDIR)/usr/share/steamos-manager/"
install -D -m644 -t "$(DESTDIR)/usr/share/dbus-1/interfaces" "data/interfaces/"*
install -m644 "data/system/com.steampowered.SteamOSManager1.service" "$(DESTDIR)/usr/share/dbus-1/system-services/"
install -m644 "data/system/com.steampowered.SteamOSManager1.conf" "$(DESTDIR)/usr/share/dbus-1/system.d/"
install -m644 "data/system/steamos-manager.service" "$(DESTDIR)/usr/lib/systemd/system/"

0
com.steampowered.SteamOSManager1.Manager.xml → data/interfaces/com.steampowered.SteamOSManager1.Manager.xml
View file

0
com.steampowered.SteamOSManager1.xml → data/interfaces/com.steampowered.SteamOSManager1.xml
View file

4
steamos-manager/src/manager/user.rs
View file

@ -1342,7 +1342,7 @@ mod test {
.await
.expect("remote");
let local = testing::InterfaceIntrospection::from_local(
"../com.steampowered.SteamOSManager1.Manager.xml",
"../data/interfaces/com.steampowered.SteamOSManager1.Manager.xml",
"com.steampowered.SteamOSManager1.Manager",
)
.await
@ -1354,7 +1354,7 @@ mod test {
let remote =
testing::InterfaceIntrospection::from_remote::<I, _>(connection, MANAGER_PATH).await?;
let local = testing::InterfaceIntrospection::from_local(
"../com.steampowered.SteamOSManager1.xml",
"../data/interfaces/com.steampowered.SteamOSManager1.xml",
I::name().to_string(),
)
.await?;

2
steamos-manager/src/udev.rs
View file

@ -213,7 +213,7 @@ mod test {
.await
.expect("remove");
let local = testing::InterfaceIntrospection::from_local(
"../com.steampowered.SteamOSManager1.xml",
"../data/interfaces/com.steampowered.SteamOSManager1.xml",
UdevDbusObject::name().to_string(),
)
.await