Refactoring build system

Author: BuddySirJava

data/meson.build

@@ -28,9 +28,22 @@ compiled_ui_stamp = custom_target(
   command: ['touch', '@OUTPUT@'],
 )
 
-css_copy = configure_file(input: 'ssh-studio.css', output: 'ssh-studio.css', copy: true)
-icon_256_copy = configure_file(input: 'media/icon_256.png', output: 'icon_256.png', copy: true)
-icon_128_copy = configure_file(input: 'media/icon_128.png', output: 'icon_128.png', copy: true)
+css_copy = configure_file(
+  input: 'ssh-studio.css',
+  output: 'ssh-studio.css',
+  copy: true
+)
+
+configure_file(
+  input: 'media/icon_256.png',
+  output: 'icon_256.png',
+  copy: true
+)
+configure_file(
+  input: 'media/icon_128.png',
+  output: 'icon_128.png',
+  copy: true
+)
 
 gnome.compile_resources('ssh-studio-resources',
   'ssh-studio.gresource.xml',
@@ -39,6 +52,3 @@ gnome.compile_resources('ssh-studio-resources',
   gresource_bundle: true,
   install: true,
   install_dir: join_paths(get_option('datadir'), application_id))
-
-install_data('io.github.BuddySirJava.SSH-Studio.metainfo.xml',
-  install_dir: join_paths(get_option('datadir'), 'metainfo'))

io.github.BuddySirJava.SSH-Studio.json

@@ -10,13 +10,8 @@
         "--socket=wayland",
         "--share=network",
         "--filesystem=~/.ssh:rw",
-        "--socket=ssh-auth",
-        "--talk-name=org.freedesktop.Flatpak",
-        "--socket=session-bus",
-        "--device=dri",
-        "--share=ipc",
-        "filesystem=home"
-    ],
+        "--socket=ssh-auth"
+        ],
     "cleanup" : [
         "/include",
         "/lib/pkgconfig",
@@ -55,7 +50,7 @@
                     "type" : "git",
                     "url" : "https://github.com/BuddySirJava/SSH-Studio.git",
                     "tag" : "1.3.1",
-                    "commit" : "528e5c0e207c63b9ead2adf3f169316950ee81af",
+                    "commit" : "9e3d73ccd0bdbdb26f56e1ff114a85523305bc30",
                     "x-checker-data" : {
                         "type" : "git",
                         "tag-pattern" : "^v([\\d.]+)$"

meson.build

@@ -2,12 +2,15 @@ project('ssh-studio', 'c',
   version: '1.3.1',
   license: 'GPL-3.0-or-later',
   meson_version: '>= 0.60.0',
-  default_options: ['warning_level=2',
-                    'buildtype=debugoptimized'])
-
+  default_options: [
+    'warning_level=2',
+    'buildtype=debugoptimized',
+    'python.install_env=auto',
+    'python.platlibdir='
+  ])
 
 python = import('python')
-python_installation = python.find_installation()
+python_installation = python.find_installation('python3', required: true)
 
 gnome = import('gnome')
 
@@ -22,24 +25,45 @@ subdir('src')
 
 subdir('data')
 
-install_data(join_paths(meson.current_source_dir(), 'data', application_id + '.desktop'),
-             install_dir: join_paths(get_option('datadir'), 'applications'))
-
-install_data(join_paths(meson.current_source_dir(), 'data', 'ssh-studio.in'),
-             rename: 'ssh-studio',
-             install_mode: 'rwxr-xr-x',
-             install_dir: join_paths(get_option('bindir')))
-
-install_data(join_paths(meson.current_source_dir(), 'data', 'media', 'icon_256.png'),
-             rename: application_id + '.png',
-             install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor', '256x256', 'apps'))
-install_data(join_paths(meson.current_source_dir(), 'data', 'media', 'icon_128.png'),
-             rename: application_id + '.png',
-             install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor', '128x128', 'apps'))
-install_data(join_paths(meson.current_source_dir(), 'data', 'media', 'icon_512.png'),
-             rename: application_id + '.png',
-             install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor', '512x512', 'apps'))
-install_data(join_paths(meson.current_source_dir(), 'data', 'media', 'icon.svg'),
-             rename: application_id + '.svg',
-             install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor', 'scalable', 'apps'))
+if get_option('install_desktop_file')
+  install_data(
+    join_paths(meson.current_source_dir(), 'data', application_id + '.desktop'),
+    install_dir: join_paths(get_option('datadir'), 'applications')
+  )
+endif
+
+install_data(
+  join_paths(meson.current_source_dir(), 'data', 'ssh-studio.in'),
+  rename: 'ssh-studio',
+  install_mode: 'rwxr-xr-x',
+  install_dir: join_paths(get_option('bindir'))
+)
+
+if get_option('install_icons')
+  icon_sizes = ['128', '256', '512']
+  icon_extensions = ['png', 'png', 'png']
+
+  foreach i : range(icon_sizes.length())
+    size = icon_sizes[i]
+    ext = icon_extensions[i]
+    install_data(
+      join_paths(meson.current_source_dir(), 'data', 'media', 'icon_' + size + '.' + ext),
+      rename: application_id + '.' + ext,
+      install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor', size + 'x' + size, 'apps')
+    )
+  endforeach
+
+  install_data(
+    join_paths(meson.current_source_dir(), 'data', 'media', 'icon.svg'),
+    rename: application_id + '.svg',
+    install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor', 'scalable', 'apps')
+  )
+endif
+
+if get_option('install_metainfo')
+  install_data(
+    join_paths(meson.current_source_dir(), 'data', application_id + '.metainfo.xml'),
+    install_dir: join_paths(get_option('datadir'), 'metainfo')
+  )
+endif
 

meson_options.txt

@@ -0,0 +1,29 @@
+option('package_for_flatpak',
+  type: 'boolean',
+  value: false,
+  description: 'Optimize build for Flatpak packaging'
+)
+
+option('package_for_appimage',
+  type: 'boolean',
+  value: false,
+  description: 'Optimize build for AppImage packaging'
+)
+
+option('install_icons',
+  type: 'boolean',
+  value: true,
+  description: 'Install application icons'
+)
+
+option('install_desktop_file',
+  type: 'boolean',
+  value: true,
+  description: 'Install desktop file'
+)
+
+option('install_metainfo',
+  type: 'boolean',
+  value: true,
+  description: 'Install metainfo file'
+)

src/meson.build

@@ -22,8 +22,3 @@ python_installation.install_sources(
   ['ui/host_editor.py', 'ui/host_list.py', 'ui/main_window.py', 'ui/preferences_dialog.py', 'ui/test_connection_dialog.py', 'ui/ssh_key_manager_dialog.py', 'ui/generate_key_dialog.py', 'ui/key_picker_dialog.py', 'ui/keyboard_shortcuts_dialog.py', 'ui/welcome_view.py', 'ui/__init__.py'],
   subdir: 'ssh_studio/ui'
 )
-
-python_installation.install_sources(
-  [],
-  subdir: 'ssh_studio/ui'
-)