diff options
-rw-r--r-- | .gitignore | 5 | ||||
-rw-r--r-- | meson.build | 3 | ||||
-rw-r--r-- | plugins/smolblok_hostlist/corpus/apple.txt (renamed from subprojects/plugin_hostlist/corpus/apple.txt) | 0 | ||||
-rw-r--r-- | plugins/smolblok_hostlist/corpus/banana.txt (renamed from subprojects/plugin_hostlist/corpus/banana.txt) | 0 | ||||
-rw-r--r-- | plugins/smolblok_hostlist/corpus/kiwi.txt (renamed from subprojects/plugin_hostlist/corpus/kiwi.txt) | 0 | ||||
-rw-r--r-- | plugins/smolblok_hostlist/corpus/orange.txt (renamed from subprojects/plugin_hostlist/corpus/orange.txt) | 0 | ||||
-rw-r--r-- | plugins/smolblok_hostlist/filterlist.cpp (renamed from subprojects/plugin_hostlist/filterlist.cpp) | 0 | ||||
-rw-r--r-- | plugins/smolblok_hostlist/filterlist.h (renamed from subprojects/plugin_hostlist/filterlist.h) | 0 | ||||
-rw-r--r-- | plugins/smolblok_hostlist/meson.build (renamed from subprojects/plugin_hostlist/meson.build) | 21 | ||||
-rw-r--r-- | plugins/smolblok_hostlist/plugin/plugin.cpp (renamed from subprojects/plugin_hostlist/plugin/plugin.cpp) | 0 | ||||
-rw-r--r-- | plugins/smolblok_hostlist/plugin/plugin.h (renamed from subprojects/plugin_hostlist/plugin/plugin.h) | 0 | ||||
-rw-r--r-- | plugins/smolblok_hostlist/plugin/smolblokHostlistPlugin.json (renamed from subprojects/plugin_hostlist/plugin/smolblokHostlistPlugin.json) | 0 | ||||
-rw-r--r-- | plugins/smolblok_hostlist/test/filterlist.cpp (renamed from subprojects/plugin_hostlist/test/filterlist.cpp) | 0 | ||||
-rw-r--r-- | plugins/smolblok_hostlist/test/hostlist.txt (renamed from subprojects/plugin_hostlist/test/hostlist.txt) | 0 | ||||
-rw-r--r-- | plugins/smolblok_hostlist/test/rule.cpp (renamed from subprojects/plugin_hostlist/test/rule.cpp) | 0 | ||||
l--------- | subprojects/plugin_hostlist/include | 1 |
16 files changed, 9 insertions, 21 deletions
@@ -7,8 +7,6 @@ build* subprojects/* !subprojects/*.wrap -!subprojects/plugin_* -subprojects/plugin_*/corpus lang/*.qm tools/src/crashhandler/defaults.go @@ -16,5 +14,8 @@ tools/src/crashhandler/defaults.go .config.old compile_commands.json +# fuzzer files lib/configuration/test/corpus +plugins/*/corpus +!plugins/*/corpus/*.txt diff --git a/meson.build b/meson.build index c8f86a0..eee01a5 100644 --- a/meson.build +++ b/meson.build @@ -96,8 +96,7 @@ subdir('test/firefox-bookmarks-json-parser') subdir('test/matcherbenchmark') subdir('staging/smolblok') - -subproject('plugin_hostlist') +subdir('plugins/smolblok_hostlist') ssconfig = poi_sourceset.apply(cdata) diff --git a/subprojects/plugin_hostlist/corpus/apple.txt b/plugins/smolblok_hostlist/corpus/apple.txt index 3a8973b..3a8973b 100644 --- a/subprojects/plugin_hostlist/corpus/apple.txt +++ b/plugins/smolblok_hostlist/corpus/apple.txt diff --git a/subprojects/plugin_hostlist/corpus/banana.txt b/plugins/smolblok_hostlist/corpus/banana.txt index c30aa84..c30aa84 100644 --- a/subprojects/plugin_hostlist/corpus/banana.txt +++ b/plugins/smolblok_hostlist/corpus/banana.txt diff --git a/subprojects/plugin_hostlist/corpus/kiwi.txt b/plugins/smolblok_hostlist/corpus/kiwi.txt index 77c325c..77c325c 100644 --- a/subprojects/plugin_hostlist/corpus/kiwi.txt +++ b/plugins/smolblok_hostlist/corpus/kiwi.txt diff --git a/subprojects/plugin_hostlist/corpus/orange.txt b/plugins/smolblok_hostlist/corpus/orange.txt index 583273d..583273d 100644 --- a/subprojects/plugin_hostlist/corpus/orange.txt +++ b/plugins/smolblok_hostlist/corpus/orange.txt diff --git a/subprojects/plugin_hostlist/filterlist.cpp b/plugins/smolblok_hostlist/filterlist.cpp index a0fd414..a0fd414 100644 --- a/subprojects/plugin_hostlist/filterlist.cpp +++ b/plugins/smolblok_hostlist/filterlist.cpp diff --git a/subprojects/plugin_hostlist/filterlist.h b/plugins/smolblok_hostlist/filterlist.h index 7301f20..7301f20 100644 --- a/subprojects/plugin_hostlist/filterlist.h +++ b/plugins/smolblok_hostlist/filterlist.h diff --git a/subprojects/plugin_hostlist/meson.build b/plugins/smolblok_hostlist/meson.build index f4178c9..a3e64a7 100644 --- a/subprojects/plugin_hostlist/meson.build +++ b/plugins/smolblok_hostlist/meson.build @@ -1,30 +1,19 @@ -project('hostlistfilter', 'cpp') - -mod_qt5 = import('qt5') -dep_qt5 = dependency('qt5', - modules: [ 'Core', 'Network', 'WebEngineWidgets' ], - include_type: 'system' -) -dep_catch = dependency('catch2', required: true, fallback: ['catch2', 'catch2_dep'] ) - -smolbote_interface = include_directories('include') - lib_hostlistfilter = static_library('hostlistfilter', [ 'filterlist.cpp' ], - include_directories: smolbote_interface, + include_directories: smolbote_interfaces, dependencies: [dep_qt5] ) dep_hostlistfilter = declare_dependency( - include_directories: [ '.', smolbote_interface ], + include_directories: [ '.', smolbote_interfaces ], link_with: lib_hostlistfilter ) # plugin plugin = shared_library('smolblokHostlistPlugin', [ 'plugin/plugin.cpp', - mod_qt5.preprocess(include_directories: smolbote_interface, moc_headers: 'plugin/plugin.h', dependencies: dep_qt5) ], - include_directories: smolbote_interface, + mod_qt5.preprocess(include_directories: smolbote_interfaces, moc_headers: 'plugin/plugin.h', dependencies: dep_qt5) ], + include_directories: smolbote_interfaces, dependencies: [ dep_hostlistfilter, dep_qt5 ], install: true, install_dir: get_option('libdir')/'smolbote/plugins' @@ -45,7 +34,7 @@ test('filterlist', executable('filterlist', if meson.get_compiler('cpp').has_multi_arguments('-g', '-fsanitize=fuzzer') executable('hostlist-fuzzer', sources: 'filterlist.cpp', - include_directories: smolbote_interface, + include_directories: smolbote_interfaces, dependencies: dep_qt5, cpp_args: [ '-g', '-fsanitize=fuzzer', '-DFUZZER' ], link_args: [ '-fsanitize=fuzzer' ] diff --git a/subprojects/plugin_hostlist/plugin/plugin.cpp b/plugins/smolblok_hostlist/plugin/plugin.cpp index 28a7706..28a7706 100644 --- a/subprojects/plugin_hostlist/plugin/plugin.cpp +++ b/plugins/smolblok_hostlist/plugin/plugin.cpp diff --git a/subprojects/plugin_hostlist/plugin/plugin.h b/plugins/smolblok_hostlist/plugin/plugin.h index 53b5d36..53b5d36 100644 --- a/subprojects/plugin_hostlist/plugin/plugin.h +++ b/plugins/smolblok_hostlist/plugin/plugin.h diff --git a/subprojects/plugin_hostlist/plugin/smolblokHostlistPlugin.json b/plugins/smolblok_hostlist/plugin/smolblokHostlistPlugin.json index aa53cdd..aa53cdd 100644 --- a/subprojects/plugin_hostlist/plugin/smolblokHostlistPlugin.json +++ b/plugins/smolblok_hostlist/plugin/smolblokHostlistPlugin.json diff --git a/subprojects/plugin_hostlist/test/filterlist.cpp b/plugins/smolblok_hostlist/test/filterlist.cpp index 4aa532b..4aa532b 100644 --- a/subprojects/plugin_hostlist/test/filterlist.cpp +++ b/plugins/smolblok_hostlist/test/filterlist.cpp diff --git a/subprojects/plugin_hostlist/test/hostlist.txt b/plugins/smolblok_hostlist/test/hostlist.txt index a0b4e5c..a0b4e5c 100644 --- a/subprojects/plugin_hostlist/test/hostlist.txt +++ b/plugins/smolblok_hostlist/test/hostlist.txt diff --git a/subprojects/plugin_hostlist/test/rule.cpp b/plugins/smolblok_hostlist/test/rule.cpp index b5ba6e0..b5ba6e0 100644 --- a/subprojects/plugin_hostlist/test/rule.cpp +++ b/plugins/smolblok_hostlist/test/rule.cpp diff --git a/subprojects/plugin_hostlist/include b/subprojects/plugin_hostlist/include deleted file mode 120000 index 3611dd2..0000000 --- a/subprojects/plugin_hostlist/include +++ /dev/null @@ -1 +0,0 @@ -../../include/
\ No newline at end of file |