Rationalize shellchecks in meson.build

diff --git a/doc/meson.build b/doc/meson.build
index 11e7fa3..d7d7790 100644 (file)
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -50,3 +50,6 @@ if running_from_git
         summary({'lua-api' : ['disabled - lua-api help file created:', false]}, section : 'Documentation', bool_yn : true)
     endif
 endif
+
+script_sources += files('create-doxygen-lua-api.sh',
+'create-shortcuts-xml.sh')

diff --git a/meson.build b/meson.build
index f594ae7..e4ac6d4 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -583,6 +583,10 @@ configure_file(input : 'config.h.in',
                encoding : 'UTF-8',
                configuration : conf_data)
 
+# For shellcheck on scripts
+script_sources = []
+subdir('scripts')
+
 # Process subdirs before the sources
 subdir('po')
 subdir('plugins')
@@ -642,36 +646,9 @@ endif
 
 # Shellcheck
 shellcheck_exe = find_program('shellcheck', required : false)
-script_sources = files('./doc/create-doxygen-lua-api.sh',
-'./doc/create-shortcuts-xml.sh',
-'./gen_changelog.sh',
-'./geeqie-install-debian.sh',
-'./plugins/camera-import/geeqie-camera-import',
-'./plugins/camera-import/geeqie-camera-import-hook-script',
-'./plugins/export-jpeg/geeqie-export-jpeg',
-'./plugins/image-crop/geeqie-image-crop',
-'./plugins/random-image/geeqie-random-image',
-'./plugins/rotate/geeqie-rotate',
-'./plugins/symlink/geeqie-symlink',
-'./plugins/tethered-photography/geeqie-tethered-photography',
-'./plugins/tethered-photography/geeqie-tethered-photography-hook-script',
-'./po/gen_translations_stats.sh',
-'./po/regen_potfiles.sh',
-'./scripts/authors.sh',
-'./scripts/check-compiles.sh',
-'./scripts/doxygen-help.sh',
-'./scripts/doxygen.sh',
-'./scripts/generate-ClayRGB1998-icc-h.sh',
-'./scripts/generate-appimage.sh',
-'./scripts/generate-linuxdeploy-for-arm.sh',
-'./scripts/generate-man-page.sh',
-'./scripts/keyword_merge.sh',
-'./scripts/new-release.sh',
-'./scripts/template-desktop.sh',
-'./scripts/translators.sh',
-'./scripts/untranslated-text.sh',
-'./scripts/web-help.sh',
-'./version.sh',)
+script_sources += files('gen_changelog.sh',
+'geeqie-install-debian.sh',
+'version.sh')
 
 if shellcheck_exe.found()
     foreach script : script_sources

diff --git a/plugins/camera-import/meson.build b/plugins/camera-import/meson.build
index e60f2d2..9920664 100644 (file)
--- a/plugins/camera-import/meson.build
+++ b/plugins/camera-import/meson.build
@@ -20,3 +20,6 @@ i18n.merge_file(
     po_dir : podir,
     install : true,
     install_dir : desktopdir)
+
+script_sources += files('geeqie-camera-import',
+'geeqie-camera-import-hook-script')

diff --git a/plugins/export-jpeg/meson.build b/plugins/export-jpeg/meson.build
index 65af68d..14c6983 100644 (file)
--- a/plugins/export-jpeg/meson.build
+++ b/plugins/export-jpeg/meson.build
@@ -20,3 +20,5 @@ i18n.merge_file(
     po_dir : podir,
     install : true,
     install_dir : desktopdir)
+
+script_sources += files('geeqie-export-jpeg')

diff --git a/plugins/image-crop/meson.build b/plugins/image-crop/meson.build
index 9df7e32..a293716 100644 (file)
--- a/plugins/image-crop/meson.build
+++ b/plugins/image-crop/meson.build
@@ -20,3 +20,5 @@ i18n.merge_file(
     po_dir : podir,
     install : true,
     install_dir : desktopdir)
+
+script_sources += files('geeqie-image-crop')

diff --git a/plugins/random-image/meson.build b/plugins/random-image/meson.build
index 9b7f1f3..9a6070a 100644 (file)
--- a/plugins/random-image/meson.build
+++ b/plugins/random-image/meson.build
@@ -20,3 +20,5 @@ i18n.merge_file(
     po_dir : podir,
     install : true,
     install_dir : desktopdir)
+
+script_sources += files('geeqie-random-image')

diff --git a/plugins/rotate/meson.build b/plugins/rotate/meson.build
index 5d6f3b5..f815525 100644 (file)
--- a/plugins/rotate/meson.build
+++ b/plugins/rotate/meson.build
@@ -20,3 +20,5 @@ i18n.merge_file(
     po_dir : podir,
     install : true,
     install_dir : desktopdir)
+
+script_sources += files('geeqie-rotate')

diff --git a/plugins/symlink/meson.build b/plugins/symlink/meson.build
index 989b99f..f4e7bc5 100644 (file)
--- a/plugins/symlink/meson.build
+++ b/plugins/symlink/meson.build
@@ -20,3 +20,5 @@ i18n.merge_file(
     po_dir : podir,
     install : true,
     install_dir : desktopdir)
+
+script_sources += files('geeqie-symlink')

diff --git a/plugins/tethered-photography/meson.build b/plugins/tethered-photography/meson.build
index 6332622..26a5c71 100644 (file)
--- a/plugins/tethered-photography/meson.build
+++ b/plugins/tethered-photography/meson.build
@@ -20,3 +20,6 @@ i18n.merge_file(
     po_dir : podir,
     install : true,
     install_dir : desktopdir)
+
+script_sources += files('geeqie-tethered-photography',
+'geeqie-tethered-photography-hook-script')

diff --git a/po/meson.build b/po/meson.build
index f6801e4..6b4979f 100644 (file)
--- a/po/meson.build
+++ b/po/meson.build
@@ -70,3 +70,6 @@ translator_resources = custom_target('translator_resources',
                 command : [translators_sh, '@PRIVATE_DIR@', po_source_list, meson.current_build_dir() , '@INPUT0@', '@INPUT1@'])
 
 project_sources += translator_resources
+
+script_sources += files('gen_translations_stats.sh',
+'regen_potfiles.sh')

diff --git a/scripts/meson.build b/scripts/meson.build
new file mode 100644 (file)
index 0000000..dd33fd7
--- /dev/null
+++ b/scripts/meson.build
@@ -0,0 +1,28 @@
+# This file is a part of Geeqie project (https://www.geeqie.org/).
+# Copyright (C) 2008 - 2023 The Geeqie Team
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+script_sources += files('authors.sh',
+'check-compiles.sh',
+'doxygen-help.sh',
+'doxygen.sh',
+'generate-ClayRGB1998-icc-h.sh',
+'generate-appimage.sh',
+'generate-linuxdeploy-for-arm.sh',
+'generate-man-page.sh',
+'keyword_merge.sh',
+'new-release.sh',
+'template-desktop.sh',
+'translators.sh',
+'untranslated-text.sh',
+'web-help.sh')
+