diff --git a/.editorconfig b/.editorconfig index ca38bf6..062ac9d 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,7 +1,7 @@ # EditorConfig root = true -# elementary defaults +# default rule [*] charset = utf-8 end_of_line = lf @@ -12,5 +12,9 @@ max_line_length = 120 tab_width = 4 # Markup files -[{*.html,*.xml,*.xml.in,*.yml}] +[{*.html,*.xml,*.xml.in*,*.yml}] +tab_width = 2 + +# meson files +[{meson.*}] tab_width = 2 diff --git a/data/meson.build b/data/meson.build index 4eaf852..8f1560f 100644 --- a/data/meson.build +++ b/data/meson.build @@ -1,32 +1,32 @@ icon_sizes = ['32', '48', '64', '128'] install_data( - file_name + '.gschema.xml', - rename: meson.project_name() + '.gschema.xml', - install_dir: get_option('datadir') / 'glib-2.0' / 'schemas' + file_name + '.gschema.xml', + rename: meson.project_name() + '.gschema.xml', + install_dir: get_option('datadir') / 'glib-2.0' / 'schemas', ) foreach i : icon_sizes - install_data( - 'icons' / i / file_name + '.svg', - rename: meson.project_name() + '.svg', - install_dir: get_option('datadir') / 'icons' / 'hicolor' / i + 'x' + i / 'apps' - ) + install_data( + 'icons' / i / file_name + '.svg', + rename: meson.project_name() + '.svg', + install_dir: get_option('datadir') / 'icons' / 'hicolor' / i + 'x' + i / 'apps', + ) endforeach i18n.merge_file( - input: file_name + '.desktop.in', - output: meson.project_name() + '.desktop', - po_dir: meson.project_source_root() / 'po' / 'extra', - type: 'desktop', - install: true, - install_dir: get_option('datadir') / 'applications' + input: file_name + '.desktop.in', + output: meson.project_name() + '.desktop', + po_dir: meson.project_source_root() / 'po' / 'extra', + type: 'desktop', + install: true, + install_dir: get_option('datadir') / 'applications', ) i18n.merge_file( - input: file_name + '.metainfo.xml.in', - output: meson.project_name() + '.metainfo.xml', - po_dir: meson.project_source_root() / 'po' / 'extra', - install: true, - install_dir: get_option('datadir') / 'metainfo' + input: file_name + '.metainfo.xml.in', + output: meson.project_name() + '.metainfo.xml', + po_dir: meson.project_source_root() / 'po' / 'extra', + install: true, + install_dir: get_option('datadir') / 'metainfo', ) diff --git a/meson.build b/meson.build index d54288c..7f05efe 100644 --- a/meson.build +++ b/meson.build @@ -1,100 +1,102 @@ project( - 'io.github.elework.spreadsheet', - 'vala', 'c', - version: '0.1.0', - meson_version: '>=0.59.0' + 'io.github.elework.spreadsheet', + 'vala', 'c', + version: '0.1.0', + meson_version: '>= 0.59.0', ) file_name = 'spreadsheet' i18n = import('i18n') add_global_arguments( - '-DGETTEXT_PACKAGE="@0@"'.format(meson.project_name()), - language:'c' + '-DGETTEXT_PACKAGE="@0@"'.format(meson.project_name()), + language:'c', ) config_data = configuration_data() config_data.set_quoted('LOCALEDIR', get_option('prefix') / get_option('localedir')) config_data.set_quoted('GETTEXT_PACKAGE', meson.project_name()) config_file = configure_file( - input: 'src/Config.vala.in', - output: '@BASENAME@', - configuration: config_data + input: 'src/Config.vala.in', + output: '@BASENAME@', + configuration: config_data, ) gnome = import('gnome') asresources = gnome.compile_resources( - 'as-resources', - 'data' / file_name + '.gresource.xml', - source_dir: 'data', - c_name: 'as' + 'as-resources', + 'data' / file_name + '.gresource.xml', + source_dir: 'data', + c_name: 'as', ) gnome.post_install( - glib_compile_schemas: true, - gtk_update_icon_cache: true, - update_desktop_database: true + glib_compile_schemas: true, + gtk_update_icon_cache: true, + update_desktop_database: true, ) sources = files( - 'src/AlphabetGenerator.vala', - 'src/App.vala', - 'src/Util.vala', - 'src/Functions/Basic.vala', - 'src/Functions/Geometry.vala', - 'src/Models/Cell.vala', - 'src/Models/CellStyle.vala', - 'src/Models/FontStyle.vala', - 'src/Models/Function.vala', - 'src/Models/HistoryAction.vala', - 'src/Models/Page.vala', - 'src/Models/RecentItem.vala', - 'src/Models/Spreadsheet.vala', - 'src/Services/CSV/CSVGrammar.vala', - 'src/Services/CSV/CSVParser.vala', - 'src/Services/CSV/CSVWriter.vala', - 'src/Services/Formula/AST/CallExpression.vala', - 'src/Services/Formula/AST/CellReference.vala', - 'src/Services/Formula/AST/Expression.vala', - 'src/Services/Formula/AST/NumberExpression.vala', - 'src/Services/Formula/AST/TextExpression.vala', - 'src/Services/Formula/FormulaGrammar.vala', - 'src/Services/Formula/FormulaParser.vala', - 'src/Services/FunctionManager.vala', - 'src/Services/HistoryManager.vala', - 'src/Services/Parsing/Evaluator.vala', - 'src/Services/Parsing/Grammar.vala', - 'src/Services/Parsing/Lexer.vala', - 'src/Services/Parsing/Parser.vala', - 'src/Services/Parsing/Token.vala', - 'src/Services/RecentsManager.vala', - 'src/Services/ZoomManager.vala', - 'src/UI/MainWindow.vala', - 'src/UI/WelcomeView.vala', - 'src/Widgets/ActionBar.vala', - 'src/Widgets/FunctionListRow.vala', - 'src/Widgets/RecentListRow.vala', - 'src/Widgets/RoundedSquare.vala', - 'src/Widgets/Sheet.vala', - 'src/Widgets/StyleModal.vala', + 'src/AlphabetGenerator.vala', + 'src/App.vala', + 'src/Util.vala', + 'src/Functions/Basic.vala', + 'src/Functions/Geometry.vala', + 'src/Models/Cell.vala', + 'src/Models/CellStyle.vala', + 'src/Models/FontStyle.vala', + 'src/Models/Function.vala', + 'src/Models/HistoryAction.vala', + 'src/Models/Page.vala', + 'src/Models/RecentItem.vala', + 'src/Models/Spreadsheet.vala', + 'src/Services/CSV/CSVGrammar.vala', + 'src/Services/CSV/CSVParser.vala', + 'src/Services/CSV/CSVWriter.vala', + 'src/Services/Formula/AST/CallExpression.vala', + 'src/Services/Formula/AST/CellReference.vala', + 'src/Services/Formula/AST/Expression.vala', + 'src/Services/Formula/AST/NumberExpression.vala', + 'src/Services/Formula/AST/TextExpression.vala', + 'src/Services/Formula/FormulaGrammar.vala', + 'src/Services/Formula/FormulaParser.vala', + 'src/Services/FunctionManager.vala', + 'src/Services/HistoryManager.vala', + 'src/Services/Parsing/Evaluator.vala', + 'src/Services/Parsing/Grammar.vala', + 'src/Services/Parsing/Lexer.vala', + 'src/Services/Parsing/Parser.vala', + 'src/Services/Parsing/Token.vala', + 'src/Services/RecentsManager.vala', + 'src/Services/ZoomManager.vala', + 'src/UI/MainWindow.vala', + 'src/UI/WelcomeView.vala', + 'src/Widgets/ActionBar.vala', + 'src/Widgets/FunctionListRow.vala', + 'src/Widgets/RecentListRow.vala', + 'src/Widgets/RoundedSquare.vala', + 'src/Widgets/Sheet.vala', + 'src/Widgets/StyleModal.vala', ) +dependencies = [ + dependency('gee-0.8'), + dependency('gio-2.0', version: '>= 2.74'), # GLib.ListStore.n_items + dependency('glib-2.0'), + dependency('gobject-2.0'), + dependency('granite-7'), + dependency('gtk4', version: '>= 4.10'), # Gtk.FileDialog + dependency('libadwaita-1'), + dependency('pango'), +] + executable(meson.project_name(), - asresources, - config_file, - sources, - dependencies: [ - dependency('gee-0.8'), - dependency('gio-2.0', version: '>= 2.74'), # GLib.ListStore.n_items - dependency('glib-2.0'), - dependency('gobject-2.0'), - dependency('granite-7'), - dependency('gtk4', version: '>= 4.10'), # Gtk.FileDialog - dependency('libadwaita-1'), - dependency('pango') - ], - install: true, - link_args: ['-lm'] + asresources, + config_file, + sources, + dependencies: dependencies, + install: true, + link_args: ['-lm'], ) subdir('data') diff --git a/po/extra/meson.build b/po/extra/meson.build index eced13d..60471a8 100644 --- a/po/extra/meson.build +++ b/po/extra/meson.build @@ -1,7 +1,7 @@ i18n.gettext('extra', - args: [ - '--directory=' + meson.project_source_root(), - '--from-code=UTF-8' - ], - install: false + args: [ + '--directory=' + meson.project_source_root(), + '--from-code=UTF-8', + ], + install: false, ) diff --git a/po/meson.build b/po/meson.build index 81ab97e..e51ced9 100644 --- a/po/meson.build +++ b/po/meson.build @@ -1,8 +1,8 @@ i18n.gettext(meson.project_name(), - args: [ - '--directory=' + meson.project_source_root(), - '--from-code=UTF-8' - ] + args: [ + '--directory=' + meson.project_source_root(), + '--from-code=UTF-8', + ], ) subdir('extra')