Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

While you were out... #105

Merged
merged 7 commits into from
Jul 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions meson.build
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
project('auracle', 'cpp',
version : '0',
license : 'MIT',
meson_version : '>=0.55',
meson_version : '>=0.56',
default_options : [
'cpp_std=c++17',
'warning_level=2',
Expand Down Expand Up @@ -29,7 +29,8 @@ libalpm = dependency('libalpm')
libcurl = dependency('libcurl')
libfmt = dependency('fmt',
version : '>=6.0.0',
fallback : ['fmt', 'fmt_dep'])
fallback : ['fmt', 'fmt_dep'],
static: 'true')
libsystemd = dependency('libsystemd')
gtest = dependency('gtest',
version : '>=1.10.0',
Expand All @@ -43,7 +44,9 @@ gmock = dependency('gmock',
abseil_proj = subproject(
'abseil-cpp',
default_options : [
'cpp_std=c++17',
'default_library=static',
'warning_level=0',
])
abseil = declare_dependency(
dependencies : [
Expand Down Expand Up @@ -128,13 +131,13 @@ install_data(
run_target(
'fmt',
command : [
join_paths(meson.source_root(), 'build-aux/source-format')
join_paths(meson.project_source_root(), 'build-aux/source-format')
])

run_target(
'tidy',
command : [
join_paths(meson.source_root(), 'build-aux/clang-tidy')
join_paths(meson.project_source_root(), 'build-aux/clang-tidy')
])

# unit tests
Expand Down Expand Up @@ -191,7 +194,7 @@ if py3.found() and py3.language_version().version_compare(python_requirement)
suite : 'auracle',
args : [
'-W', 'all',
join_paths(meson.source_root(), input)
join_paths(meson.project_source_root(), input)
],
env : ['PYTHONDONTWRITEBYTECODE=1'])
endforeach
Expand Down
5 changes: 2 additions & 3 deletions src/auracle/search_fragment.cc
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,9 @@ std::string_view GetSearchFragment(std::string_view input) {
}

// given 'cow?', we can't include w in the search
// Looking one character past the end of the candidate is safe because we
// know that our input is null delimited.
// see if a ? or * follows cand
auto cand = input.substr(0, span);
if (cand[span] == '?' || cand[span] == '*') {
if (input.size() > span && (input[span] == '?' || input[span] == '*')) {
cand.remove_suffix(1);
}

Expand Down
115 changes: 106 additions & 9 deletions subprojects/abseil-cpp.wrap
Original file line number Diff line number Diff line change
@@ -1,11 +1,108 @@
[wrap-file]
directory = abseil-cpp-20200225.2
directory = abseil-cpp-20230802.1
source_url = https://github.com/abseil/abseil-cpp/archive/20230802.1.tar.gz
source_filename = abseil-cpp-20230802.1.tar.gz
source_hash = 987ce98f02eefbaf930d6e38ab16aa05737234d7afbab2d5c4ea7adbe50c28ed
patch_filename = abseil-cpp_20230802.1-2_patch.zip
patch_url = https://wrapdb.mesonbuild.com/v2/abseil-cpp_20230802.1-2/get_patch
patch_hash = f6ceb55ca4b0995d826cbdefc0a37e0f8b6202d3e7ecb3436298f54d3a23942b
source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/abseil-cpp_20230802.1-2/abseil-cpp-20230802.1.tar.gz
wrapdb_version = 20230802.1-2

source_url = https://github.com/abseil/abseil-cpp/archive/20200225.2.zip
source_filename = abseil-cpp-20200225.2.zip
source_hash = f342aac71a62861ac784cadb8127d5a42c6c61ab1cd07f00aef05f2cc4988c42


patch_url = https://github.com/mesonbuild/abseil-cpp/releases/download/20200225.2-2/abseil-cpp.zip
patch_filename = abseil-cpp-20200225.2-2-wrap.zip
patch_hash = cc2bc7caab91de737637ec7f8438455836a02b444d306b447d59573991717088
[provide]
absl_base = absl_base_dep
absl_container = absl_container_dep
absl_debugging = absl_debugging_dep
absl_log = absl_log_dep
absl_flags = absl_flags_dep
absl_hash = absl_hash_dep
absl_crc = absl_crc_dep
absl_numeric = absl_numeric_dep
absl_profiling = absl_profiling_dep
absl_random = absl_random_dep
absl_status = absl_status_dep
absl_strings = absl_strings_dep
absl_synchronization = absl_synchronization_dep
absl_time = absl_time_dep
absl_types = absl_types_dep
absl_algorithm_container = absl_base_dep
absl_any_invocable = absl_base_dep
absl_bad_any_cast_impl = absl_types_dep
absl_bad_optional_access = absl_types_dep
absl_bad_variant_access = absl_types_dep
absl_bind_front = absl_base_dep
absl_city = absl_hash_dep
absl_civil_time = absl_time_dep
absl_cleanup = absl_base_dep
absl_cord = absl_strings_dep
absl_cord_internal = absl_strings_dep
absl_cordz_functions = absl_strings_dep
absl_cordz_handle = absl_strings_dep
absl_cordz_info = absl_strings_dep
absl_cordz_sample_token = absl_strings_dep
absl_core_headers = absl_base_dep
absl_crc32c = absl_crc_dep
absl_debugging_internal = absl_debugging_dep
absl_demangle_internal = absl_debugging_dep
absl_die_if_null = absl_log_dep
absl_examine_stack = absl_debugging_dep
absl_exponential_biased = absl_profiling_dep
absl_failure_signal_handler = absl_debugging_dep
absl_flags_commandlineflag = absl_flags_dep
absl_flags_commandlineflag_internal = absl_flags_dep
absl_flags_config = absl_flags_dep
absl_flags_internal = absl_flags_dep
absl_flags_marshalling = absl_flags_dep
absl_flags_parse = absl_flags_dep
absl_flags_private_handle_accessor = absl_flags_dep
absl_flags_program_name = absl_flags_dep
absl_flags_reflection = absl_flags_dep
absl_flags_usage = absl_flags_dep
absl_flags_usage_internal = absl_flags_dep
absl_flat_hash_map = absl_container_dep
absl_flat_hash_set = absl_container_dep
absl_function_ref = absl_base_dep
absl_graphcycles_internal = absl_synchronization_dep
absl_hashtablez_sampler = absl_container_dep
absl_inlined_vector = absl_container_dep
absl_int128 = absl_numeric_dep
absl_leak_check = absl_debugging_dep
absl_log_initialize = absl_log_dep
absl_log_internal_check_op = absl_log_dep
absl_log_internal_message = absl_log_dep
absl_log_severity = absl_base_dep
absl_low_level_hash = absl_hash_dep
absl_memory = absl_base_dep
absl_optional = absl_types_dep
absl_periodic_sampler = absl_profiling_dep
absl_random_bit_gen_ref = absl_random_dep
absl_random_distributions = absl_random_dep
absl_random_internal_distribution_test_util = absl_random_dep
absl_random_internal_platform = absl_random_dep
absl_random_internal_pool_urbg = absl_random_dep
absl_random_internal_randen = absl_random_dep
absl_random_internal_randen_hwaes = absl_random_dep
absl_random_internal_randen_hwaes_impl = absl_random_dep
absl_random_internal_randen_slow = absl_random_dep
absl_random_internal_seed_material = absl_random_dep
absl_random_random = absl_random_dep
absl_random_seed_gen_exception = absl_random_dep
absl_random_seed_sequences = absl_random_dep
absl_raw_hash_set = absl_container_dep
absl_raw_logging_internal = absl_base_dep
absl_scoped_set_env = absl_base_dep
absl_span = absl_types_dep
absl_spinlock_wait = absl_base_dep
absl_stacktrace = absl_debugging_dep
absl_statusor = absl_status_dep
absl_str_format = absl_strings_dep
absl_str_format_internal = absl_strings_dep
absl_strerror = absl_base_dep
absl_string_view = absl_strings_dep
absl_strings_internal = absl_strings_dep
absl_symbolize = absl_debugging_dep
absl_throw_delegate = absl_base_dep
absl_time_zone = absl_time_dep
absl_type_traits = absl_base_dep
absl_utility = absl_base_dep
absl_variant = absl_types_dep
19 changes: 11 additions & 8 deletions subprojects/fmt.wrap
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
[wrap-file]
directory = fmt-7.0.1
directory = fmt-10.2.0
source_url = https://github.com/fmtlib/fmt/archive/10.2.0.tar.gz
source_filename = fmt-10.2.0.tar.gz
source_hash = 3ca91733a7313a8ad41c0885929415f8ec0a2a31d4dc7e27e9331412f4ca26ac
patch_filename = fmt_10.2.0-2_patch.zip
patch_url = https://wrapdb.mesonbuild.com/v2/fmt_10.2.0-2/get_patch
patch_hash = 2428c3a386a8390c76378f81ef804a297f4edc3b789499dd56629b7902b8ddb7
source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/fmt_10.2.0-2/fmt-10.2.0.tar.gz
wrapdb_version = 10.2.0-2

source_url = https://github.com/fmtlib/fmt/archive/7.0.1.tar.gz
source_filename = fmt-7.0.1.tar.gz
source_hash = ac335a4ca6beaebec4ddb2bc35b9ae960b576f3b64a410ff2c379780f0cd4948

patch_url = https://github.com/mesonbuild/fmt/releases/download/7.0.1-1/fmt.zip
patch_filename = fmt-7.0.1-1-wrap.zip
patch_hash = 4fd7dc515c62ee2de1c8d7a3badce431174f29c02f36a06e257be5aa2d223592
[provide]
fmt = fmt_dep
11 changes: 7 additions & 4 deletions subprojects/nlohmann_json.wrap
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
[wrap-file]
directory = nlohmann_json-3.9.1
directory = nlohmann_json-3.11.2
lead_directory_missing = true
source_url = https://github.com/nlohmann/json/releases/download/v3.11.2/include.zip
source_filename = nlohmann_json-3.11.2.zip
source_hash = e5c7a9f49a16814be27e4ed0ee900ecd0092bfb7dbfca65b5a421b774dccaaed
wrapdb_version = 3.11.2-1

source_url = https://github.com/nlohmann/json/releases/download/v3.9.1/include.zip
source_filename = nlohmann_json-3.9.1.zip
source_hash = 6bea5877b1541d353bd77bdfbdb2696333ae5ed8f9e8cc22df657192218cad91
[provide]
nlohmann_json = nlohmann_json_dep