From b914887fcd382805759ed927ffb879d7b1cad7dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergi=20=C3=80lvarez=20i=20Capilla?= Date: Thu, 24 Mar 2022 15:07:58 +0100 Subject: [PATCH] Add missing r_util/r_token.h file for meson builds --- libr/meson.build | 238 ++++++++++++++++++++++++----------------------- 1 file changed, 120 insertions(+), 118 deletions(-) diff --git a/libr/meson.build b/libr/meson.build index 83f389b32a876..97d73e3d4a65f 100644 --- a/libr/meson.build +++ b/libr/meson.build @@ -455,13 +455,13 @@ parse_plugins += [ 'arm_pseudo', 'avr_pseudo', 'chip8_pseudo', - 'tms320_pseudo', 'dalvik_pseudo', 'm68k_pseudo', 'mips_pseudo', 'ppc_pseudo', - 'sh_pseudo', 'riscv_pseudo', + 'sh_pseudo', + 'tms320_pseudo', 'v850_pseudo', 'wasm_pseudo', 'x86_pseudo', @@ -471,116 +471,117 @@ parse_plugins += [ endif include_files = [ - join_paths('include','r2naked.h'), - join_paths('include','r_agraph.h'), - join_paths('include','r_anal.h'), - join_paths('include','r_codemeta.h'), - join_paths('include','r_asm.h'), - join_paths('include','r_bind.h'), - join_paths('include','r_getopt.h'), - join_paths('include','r_bin_dwarf.h'), - join_paths('include','r_bin.h'), - join_paths('include','r_bp.h'), - join_paths('include','r_cmd.h'), - join_paths('include','r_config.h'), - join_paths('include','r_cons.h'), - join_paths('include','r_core.h'), - join_paths('include','r_crypto.h'), - join_paths('include','r_debug.h'), - join_paths('include','r_egg.h'), - join_paths('include','r_main.h'), - join_paths('include','r_endian.h'), - join_paths('include','r_flag.h'), - join_paths('include','r_flist.h'), - join_paths('include','r_fs.h'), - join_paths('include','r_hash.h'), - join_paths('include','r_heap_glibc.h'), - join_paths('include','r_heap_jemalloc.h'), - join_paths('include','r_io.h'), - join_paths('include','r_lang.h'), - join_paths('include','r_lib.h'), - join_paths('include','r_list.h'), - join_paths('include','r_magic.h'), - join_paths('include','r_parse.h'), - join_paths('include','r_pdb.h'), - join_paths('include','r_qrcode.h'), - join_paths('include','r_regex.h'), - join_paths('include','r_reg.h'), - join_paths('include','r_search.h'), - join_paths('include','r_sign.h'), - join_paths('include','r_skiplist.h'), - join_paths('include','r_socket.h'), - join_paths('include','r_syscall.h'), - join_paths('include','r_th.h'), - join_paths('include','r_types_overflow.h'), - join_paths('include','r_types_base.h'), - join_paths('include','r_types.h'), - join_paths('include','r_util.h'), - join_paths('include','r_vector.h'), - join_paths('include','r_skyline.h'), + join_paths('include/r2naked.h'), + join_paths('include/r_agraph.h'), + join_paths('include/r_anal.h'), + join_paths('include/r_asm.h'), + join_paths('include/r_bin.h'), + join_paths('include/r_bin_dwarf.h'), + join_paths('include/r_bind.h'), + join_paths('include/r_bp.h'), + join_paths('include/r_cmd.h'), + join_paths('include/r_codemeta.h'), + join_paths('include/r_config.h'), + join_paths('include/r_cons.h'), + join_paths('include/r_core.h'), + join_paths('include/r_crypto.h'), + join_paths('include/r_debug.h'), + join_paths('include/r_egg.h'), + join_paths('include/r_endian.h'), + join_paths('include/r_flag.h'), + join_paths('include/r_flist.h'), + join_paths('include/r_fs.h'), + join_paths('include/r_getopt.h'), + join_paths('include/r_hash.h'), + join_paths('include/r_heap_glibc.h'), + join_paths('include/r_heap_jemalloc.h'), + join_paths('include/r_io.h'), + join_paths('include/r_lang.h'), + join_paths('include/r_lib.h'), + join_paths('include/r_list.h'), + join_paths('include/r_magic.h'), + join_paths('include/r_main.h'), + join_paths('include/r_parse.h'), + join_paths('include/r_pdb.h'), + join_paths('include/r_qrcode.h'), + join_paths('include/r_reg.h'), + join_paths('include/r_regex.h'), + join_paths('include/r_search.h'), + join_paths('include/r_sign.h'), + join_paths('include/r_skiplist.h'), + join_paths('include/r_skyline.h'), + join_paths('include/r_socket.h'), + join_paths('include/r_syscall.h'), + join_paths('include/r_th.h'), + join_paths('include/r_types.h'), + join_paths('include/r_types_base.h'), + join_paths('include/r_types_overflow.h'), + join_paths('include/r_util.h'), + join_paths('include/r_vector.h'), ] install_headers(include_files, install_dir: r2_incdir) r_util_files = [ - join_paths('include','r_util','pj.h'), - join_paths('include','r_util','r_ascii_table.h'), - join_paths('include','r_util','r_asn1.h'), - join_paths('include','r_util','r_assert.h'), - join_paths('include','r_util','r_axml.h'), - join_paths('include','r_util','r_protobuf.h'), - join_paths('include','r_util','r_base64.h'), - join_paths('include','r_util','r_base91.h'), - join_paths('include','r_util','r_big.h'), - join_paths('include','r_util','r_bitmap.h'), - join_paths('include','r_util','r_buf.h'), - join_paths('include','r_util','r_cache.h'), - join_paths('include','r_util','r_ctypes.h'), - join_paths('include','r_util','r_debruijn.h'), - join_paths('include','r_util','r_event.h'), - join_paths('include','r_util','r_diff.h'), - join_paths('include','r_util','r_file.h'), - join_paths('include','r_util','r_graph.h'), - join_paths('include','r_util','bplist.h'), - join_paths('include','r_util','r_graph_drawable.h'), - join_paths('include','r_util','r_hex.h'), - join_paths('include','r_util','r_idpool.h'), - join_paths('include','r_util','r_itv.h'), - join_paths('include','r_util','r_json.h'), - join_paths('include','r_util','r_log.h'), - join_paths('include','r_util','r_mem.h'), - join_paths('include','r_util','r_name.h'), - join_paths('include','r_util','r_new_rbtree.h'), - join_paths('include','r_util','r_num.h'), - join_paths('include','r_util','r_panels.h'), - join_paths('include','r_util','r_table.h'), - join_paths('include','r_util','r_pkcs7.h'), - join_paths('include','r_util','r_pool.h'), - join_paths('include','r_util','r_print.h'), - join_paths('include','r_util','r_punycode.h'), - join_paths('include','r_util','r_queue.h'), - join_paths('include','r_util','r_range.h'), - join_paths('include','r_util','r_rbtree.h'), - join_paths('include','r_util','r_intervaltree.h'), - join_paths('include','r_util','r_sandbox.h'), - join_paths('include','r_util','r_signal.h'), - join_paths('include','r_util','r_spaces.h'), - join_paths('include','r_util','r_stack.h'), - join_paths('include','r_util','r_strbuf.h'), - join_paths('include','r_util','r_str.h'), - join_paths('include','r_util','r_strpool.h'), - join_paths('include','r_util','r_str_constpool.h'), - join_paths('include','r_util','r_str_util.h'), - join_paths('include','r_util','r_sys.h'), - join_paths('include','r_util','r_alloc.h'), - join_paths('include','r_util','r_time.h'), - join_paths('include','r_util','r_tree.h'), - join_paths('include','r_util','r_uleb128.h'), - join_paths('include','r_util','r_w32.h'), - join_paths('include','r_util','r_utf16.h'), - join_paths('include','r_util','r_utf32.h'), - join_paths('include','r_util','r_utf8.h'), - join_paths('include','r_util','r_w32dw.h'), - join_paths('include','r_util','r_x509.h') + join_paths('include/r_util/bplist.h'), + join_paths('include/r_util/pj.h'), + join_paths('include/r_util/r_alloc.h'), + join_paths('include/r_util/r_ascii_table.h'), + join_paths('include/r_util/r_asn1.h'), + join_paths('include/r_util/r_assert.h'), + join_paths('include/r_util/r_axml.h'), + join_paths('include/r_util/r_base64.h'), + join_paths('include/r_util/r_base91.h'), + join_paths('include/r_util/r_big.h'), + join_paths('include/r_util/r_bitmap.h'), + join_paths('include/r_util/r_buf.h'), + join_paths('include/r_util/r_cache.h'), + join_paths('include/r_util/r_ctypes.h'), + join_paths('include/r_util/r_debruijn.h'), + join_paths('include/r_util/r_diff.h'), + join_paths('include/r_util/r_event.h'), + join_paths('include/r_util/r_file.h'), + join_paths('include/r_util/r_graph.h'), + join_paths('include/r_util/r_graph_drawable.h'), + join_paths('include/r_util/r_hex.h'), + join_paths('include/r_util/r_idpool.h'), + join_paths('include/r_util/r_intervaltree.h'), + join_paths('include/r_util/r_itv.h'), + join_paths('include/r_util/r_json.h'), + join_paths('include/r_util/r_log.h'), + join_paths('include/r_util/r_mem.h'), + join_paths('include/r_util/r_name.h'), + join_paths('include/r_util/r_new_rbtree.h'), + join_paths('include/r_util/r_num.h'), + join_paths('include/r_util/r_panels.h'), + join_paths('include/r_util/r_pkcs7.h'), + join_paths('include/r_util/r_pool.h'), + join_paths('include/r_util/r_print.h'), + join_paths('include/r_util/r_protobuf.h'), + join_paths('include/r_util/r_punycode.h'), + join_paths('include/r_util/r_queue.h'), + join_paths('include/r_util/r_range.h'), + join_paths('include/r_util/r_rbtree.h'), + join_paths('include/r_util/r_sandbox.h'), + join_paths('include/r_util/r_signal.h'), + join_paths('include/r_util/r_spaces.h'), + join_paths('include/r_util/r_stack.h'), + join_paths('include/r_util/r_str.h'), + join_paths('include/r_util/r_str_constpool.h'), + join_paths('include/r_util/r_str_util.h'), + join_paths('include/r_util/r_strbuf.h'), + join_paths('include/r_util/r_strpool.h'), + join_paths('include/r_util/r_sys.h'), + join_paths('include/r_util/r_table.h'), + join_paths('include/r_util/r_time.h'), + join_paths('include/r_util/r_token.h'), + join_paths('include/r_util/r_tree.h'), + join_paths('include/r_util/r_uleb128.h'), + join_paths('include/r_util/r_utf16.h'), + join_paths('include/r_util/r_utf32.h'), + join_paths('include/r_util/r_utf8.h'), + join_paths('include/r_util/r_w32.h'), + join_paths('include/r_util/r_w32dw.h'), + join_paths('include/r_util/r_x509.h') ] install_headers(r_util_files, install_dir: join_paths(r2_incdir, 'r_util')) @@ -590,19 +591,19 @@ r_crypto_files = [ install_headers(r_crypto_files, install_dir: join_paths(r2_incdir, 'r_crypto')) sflib_common_files = [ - join_paths('include','sflib','common','sftypes.h'), - join_paths('include','sflib','common','sfsocketcall.h') + join_paths('include/sflib/common/sftypes.h'), + join_paths('include/sflib/common/sfsocketcall.h') ] sflib_arch = [ - 'linux-x86-64', - 'linux-x86-32', - 'linux-arm-64', - 'linux-arm-32', - 'darwin-x86-64', - 'darwin-x86-32', 'darwin-arm-64', - 'freebsd-x86-32' + 'darwin-x86-32', + 'darwin-x86-64', + 'freebsd-x86-32', + 'linux-arm-32', + 'linux-arm-64', + 'linux-x86-32', + 'linux-x86-64', ] sflib_arch_files = [ @@ -614,7 +615,8 @@ sflib_arch_files = [ install_headers(sflib_common_files, install_dir: join_paths(r2_incdir, 'sflib', 'common')) foreach arch : sflib_arch foreach file : sflib_arch_files - install_headers(join_paths('include', 'sflib', arch, file), install_dir: join_paths(r2_incdir, 'sflib', arch)) + dst = join_paths('include', 'sflib', arch, file) + install_headers(dst, install_dir: join_paths(r2_incdir, 'sflib', arch)) endforeach endforeach