# bindir /usr/local/bin geeqie executable
# gq_bindir /usr/local/lib/geeqie * plugins scripts
# datadir /usr/local/share/
-# /usr/local/share/applications geeqie.desktop
-# [gq_]appdir /usr/local/share/geeqie/ * template.desktop
+# /usr/local/share/applications org.geeqie.Geeqie.desktop
+# [gq_]appdir /usr/local/share/geeqie/ * org,geeqie.template.desktop
# desktopdir /usr/local/share/geeqie/applications plugin desktop files
# appdatadir /usr/local/share/metainfo org.geeqie.Geeqie.appdata.xml
# icondir /usr/local/share/pixmaps geeqie.png icon
# [gq_]htmldir /usr/local/share/doc/geeqie/html * help files
# gq_localedir /usr/locale/share/locale
# mandir1 /usr/local/share/man/man1 man page
+# completionsdir /usr/local/share/bash-completion/completions bash command line completions
# podir project_root/po
# * See meson_options.txt file
'cpp',
version : run_command('./version.sh', check : true).stdout().strip(),
license : ['GPL-2.0-or-later'],
- meson_version : '>=0.56.2',
+ meson_version : '>=1.0.0',
default_options : ['cpp_std=c++14', 'warning_level=3', 'buildtype=debugoptimized', 'cpp_link_args=-rdynamic']
)
-# To inhibit warnings from the generated files icons_inline.h and ui_icons.h
+# To inhibit warnings from the generated file icons.h
add_global_arguments('-Wno-overlength-strings', language : 'c')
# To compile originally-C files as C++
add_global_arguments('-Wno-error=deprecated-declarations', language : 'cpp')
-add_global_arguments('-Wno-error=sign-compare', language : 'cpp')
-add_global_arguments('-Wno-error=return-type', language : 'cpp')
-add_global_arguments('-Wno-error=literal-suffix', language : 'cpp')
-add_global_arguments('-Wno-error=write-strings', language : 'cpp')
# Project requirements
project_sources = []
gnome = import('gnome')
thread_dep = dependency('threads')
-cc = meson.get_compiler('c')
+cc = meson.get_compiler('cpp')
i18n = import('i18n')
fs = import('fs')
configuration_inc = include_directories('.')
endif
# External programs
-gdk_pixbuf_csource = find_program('gdk-pixbuf-csource', required : true)
glib_compile_resources = find_program('glib-compile-resources', required : true)
glib_genmarshal = find_program('glib-genmarshal', required : true)
htmldir = join_paths(prefix, gq_htmldir)
icondir = join_paths(datadir, 'pixmaps')
mandir1 = join_paths(datadir, 'man', 'man1')
-
+completionsdir = join_paths(datadir, 'bash-completion', 'completions')
podir = join_paths(meson.project_source_root(), 'po')
scriptsdir = join_paths(meson.project_source_root(), 'scripts')
# Create the define constants used in the sources. Set via config.h.in
conf_data = configuration_data()
-conf_data.set_quoted('VERSION', meson.project_version())
conf_data.set('DEBUG', debug)
+conf_data.set('HAVE_GTK4', 0)
option = get_option('gtk4')
if option.enabled()
gtk_dep = dependency('gtk4', required: true)
glib_dep = dependency('glib-2.0', version : '>=2.52', required: true)
# Required only when backward-cpp is used
+conf_data.set('HAVE_DEVELOPER', 0)
libdw_dep = []
libunwind_dep = []
option = get_option('devel')
endif
# Required only for seg. fault stacktrace and backtrace debugging
+conf_data.set('HAVE_EXECINFO_H', 0)
option = get_option('execinfo')
+libexecinfo_dep = []
if not option.disabled()
result = cc.check_header('execinfo.h')
if result
+ # Include unconditionally dependency for NetBSD.
+ libexecinfo_dep = cc.find_library('execinfo', required : false)
conf_data.set('HAVE_EXECINFO_H', 1)
summary({'execinfo' : ['stacktrace supported:', true]}, section : 'Debugging', bool_yn : true)
else
summary({'execinfo' : ['stacktrace supported:', false]}, section : 'Debugging', bool_yn : true)
endif
+conf_data.set('ENABLE_UNIT_TESTS', 0)
+option = get_option('unit_tests')
+if not option.disabled()
+ conf_data.set('ENABLE_UNIT_TESTS', 1)
+ # Summary is handled below, where the test() itself is defined.
+endif
+
+conf_data.set('HAVE_ARCHIVE', 0)
libarchive_dep = []
req_version = '>=3.4.0'
option = get_option('archive')
summary({'archive' : ['disabled - archive files e.g. .zip supported:', false]}, section : 'Configuration', bool_yn : true)
endif
+conf_data.set('HAVE_LCMS', 0)
+conf_data.set('HAVE_LCMS2', 0)
lcms_dep = []
req_version = '>=2.0'
option = get_option('cms')
summary({'cms' : ['disabled - color management supported:', false]}, section : 'Configuration', bool_yn : true)
endif
+conf_data.set('HAVE_DJVU', 0)
ddjvuapi_dep = []
req_version = '>=2.5.27'
option = get_option('djvu')
endif
# Required only for seg. fault stacktrace and backtrace debugging
+conf_data.set('HAVE_EXECINFO_H', 0)
option = get_option('execinfo')
if not option.disabled()
result = cc.check_header('execinfo.h')
summary({'execinfo' : ['stacktrace supported:', false]}, section : 'Configuration', bool_yn : true)
endif
+conf_data.set('HAVE_EXIV2', 0)
exiv2_dep = []
-# See https://github.com/BestImageViewer/geeqie/issues/1090
-# for the reason for 0.28.0 exclusion
-req_version = ['>=0.11', '!=0.28.0']
-
-req_version_str = ''
-foreach req_version_str_ : req_version
- req_version_str += req_version_str_
-endforeach
-
+req_version = '>=0.18'
option = get_option('exiv2')
if not option.disabled()
exiv2_dep = dependency('exiv2', version : req_version, required : get_option('exiv2'))
conf_data.set('HAVE_EXIV2', 1)
summary({'exiv2' : ['image metadata processed by exiv2:', true]}, section : 'Configuration', bool_yn : true)
else
- summary({'exiv2' : ['exiv2 ' + req_version_str + ' not found - image data not processed by exiv2:', false]}, section : 'Configuration', bool_yn : true)
+ summary({'exiv2' : ['exiv2 ' + req_version + ' not found - image data not processed by exiv2:', false]}, section : 'Configuration', bool_yn : true)
endif
else
summary({'exiv2' : ['disabled - image data processed by exiv2:', false]}, section : 'Configuration', bool_yn : true)
endif
+conf_data.set('HAVE_CLUTTER', 0)
+conf_data.set('HAVE_LIBCHAMPLAIN', 0)
+conf_data.set('HAVE_LIBCHAMPLAIN_GTK', 0)
champlain_dep = []
champlain_gtk_dep = []
clutter_dep = []
summary({'gps-map' : ['disabled - GPS map displayed:', false]}, section : 'Configuration', bool_yn : true)
endif
+conf_data.set('HAVE_HEIF', 0)
libheif_dep = []
req_version = '>=1.3.2'
option = get_option('heif')
summary({'heif' : ['disabled - heif files supported:', false]}, section : 'Configuration', bool_yn : true)
endif
+conf_data.set('HAVE_J2K', 0)
libopenjp2_dep = []
req_version = '>=2.3.0'
option = get_option('j2k')
summary({'j2k' : ['disabled - j2k files supported:', false]}, section : 'Configuration', bool_yn : true)
endif
+conf_data.set('HAVE_JPEG', 0)
libjpeg_dep = []
option = get_option('jpeg')
if not option.disabled()
-libjpeg_dep = dependency('libjpeg', required : get_option('jpeg'))
+ libjpeg_dep = dependency('libjpeg', required : get_option('jpeg'))
if libjpeg_dep.found()
if cc.has_function('jpeg_destroy_decompress', dependencies : libjpeg_dep)
conf_data.set('HAVE_JPEG', 1)
summary({'jpeg' : ['disabled - jpeg files supported:', false]}, section : 'Configuration', bool_yn : true)
endif
+conf_data.set('HAVE_JPEGXL', 0)
libjxl_dep = []
req_version = '>=0.3.7'
option = get_option('jpegxl')
summary({'jpegxl' : ['disabled - jpegxl files supported:', false]}, section : 'Configuration', bool_yn : true)
endif
+conf_data.set('HAVE_RAW', 0)
libraw_dep = []
req_version = '>=0.20'
option = get_option('libraw')
summary({'libraw' : ['disabled - .cr3 files supported:', false]}, section : 'Configuration', bool_yn : true)
endif
+conf_data.set('HAVE_LUA', 0)
lua_dep = []
req_version = '>=5.3'
option = get_option('lua')
if not option.disabled()
- foreach name : ['lua', 'lua5.3', 'lua-5.3', 'lua53']
- lua_dep = dependency(name, version: req_version, required: get_option('lua'))
- if lua_dep.found()
- break
- endif
- endforeach
+ lua_dep = dependency('lua', 'lua5.3', 'lua-5.3', 'lua53', version: req_version, required: get_option('lua'))
if lua_dep.found()
conf_data.set('HAVE_LUA', 1)
summary({'lua' : ['lua supported:', true]}, section : 'Configuration', bool_yn : true)
summary({'lua' : ['disabled - lua supported:', false]}, section : 'Configuration', bool_yn : true)
endif
+# Install standard documents
option = get_option('pandoc')
if not option.disabled()
pandoc = find_program('pandoc', required : false)
else
summary({'README' : ['pandoc not found - README.html created:', false]}, section : 'Documentation', bool_yn : true)
endif
- install_data('README.md', 'COPYING', 'TODO', install_dir : helpdir)
else
summary({'pandoc' : ['disabled - README.html created:', false]}, section : 'Documentation', bool_yn : true)
endif
+install_data('README.md', 'COPYING', 'TODO', install_dir : helpdir)
+conf_data.set('HAVE_PDF', 0)
poppler_glib_dep = []
req_version = '>=0.62'
option = get_option('pdf')
summary({'pdf' : ['disabled - pdf files supported:', false]}, section : 'Configuration', bool_yn : true)
endif
+conf_data.set('HAVE_SPELL', 0)
gspell_dep = []
req_version = '>=1.6'
option = get_option('spell')
summary({'spell' : ['disabled - spelling checks enabled', false]}, section : 'Configuration', bool_yn : true)
endif
+conf_data.set('HAVE_TIFF', 0)
tiff_dep = []
option = get_option('tiff')
if not option.disabled()
summary({'tiff' : ['disabled - tiff files supported:', false]}, section : 'Configuration', bool_yn : true)
endif
+conf_data.set('HAVE_FFMPEGTHUMBNAILER', 0)
+conf_data.set('HAVE_FFMPEGTHUMBNAILER_METADATA', 0)
+conf_data.set('HAVE_FFMPEGTHUMBNAILER_RGB', 0)
+conf_data.set('HAVE_FFMPEGTHUMBNAILER_WH', 0)
libffmpegthumbnailer_dep = []
req_version = '>=2.1.0'
option = get_option('videothumbnailer')
summary({'videothumbnailer' : ['disabled -thumbnails of video files supported', false]}, section : 'Configuration', bool_yn : true)
endif
-# libpixbufloader-webp is not loaded as part of libgdk-pixbuf. Just issue
-# a warning if not installed
-libwebp_dir = dependency('gdk-pixbuf-2.0', method: 'pkg-config').get_variable(pkgconfig: 'gdk_pixbuf_moduledir', internal: 'gdk_pixbuf_moduledir')
-
-if libwebp_dir.contains('loaders')
- libwebp_dep = cc.find_library('pixbufloader-webp', dirs : libwebp_dir, required : false)
+conf_data.set('HAVE_WEBP', 0)
+libwebp_dep = []
+req_version = '>=0.6.1'
+option = get_option('webp')
+if not option.disabled()
+ libwebp_dep = dependency('libwebp', version : req_version, required : get_option('webp'))
if libwebp_dep.found()
+ conf_data.set('HAVE_WEBP', 1)
summary({'webp' : ['webp files supported:', true]}, section : 'Configuration', bool_yn : true)
else
- summary({'webp' : ['webp-pixbuf-loader not installed - webp files supported:', false]}, section : 'Configuration', bool_yn : true)
+ summary({'webp' : ['libwebp ' + req_version + ' not found - webp files supported:', false]}, section : 'Configuration', bool_yn : true)
endif
else
- summary({'webp' : ['webp-pixbuf-loader not installed - webp files supported:', false]}, section : 'Configuration', bool_yn : true)
+ summary({'webp' : ['disabled - webp files supported:', false]}, section : 'Configuration', bool_yn : true)
endif
# Check for nl_langinfo and _NL_TIME_FIRST_WEEKDAY
+conf_data.set('HAVE__NL_TIME_FIRST_WEEKDAY', 0)
code = '''#include <langinfo.h>
#include<stdio.h>
int main (int argc, char ** argv) {
encoding : 'UTF-8',
configuration : conf_data)
-# For shellcheck on scripts
-script_sources = []
-subdir('scripts')
+# For gtk builder checks on .ui files
+ui_sources = []
# Process subdirs before the sources
subdir('po')
subdir('plugins')
+conditional_unit_test_deps = []
+if conf_data.get('ENABLE_UNIT_TESTS', 0) == 1
+ system_gtest_dep = dependency('gtest', main : false, required : false)
+ system_gmock_dep = dependency('gmock', required : false)
+ if system_gtest_dep.found() and system_gmock_dep.found()
+ conditional_unit_test_deps += system_gtest_dep
+ conditional_unit_test_deps += system_gmock_dep
+ else
+ # Use the subproject gtest as a fallback.
+ gtest_subproj = subproject('gtest')
+ conditional_unit_test_deps += gtest_subproj.get_variable('gtest_dep')
+ conditional_unit_test_deps += gtest_subproj.get_variable('gmock_dep')
+ endif
+endif
+
# Generate the executable
subdir('src')
# Generate the help files
subdir('doc')
+# Generate the command line auto-complete file
+subdir('auto-complete')
+
# Install other project files
if running_from_git
cmd = [find_program('gen_changelog.sh'), meson.current_source_dir(), meson.current_build_dir()]
install_data('geeqie.1', install_dir : mandir1)
i18n.merge_file(
- input : 'geeqie.desktop.in',
- output : 'geeqie.desktop',
+ input : 'org.geeqie.Geeqie.desktop.in',
+ output : 'org.geeqie.Geeqie.desktop',
type : 'desktop',
po_dir : podir,
install : true,
configure_file(input: 'geeqie.spec.in', output: 'geeqie.spec', configuration: conf_data)
+isolate_test_sh = find_program('isolate-test.sh', dirs : scriptsdir, required : true)
+
# Basic test of the executable
xvfb = find_program('xvfb-run', required : false)
if xvfb.found()
- test('Basic test', xvfb, args: ['--auto-servernum', geeqie_exe, '--version'], timeout: 100)
+ test_cmd = [xvfb.full_path(), '--auto-servernum', geeqie_exe.full_path(), '--version']
+ test('Basic test', isolate_test_sh, args: test_cmd, timeout: 100, suite: 'functional')
summary({'xvfb' : ['Test runs:', true]}, section : 'Testing', bool_yn : true)
else
summary({'xvfb' : ['Test runs:', false]}, section : 'Testing', bool_yn : true)
endif
-# Shellcheck
-shellcheck_exe = find_program('shellcheck', required : false)
-script_sources += files('gen_changelog.sh',
-'geeqie-install-debian.sh',
-'version.sh')
+# The tests are run on GitHub with all options disabled, and then
+# Image tests use option devel as a flag so that normal users do not
+# download the test image database.
+
+# Image checks
+option = get_option('devel')
+if option.enabled()
+ if xvfb.found()
+ get_test_images_sh = find_program('get-test-images.sh', dirs : scriptsdir, required : true)
+ image_test_sh = find_program('image-test.sh', dirs : scriptsdir, required : true)
+
+ images_dir = join_paths(meson.current_build_dir(), 'test-images.p')
+
+ message('Downloading test images')
+ sources_list = run_command(get_test_images_sh, images_dir, 'https://github.com/caclark/geeqie-test.git', check: true)
+
+ sources = sources_list.stdout().strip().split('\n')
+
+ foreach image : sources
+ path_array = image.split('/')
+ image_name = path_array[path_array.length() - 1]
+
+ should_fail = image_name.startswith('fail')
+ test_cmd = [image_test_sh.full_path(), geeqie_exe.full_path(), image]
+ test('Image_ ' + image_name, isolate_test_sh, args: test_cmd, should_fail : should_fail, timeout: 100, suite: ['functional', 'image'])
+ endforeach
+ summary({'Image tests' : ['Test runs:', true]}, section : 'Testing', bool_yn : true)
+ else
+ summary({'Image tests' : ['Test runs:', false]}, section : 'Testing', bool_yn : true)
+ endif
+else
+ summary({'Image tests' : ['Test runs:', false]}, section : 'Testing', bool_yn : true)
+endif
+
+# Code correctness checks
+if running_from_git
+ clang_tidy_exe = find_program('clang-tidy', required : false)
+ if clang_tidy_exe.found()
+ git_exe = find_program('git', required : true)
+
+ foreach source_file : main_sources + pan_view_sources + view_file_sources
+ if fs.name(source_file).endswith('.cc')
+ source_file_name = fs.name(source_file)
+ config_file = join_paths(meson.project_source_root(), '.clang-tidy')
+
+ test('Code Correctness_ ' + source_file_name, clang_tidy_exe, args : ['-p', './build', '-quiet', '--config-file', config_file, source_file], timeout : 100, suite : 'analysis')
+ endif
+ endforeach
+
+ summary({'Code Correctness' : ['Test runs:', true]}, section : 'Testing', bool_yn : true)
+ else
+ summary({'Code Correctness' : ['Test runs:', false]}, section : 'Testing', bool_yn : true)
+ endif
+else
+ summary({'Code Correctness' : ['Test runs:', false]}, section : 'Testing', bool_yn : true)
+endif
+
+# Single value enum checks
+enum_check_sh = find_program('enum-check.sh', dirs : scriptsdir, required : true)
+if enum_check_sh.found()
+ foreach source_file : main_sources + pan_view_sources + view_file_sources
+ source_file_name = fs.name(source_file)
+ test('Single Value enum_ ' + source_file_name, enum_check_sh, args : [source_file], timeout : 100, suite : 'analysis')
+ endforeach
+
+ summary({'Single Value enum' : ['Test runs:', true]}, section : 'Testing', bool_yn : true)
+else
+ summary({'Single Value enum' : ['Test runs:', false]}, section : 'Testing', bool_yn : true)
+endif
+
+# Debug statement checks
+debug_check_sh = find_program('debug-check.sh', dirs : scriptsdir, required : true)
+if debug_check_sh.found()
+ foreach source_file : main_sources + pan_view_sources + view_file_sources
+ source_file_name = fs.name(source_file)
+ if (source_file_name != 'debug.h')
+ test('Debug Statements_ ' + source_file_name, debug_check_sh, args : [source_file], timeout : 100, suite : 'analysis')
+ endif
+ endforeach
+
+ summary({'Debug Statements' : ['Test runs:', true]}, section : 'Testing', bool_yn : true)
+else
+ summary({'Debug Statements' : ['Test runs:', false]}, section : 'Testing', bool_yn : true)
+endif
-if shellcheck_exe.found()
- foreach script : script_sources
- test('Shellcheck', shellcheck_exe, args: ['--norc', '--shell=sh', '--enable=add-default-case,avoid-nullary-conditions,check-unassigned-uppercase,deprecate-which,quote-safe-variables', script], timeout: 100)
+# Temporary comments checks
+tmp_comments_check_sh = find_program('temporary-comments-check.sh', dirs : scriptsdir, required : true)
+if tmp_comments_check_sh.found()
+ foreach source_file : main_sources + pan_view_sources + view_file_sources
+ source_file_name = fs.name(source_file)
+ if (source_file_name != 'debug.h')
+ test('Temporary Comments_ ' + source_file_name, tmp_comments_check_sh, args : [source_file], timeout : 100, suite : 'analysis')
+ endif
endforeach
- summary({'shellcheck' : ['Test runs:', true]}, section : 'Testing', bool_yn : true)
+
+ summary({'Temporary Comments' : ['Test runs:', true]}, section : 'Testing', bool_yn : true)
+else
+ summary({'Temporary Comments' : ['Test runs:', false]}, section : 'Testing', bool_yn : true)
+endif
+
+# Untranslated text checks
+untranslated_text_sh = find_program('untranslated-text.sh', dirs : scriptsdir, required : true)
+if untranslated_text_sh.found()
+ foreach source_file : main_sources + pan_view_sources + view_file_sources
+ if fs.name(source_file).endswith('.cc')
+ source_file_name = fs.name(source_file)
+ test('Untranslated Text_ ' + source_file_name, untranslated_text_sh, args : [source_file], timeout : 200, suite : 'analysis')
+ endif
+ endforeach
+
+ summary({'Untranslated Text' : ['Test runs:', true]}, section : 'Testing', bool_yn : true)
+else
+ summary({'Untranslated Text' : ['Test runs:', false]}, section : 'Testing', bool_yn : true)
+endif
+
+# Lua test
+option = get_option('lua')
+if not option.disabled()
+ if lua_dep.found()
+ if xvfb.found()
+ lua_test_sh = find_program('lua-test.sh', dirs : scriptsdir, required : true)
+ test('Lua test', isolate_test_sh, args: [lua_test_sh.full_path(), geeqie_exe.full_path()], timeout: 100, suite : 'analysis')
+
+ summary({'lua' : ['Test runs:', true]}, section : 'Testing', bool_yn : true)
+ else
+ summary({'lua' : ['Test runs:', false]}, section : 'Testing', bool_yn : true)
+ endif
+ else
+ summary({'lua' : ['Test runs:', false]}, section : 'Testing', bool_yn : true)
+ endif
+else
+ summary({'lua' : ['Test runs:', false]}, section : 'Testing', bool_yn : true)
+endif
+
+# Ancillary files test
+test_ancillary_files_sh = find_program('test-ancillary-files.sh', dirs : scriptsdir, required : true)
+test('Ancillary files', test_ancillary_files_sh, args: [meson.current_source_dir()], timeout: 100, suite : 'analysis')
+
+summary({'Ancillary files' : ['Test runs:', true]}, section : 'Testing', bool_yn : true)
+
+# Unit tests
+if conf_data.get('ENABLE_UNIT_TESTS', 0) == 1
+ test('Unit tests', isolate_test_sh, args: [geeqie_exe.full_path(), '--run-unit-tests'], suite : 'unit')
+ summary({'unit_tests' : ['Tests run:', true]}, section : 'Testing', bool_yn : true)
else
- summary({'shellcheck' : ['Test runs:', false]}, section : 'Testing', bool_yn : true)
+ summary({'unit_tests' : ['Tests run:', false]}, section : 'Testing', bool_yn : true)
endif