Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move session files to their own folder #823

Merged
merged 3 commits into from
Oct 8, 2024
Merged

Move session files to their own folder #823

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
11894b7
Move session files to their own folder
danirabbit Oct 2, 2024
11d3954
Add meson
danirabbit Oct 2, 2024
a0f925c
Merge branch 'main' into danirabbit/session-folder
zeebok Oct 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 0 additions & 36 deletions data/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
autostartdir = join_paths(get_option('sysconfdir'), 'xdg', 'autostart')
schemadir = join_paths(get_option('datadir'), 'glib-2.0', 'schemas')

i18n.merge_file(
input: meson.project_name() + '.desktop.in',
output: meson.project_name() + '.desktop',
Expand All @@ -19,39 +16,6 @@ i18n.merge_file(
install_dir: get_option('datadir') / 'metainfo',
)

install_data(
'installer.desktop',
install_dir: join_paths(get_option('datadir'), 'xsessions')
)

install_data(
'autostart.desktop',
install_dir: autostartdir,
rename: meson.project_name() + '.desktop'
)

install_data(
'compositor-autostart.desktop',
install_dir: autostartdir,
rename: meson.project_name() + '.compositor.desktop'
)

install_subdir(
'gsd',
install_dir: autostartdir,
strip_directory: true
)

install_data(
'installer.session',
install_dir: join_paths(get_option('datadir'), 'gnome-session', 'sessions')
)

install_data(
'installer-default-settings.gschema.override',
install_dir: schemadir
)

# Test the desktop file
validate_desktop_exe = find_program('desktop-file-validate')
test ('Validate desktop file', validate_desktop_exe,
Expand Down
1 change: 1 addition & 0 deletions meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,6 @@ subdir('po')
subdir('common')
subdir('daemon')
subdir('src')
subdir('session')
subdir('data')
subdir('test')
0 data/autostart.desktop → session/autostart.desktop
View file
Open in desktop
File renamed without changes.
0 data/compositor-autostart.desktop → session/compositor-autostart.desktop
View file
Open in desktop
File renamed without changes.
0 ...ettingsDaemon.MediaKeys-installer.desktop → ...ettingsDaemon.MediaKeys-installer.desktop
View file
Open in desktop
File renamed without changes.
0 ...me.SettingsDaemon.Power-installer.desktop → ...me.SettingsDaemon.Power-installer.desktop
View file
Open in desktop
File renamed without changes.
0 ...ettingsDaemon.XSettings-installer.desktop → ...ettingsDaemon.XSettings-installer.desktop
View file
Open in desktop
File renamed without changes.
0 ...staller-default-settings.gschema.override → ...staller-default-settings.gschema.override
View file
Open in desktop
File renamed without changes.
0 data/installer.desktop → session/installer.desktop
View file
Open in desktop
File renamed without changes.
0 data/installer.session → session/installer.session
View file
Open in desktop
File renamed without changes.
35 changes: 35 additions & 0 deletions session/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
autostartdir = get_option('sysconfdir') / 'xdg' / 'autostart'
schemadir = get_option('datadir') / 'glib-2.0' / 'schemas'

install_data(
'autostart.desktop',
install_dir: autostartdir,
rename: meson.project_name() + '.desktop'
)

install_data(
'compositor-autostart.desktop',
install_dir: autostartdir,
rename: meson.project_name() + '.compositor.desktop'
)

install_data(
'installer.desktop',
install_dir: get_option('datadir') / 'xsessions'
)

install_data(
'installer.session',
install_dir: get_option('datadir') / 'gnome-session' / 'sessions'
)

install_data(
'installer-default-settings.gschema.override',
install_dir: schemadir
)

install_subdir(
'gsd',
install_dir: autostartdir,
strip_directory: true
)