Improve meson build #31
There are no files selected for viewing
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| <img align="left" width="64" height="64" src="https://raw.githubusercontent.com/starfish-app/starfish/main/data/icons/64/hr.from.josipantolis.starfish.svg"> | ||
| <h1>Starfish</h1> | ||
|
|
||
| A [Gemini](https://gemini.circumlunar.space/) browser made for [elementary OS](https://elementary.io/). | ||
|
|
@@ -89,7 +89,7 @@ flatpak run hr.from.josipantolis.starfish | |
|
|
||
| ## License | ||
|
|
||
| [GNU GPLv3](LICENSE) | ||
|
There was a problem hiding this comment. I think COPYING is the standard / recommended name for the file containing the full GPL license text. |
||
|
|
||
| Copyright © 2021 Josip Antoliš, [email protected]. | ||
|
|
||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| # Install icons | ||
| icon_sizes = ['16', '24', '32', '48', '64', '128'] | ||
|
|
||
| foreach i : icon_sizes | ||
| install_data ( | ||
| join_paths ('icons', i, meson.project_name () + '.svg'), | ||
| install_dir: join_paths (get_option ('datadir'), 'icons', 'hicolor', i + 'x' + i, 'apps') | ||
| ) | ||
| install_data ( | ||
| join_paths ('icons', i, meson.project_name () + '.svg'), | ||
| install_dir: join_paths (get_option ('datadir'), 'icons', 'hicolor', i + 'x' + i + '@2', 'apps') | ||
| ) | ||
| endforeach | ||
|
|
||
| # Translate and install our .desktop file so the Applications Menu will see it | ||
| i18n.merge_file ( | ||
| input: meson.project_name () + '.desktop.in', | ||
| output: meson.project_name () + '.desktop', | ||
| po_dir: join_paths (meson.source_root (), 'po', 'extra'), | ||
| type: 'desktop', | ||
| install: true, | ||
| install_dir: join_paths (get_option ('datadir'), 'applications') | ||
| ) | ||
|
|
||
| # Translate and install our .appdata.xml file so AppCenter will see it | ||
| i18n.merge_file ( | ||
| input: meson.project_name () + '.appdata.xml.in', | ||
| output: meson.project_name () + '.appdata.xml', | ||
| po_dir: join_paths (meson.source_root (), 'po', 'extra'), | ||
| install: true, | ||
| install_dir: join_paths (get_option ('datadir'), 'metainfo') | ||
| ) | ||
|
|
||
| # Install gschema | ||
| install_data ( | ||
| meson.project_name () + '.gschema.xml', | ||
| install_dir: join_paths (get_option ('datadir'), 'glib-2.0', 'schemas') | ||
| ) | ||
|
|
||
| # Register gemini MIME type | ||
| install_data ( | ||
| 'gemini-mime-type.xml', | ||
| install_dir: join_paths (get_option ('datadir'), 'mime', 'packages'), | ||
| rename: meson.project_name () + '.xml' | ||
| ) | ||
|
|
||
| # Install docs | ||
| doc_files = ['index.gmi', 'discover.gmi', 'apps.gmi', 'terminology.gmi'] | ||
|
|
||
| foreach doc_file : doc_files | ||
| install_data ( | ||
| join_paths ('static', doc_file), | ||
| install_dir: join_paths (get_option ('datadir'), 'doc', 'starfish') | ||
| ) | ||
| endforeach |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,182 +1,64 @@ | ||
| # Project name, programming language and version | ||
| project ( | ||
| 'hr.from.josipantolis.starfish', | ||
| 'c', 'vala', | ||
| version: '1.3.1' | ||
| ) | ||
|
|
||
| # Translation module | ||
| i18n = import ('i18n') | ||
|
|
||
| # Project arguments | ||
| add_project_arguments ( | ||
| '-DGETTEXT_PACKAGE="@0@"'.format (meson.project_name ()), | ||
| language: 'c' | ||
| ) | ||
|
|
||
| # GNOME module | ||
| gnome = import ('gnome') | ||
|
|
||
| # Compiling resources | ||
| gresource = gnome.compile_resources ( | ||
|
There was a problem hiding this comment. Would it make sense to move this into |
||
| 'gresource', | ||
| join_paths ('data', meson.project_name ()) + '.gresource.xml', | ||
| source_dir: 'data', | ||
| c_name: 'as' | ||
| ) | ||
|
|
||
| # Listing dependencies | ||
| dependencies = [ | ||
| dependency ('glib-2.0'), | ||
| dependency ('gobject-2.0'), | ||
| dependency ('gee-0.8'), | ||
| dependency ('gtk+-3.0'), | ||
| dependency ('granite'), | ||
| dependency ('libhandy-1'), | ||
| dependency ('gnutls'), | ||
| dependency ('gtkspell3-3.0'), | ||
| meson.get_compiler ('vala').find_library ('posix') | ||
| ] | ||
|
|
||
| subdir ('src') | ||
|
|
||
| # Defining executable | ||
| executable ( | ||
| meson.project_name (), | ||
| sources, | ||
| gresource, | ||
| dependencies: dependencies, | ||
| install: true | ||
| ) | ||
|
|
||
| subdir ('test') | ||
|
|
||
| # Defning tests executable | ||
| test('tests', executable ( | ||
| meson.project_name () + '-tests', | ||
| common_sources + test_sources, | ||
| dependencies: dependencies | ||
| )) | ||
|
|
||
| subdir('data') | ||
| subdir('po') | ||
|
|
||
| meson.add_install_script('meson/post_install.py', meson.project_name ()) | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,29 +1,35 @@ | ||
| #!/usr/bin/env python3 | ||
|
|
||
| from os import path, environ | ||
| import subprocess | ||
| import sys | ||
|
|
||
| project_name = sys.argv[1] | ||
| prefix = environ.get('MESON_INSTALL_PREFIX', '/usr/local') | ||
| datadir = path.join(prefix, 'share') | ||
| schemadir = path.join(datadir, 'glib-2.0', 'schemas') | ||
| schema_file = path.join(schemadir, project_name + '.gschema.xml') | ||
| desktop_database_dir = path.join(datadir, 'applications') | ||
| mimedir = path.join(datadir, 'mime') | ||
|
|
||
| def fill_schema_placeholders(): | ||
| with open(schema_file, 'rt') as file: | ||
| schema_content = file.read() | ||
| for param in environ.keys(): | ||
| key = '{{' + param + '}}' | ||
| value = environ[param] | ||
| schema_content = schema_content.replace(key, value) | ||
| with open(schema_file, 'wt') as file: | ||
| file.write(schema_content) | ||
|
|
||
| if not environ.get('DESTDIR'): | ||
| print('Replacing gsettings placeholders in ' + schema_file + '…') | ||
| fill_schema_placeholders() | ||
| print('Compiling gsettings schemas…') | ||
| subprocess.call(['glib-compile-schemas', schemadir]) | ||
| print('Updating desktop database…') | ||
| subprocess.call(['update-desktop-database', '-q', desktop_database_dir]) | ||
| print('Updating icon cache…') | ||
| subprocess.call(['gtk-update-icon-cache', '-qtf', path.join(datadir, 'icons', 'hicolor')]) | ||
Antolius marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| print('Registering text/gemini MIME type…') | ||
| subprocess.call(['update-mime-database', mimedir]) | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +0,0 @@ | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd prefer not to have project name repeated in too many places, such as icon file names, etc.
Ideally it would only be defined in the
projectfunction call on top of the root meson.build file.Individual files can be renamed in calls to
install_datafunction. That approach allows for:Admittedly, I haven't followed this rule in all the places myself, but I plan to clean those up over time.