Simplify ViewFile callbacks

[geeqie.git] / meson.build

diff --git a/meson.build b/meson.build
index b0d2138..9d0e118 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -34,6 +34,7 @@
 # [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
@@ -134,7 +135,7 @@ helpdir = join_paths(prefix, gq_helpdir)
 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')
 
@@ -616,6 +617,9 @@ 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()]
@@ -706,18 +710,13 @@ 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)
-        modified_file_list = run_command(git_exe, 'diff', '--name-only', check: true)
-        modified_files = modified_file_list.stdout().strip().split('\n')
-
-        foreach modified_file : modified_files
-            if modified_file.endswith('.cc')
-                modified_file_path = '@0@'.format(modified_file)
-                path_array = modified_file_path.split('/')
-                modified_file_name = path_array[path_array.length() - 1]
-                modified_file_full_path = join_paths(meson.project_source_root(), modified_file)
+
+        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_ ' + modified_file_name, clang_tidy_exe, args : ['-p', './build', '-quiet', '--config-file', config_file,  modified_file_full_path], timeout : 100)
+                test('Code Correctness_ ' + source_file_name, clang_tidy_exe, args : ['-p', './build', '-quiet', '--config-file', config_file,  source_file], timeout : 100)
             endif
         endforeach
 
@@ -729,6 +728,49 @@ 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)
+    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)
+        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
+
+# 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)
+        endif
+    endforeach
+
+    summary({'Temporary Comments' : ['Test runs:', true]}, section : 'Testing', bool_yn : true)
+else
+    summary({'Temporary Comments' : ['Test runs:', false]}, section : 'Testing', bool_yn : true)
+endif
+
 # Lua test
 option = get_option('lua')
 if not option.disabled()