mirror of
https://github.com/rizinorg/rizin
synced 2026-08-22 20:26:16 -04:00
Rename .acr to .in and remove RZ_MESON_VERSION (#499)
This commit is contained in:
Riccardo Schirone
GitHub
parent
7ce7fa6acc
commit
7ec33c3cb4
6 changed files with 82 additions and 127 deletions
|
|
@ -7,11 +7,7 @@
|
|||
#include <rz_io.h>
|
||||
#include <rz_cons.h>
|
||||
#include "nxo/nxo.h"
|
||||
#ifdef RZ_MESON_VERSION
|
||||
#include <lz4.h>
|
||||
#else
|
||||
#include "../../../shlr/lz4/lz4.c"
|
||||
#endif
|
||||
|
||||
#define NSO_OFF(x) rz_offsetof(NSOHeader, x)
|
||||
#define NSO_OFFSET_MODMEMOFF rz_offsetof(NXOStart, mod_memoffset)
|
||||
|
|
|
|||
|
|
@ -1,117 +0,0 @@
|
|||
#ifndef RZ_CONFIGURE_H
|
||||
#define RZ_CONFIGURE_H
|
||||
|
||||
#include "rz_version.h"
|
||||
|
||||
#define RZ_CHECKS_LEVEL @RZ_CHECKS_LEVEL@
|
||||
#define DEBUGGER @DEBUGGER@
|
||||
#define HAVE_DECL_ADDR_NO_RANDOMIZE @HAVE_DECL_ADDR_NO_RANDOMIZE@
|
||||
#define HAVE_ARC4RANDOM_UNIFORM @HAVE_ARC4RANDOM_UNIFORM@
|
||||
#define HAVE_EXPLICIT_BZERO @HAVE_EXPLICIT_BZERO@
|
||||
#define HAVE_EXPLICIT_MEMSET @HAVE_EXPLICIT_MEMSET@
|
||||
#define HAVE_CLOCK_NANOSLEEP @HAVE_CLOCK_NANOSLEEP@
|
||||
#define HAVE_SIGACTION @HAVE_SIGACTION@
|
||||
#define HAVE_PIPE @HAVE_PIPE@
|
||||
#define HAVE_EXECV @HAVE_EXECV@
|
||||
#define HAVE_EXECVE @HAVE_EXECVE@
|
||||
#define HAVE_EXECVP @HAVE_EXECVP@
|
||||
#define HAVE_EXECL @HAVE_EXECL@
|
||||
#define HAVE_SYSTEM @HAVE_SYSTEM@
|
||||
#define HAVE_PIPE2 @HAVE_PIPE2@
|
||||
|
||||
#ifdef RZ_MESON_VERSION
|
||||
#define RZ_PREFIX "@PREFIX@"
|
||||
#define RZ_LIBDIR "@LIBDIR@"
|
||||
#define RZ_INCDIR "@INCLUDEDIR@"
|
||||
#define RZ_DATDIR "@DATADIR@"
|
||||
#define RZ_WWWROOT "@WWWROOT@"
|
||||
#define RZ_PLUGINS "@PLUGINS@"
|
||||
#define RZ_EXTRAS "@EXTRAS@"
|
||||
#define RZ_BINDINGS "@BINDINGS@"
|
||||
#define RZ_DATDIR_RZ "@DATADIR_RZ@"
|
||||
#define RZ_SDB "@SDB@"
|
||||
#define RZ_ZIGNS "@ZIGNS@"
|
||||
#define RZ_THEMES "@THEMES@"
|
||||
#define RZ_FORTUNES "@FORTUNES@"
|
||||
#define RZ_FLAGS "@FLAGS@"
|
||||
#define RZ_HUD "@HUD@"
|
||||
#else
|
||||
#if __WINDOWS__ || _MSC_VER
|
||||
#define RZ_PREFIX "."
|
||||
#define RZ_LIBDIR "lib"
|
||||
#define RZ_INCDIR "include\\librz"
|
||||
#define RZ_DATDIR "share"
|
||||
#define RZ_WWWROOT "www"
|
||||
#define RZ_PLUGINS "lib\\plugins"
|
||||
#define RZ_EXTRAS "lib\\extras"
|
||||
#define RZ_BINDINGS "lib\\bindings"
|
||||
#else
|
||||
#define RZ_PREFIX "@PREFIX@"
|
||||
#define RZ_LIBDIR "@LIBDIR@"
|
||||
#define RZ_INCDIR "@INCLUDEDIR@/librz"
|
||||
#define RZ_DATDIR "@DATADIR@"
|
||||
#define RZ_WWWROOT RZ_DATDIR "/rizin/" RZ_VERSION "/www"
|
||||
#define RZ_PLUGINS "lib/rizin/" RZ_VERSION
|
||||
#define RZ_EXTRAS "lib/rizin-extras/" RZ_VERSION
|
||||
#define RZ_BINDINGS "lib/rizin-bindings/" RZ_VERSION
|
||||
#endif
|
||||
#define RZ_DATDIR_RZ RZ_JOIN_2_PATHS ("share", "rizin")
|
||||
#define RZ_SDB RZ_JOIN_3_PATHS ("share", "rizin", RZ_VERSION)
|
||||
#define RZ_ZIGNS RZ_JOIN_4_PATHS ("share", "rizin", RZ_VERSION, "zigns")
|
||||
#define RZ_THEMES RZ_JOIN_4_PATHS ("share", "rizin", RZ_VERSION, "cons")
|
||||
#define RZ_FLAGS RZ_JOIN_4_PATHS ("share", "rizin", RZ_VERSION, "flag")
|
||||
#define RZ_FORTUNES RZ_JOIN_3_PATHS ("share", "doc", "rizin")
|
||||
#define RZ_HUD RZ_JOIN_4_PATHS ("share", "rizin", RZ_VERSION, "hud")
|
||||
#endif
|
||||
|
||||
#define RZ_SDB_FCNSIGN RZ_JOIN_2_PATHS (RZ_SDB, "fcnsign")
|
||||
#define RZ_SDB_OPCODES RZ_JOIN_2_PATHS (RZ_SDB, "opcodes")
|
||||
#define RZ_SDB_MAGIC RZ_JOIN_2_PATHS (RZ_SDB, "magic")
|
||||
#define RZ_SDB_FORMAT RZ_JOIN_2_PATHS (RZ_SDB, "format")
|
||||
|
||||
#define RZ_HOME_CONFIGDIR RZ_JOIN_2_PATHS (".config", "rizin")
|
||||
#define RZ_HOME_DATADIR RZ_JOIN_3_PATHS (".local", "share", "rizin")
|
||||
#define RZ_HOME_CACHEDIR RZ_JOIN_2_PATHS (".cache", "rizin")
|
||||
|
||||
#define RZ_HOME_THEMES RZ_JOIN_2_PATHS (RZ_HOME_DATADIR, "cons")
|
||||
#define RZ_HOME_PLUGINS RZ_JOIN_2_PATHS (RZ_HOME_DATADIR, "plugins")
|
||||
#define RZ_HOME_ZIGNS RZ_JOIN_2_PATHS (RZ_HOME_DATADIR, "zigns")
|
||||
#define RZ_HOME_PDB RZ_JOIN_2_PATHS (RZ_HOME_DATADIR, "pdb")
|
||||
#define RZ_HOME_PROJECTS RZ_JOIN_2_PATHS (RZ_HOME_DATADIR, "projects")
|
||||
#define RZ_HOME_WWWROOT RZ_JOIN_2_PATHS (RZ_HOME_DATADIR, "www")
|
||||
#define RZ_HOME_SDB_FCNSIGN RZ_JOIN_2_PATHS (RZ_HOME_DATADIR, "fcnsign")
|
||||
#define RZ_HOME_SDB_FORMAT RZ_JOIN_2_PATHS (RZ_HOME_DATADIR, "format")
|
||||
#define RZ_HOME_HUD RZ_JOIN_2_PATHS (RZ_HOME_DATADIR, "hud")
|
||||
#define RZ_HOME_BINRC RZ_JOIN_2_PATHS (RZ_HOME_DATADIR, "rc.d")
|
||||
#define RZ_HOME_BIN RZ_JOIN_3_PATHS (RZ_HOME_DATADIR, "prefix", "bin")
|
||||
|
||||
#define RZ_HOME_HISTORY RZ_JOIN_2_PATHS (RZ_HOME_CACHEDIR, "history")
|
||||
|
||||
#define RZ_HOME_RC RZ_JOIN_2_PATHS (RZ_HOME_CONFIGDIR, "rizinrc")
|
||||
#define RZ_HOME_RC_DIR RZ_JOIN_2_PATHS (RZ_HOME_CONFIGDIR, "rizinrc.d")
|
||||
#define RZ_GLOBAL_RC RZ_JOIN_2_PATHS (RZ_DATDIR_RZ, "rizinrc")
|
||||
|
||||
#define HAVE_LIB_MAGIC @HAVE_LIB_MAGIC@
|
||||
#define USE_LIB_MAGIC @USE_LIB_MAGIC@
|
||||
#define HAVE_LIB_XXHASH @HAVE_LIB_XXHASH@
|
||||
#define USE_LIB_XXHASH @USE_LIB_XXHASH@
|
||||
|
||||
#ifndef HAVE_LIB_SSL
|
||||
#define HAVE_LIB_SSL @HAVE_OPENSSL@
|
||||
#endif
|
||||
|
||||
#define HAVE_LIBUV @HAVE_LIBUV@
|
||||
|
||||
#define HAVE_PTRACE @HAVE_PTRACE@
|
||||
#define USE_PTRACE_WRAP @USE_PTRACE_WRAP@
|
||||
#define HAVE_FORK @HAVE_FORK@
|
||||
#define WANT_DYLINK @WANT_DYLINK@
|
||||
#define WITH_GPL @WITH_GPL@
|
||||
|
||||
#if __APPLE__ && __POWERPC__
|
||||
#define HAVE_JEMALLOC 0
|
||||
#else
|
||||
#define HAVE_JEMALLOC @HAVE_JEMALLOC@
|
||||
#endif
|
||||
|
||||
#endif
|
||||
78
librz/include/rz_userconf.h.in
Normal file
78
librz/include/rz_userconf.h.in
Normal file
|
|
@ -0,0 +1,78 @@
|
|||
#ifndef RZ_CONFIGURE_H
|
||||
#define RZ_CONFIGURE_H
|
||||
|
||||
#include "rz_version.h"
|
||||
|
||||
#define RZ_CHECKS_LEVEL @RZ_CHECKS_LEVEL@
|
||||
#define DEBUGGER @DEBUGGER@
|
||||
#define HAVE_DECL_ADDR_NO_RANDOMIZE @HAVE_DECL_ADDR_NO_RANDOMIZE@
|
||||
#define HAVE_ARC4RANDOM_UNIFORM @HAVE_ARC4RANDOM_UNIFORM@
|
||||
#define HAVE_EXPLICIT_BZERO @HAVE_EXPLICIT_BZERO@
|
||||
#define HAVE_EXPLICIT_MEMSET @HAVE_EXPLICIT_MEMSET@
|
||||
#define HAVE_CLOCK_NANOSLEEP @HAVE_CLOCK_NANOSLEEP@
|
||||
#define HAVE_SIGACTION @HAVE_SIGACTION@
|
||||
#define HAVE_PIPE @HAVE_PIPE@
|
||||
#define HAVE_EXECV @HAVE_EXECV@
|
||||
#define HAVE_EXECVE @HAVE_EXECVE@
|
||||
#define HAVE_EXECVP @HAVE_EXECVP@
|
||||
#define HAVE_EXECL @HAVE_EXECL@
|
||||
#define HAVE_SYSTEM @HAVE_SYSTEM@
|
||||
#define HAVE_PIPE2 @HAVE_PIPE2@
|
||||
#define HAVE_LIB_MAGIC @HAVE_LIB_MAGIC@
|
||||
#define USE_LIB_MAGIC @USE_LIB_MAGIC@
|
||||
#define HAVE_LIB_XXHASH @HAVE_LIB_XXHASH@
|
||||
#define USE_LIB_XXHASH @USE_LIB_XXHASH@
|
||||
#define HAVE_LIB_SSL @HAVE_OPENSSL@
|
||||
#define HAVE_LIBUV @HAVE_LIBUV@
|
||||
#define HAVE_PTRACE @HAVE_PTRACE@
|
||||
#define USE_PTRACE_WRAP @USE_PTRACE_WRAP@
|
||||
#define HAVE_FORK @HAVE_FORK@
|
||||
#define WANT_DYLINK @WANT_DYLINK@
|
||||
#define WITH_GPL @WITH_GPL@
|
||||
#define HAVE_JEMALLOC @HAVE_JEMALLOC@
|
||||
|
||||
#define RZ_PREFIX "@PREFIX@"
|
||||
#define RZ_LIBDIR "@LIBDIR@"
|
||||
#define RZ_INCDIR "@INCLUDEDIR@"
|
||||
#define RZ_DATDIR "@DATADIR@"
|
||||
#define RZ_WWWROOT "@WWWROOT@"
|
||||
|
||||
#define RZ_PLUGINS "@PLUGINS@"
|
||||
#define RZ_EXTRAS "@EXTRAS@"
|
||||
#define RZ_BINDINGS "@BINDINGS@"
|
||||
#define RZ_DATDIR_RZ "@DATADIR_RZ@"
|
||||
#define RZ_SDB "@SDB@"
|
||||
#define RZ_ZIGNS "@ZIGNS@"
|
||||
#define RZ_THEMES "@THEMES@"
|
||||
#define RZ_FORTUNES "@FORTUNES@"
|
||||
#define RZ_FLAGS "@FLAGS@"
|
||||
#define RZ_HUD "@HUD@"
|
||||
|
||||
#define RZ_SDB_FCNSIGN RZ_JOIN_2_PATHS(RZ_SDB, "fcnsign")
|
||||
#define RZ_SDB_OPCODES RZ_JOIN_2_PATHS(RZ_SDB, "opcodes")
|
||||
#define RZ_SDB_MAGIC RZ_JOIN_2_PATHS(RZ_SDB, "magic")
|
||||
#define RZ_SDB_FORMAT RZ_JOIN_2_PATHS(RZ_SDB, "format")
|
||||
|
||||
#define RZ_HOME_CONFIGDIR RZ_JOIN_2_PATHS(".config", "rizin")
|
||||
#define RZ_HOME_DATADIR RZ_JOIN_3_PATHS(".local", "share", "rizin")
|
||||
#define RZ_HOME_CACHEDIR RZ_JOIN_2_PATHS(".cache", "rizin")
|
||||
|
||||
#define RZ_HOME_THEMES RZ_JOIN_2_PATHS(RZ_HOME_DATADIR, "cons")
|
||||
#define RZ_HOME_PLUGINS RZ_JOIN_2_PATHS(RZ_HOME_DATADIR, "plugins")
|
||||
#define RZ_HOME_ZIGNS RZ_JOIN_2_PATHS(RZ_HOME_DATADIR, "zigns")
|
||||
#define RZ_HOME_PDB RZ_JOIN_2_PATHS(RZ_HOME_DATADIR, "pdb")
|
||||
#define RZ_HOME_PROJECTS RZ_JOIN_2_PATHS(RZ_HOME_DATADIR, "projects")
|
||||
#define RZ_HOME_WWWROOT RZ_JOIN_2_PATHS(RZ_HOME_DATADIR, "www")
|
||||
#define RZ_HOME_SDB_FCNSIGN RZ_JOIN_2_PATHS(RZ_HOME_DATADIR, "fcnsign")
|
||||
#define RZ_HOME_SDB_FORMAT RZ_JOIN_2_PATHS(RZ_HOME_DATADIR, "format")
|
||||
#define RZ_HOME_HUD RZ_JOIN_2_PATHS(RZ_HOME_DATADIR, "hud")
|
||||
#define RZ_HOME_BINRC RZ_JOIN_2_PATHS(RZ_HOME_DATADIR, "rc.d")
|
||||
#define RZ_HOME_BIN RZ_JOIN_3_PATHS(RZ_HOME_DATADIR, "prefix", "bin")
|
||||
|
||||
#define RZ_HOME_HISTORY RZ_JOIN_2_PATHS(RZ_HOME_CACHEDIR, "history")
|
||||
|
||||
#define RZ_HOME_RC RZ_JOIN_2_PATHS(RZ_HOME_CONFIGDIR, "rizinrc")
|
||||
#define RZ_HOME_RC_DIR RZ_JOIN_2_PATHS(RZ_HOME_CONFIGDIR, "rizinrc.d")
|
||||
#define RZ_GLOBAL_RC RZ_JOIN_2_PATHS(RZ_DATDIR_RZ, "rizinrc")
|
||||
|
||||
#endif
|
||||
|
|
@ -1,6 +1,5 @@
|
|||
#ifndef RZ_VERSION_H
|
||||
#define RZ_VERSION_H 1
|
||||
#define RZ_MESON_VERSION @MESON_VERSION@
|
||||
#define RZ_VERSION_MAJOR @RZ_VERSION_MAJOR@
|
||||
#define RZ_VERSION_MINOR @RZ_VERSION_MINOR@
|
||||
#define RZ_VERSION_PATCH @RZ_VERSION_PATCH@
|
||||
|
|
|
|||
|
|
@ -273,13 +273,13 @@ if host_machine.system() == 'windows'
|
|||
userconf.set('LIBDIR', rizin_libdir)
|
||||
userconf.set('INCLUDEDIR', rizin_incdir)
|
||||
userconf.set('DATADIR_RZ', rizin_datdir)
|
||||
userconf.set10('HAVE_JEMALLOC', false)
|
||||
else
|
||||
userconf.set('LIBDIR', rizin_prefix / rizin_libdir)
|
||||
userconf.set('INCLUDEDIR', rizin_prefix / rizin_incdir)
|
||||
userconf.set('DATADIR_RZ', rizin_datdir_rz)
|
||||
userconf.set10('HAVE_JEMALLOC', true)
|
||||
endif
|
||||
is_ppc = host_machine.cpu_family() == 'ppc' or host_machine.cpu_family() == 'ppc64'
|
||||
userconf.set10('HAVE_JEMALLOC', host_machine.system() != 'windows' and (host_machine.system() != 'darwin' or not is_ppc))
|
||||
userconf.set('DATADIR', rizin_prefix / rizin_datdir)
|
||||
userconf.set('WWWROOT', rizin_prefix / rizin_wwwroot)
|
||||
userconf.set('SDB', rizin_sdb)
|
||||
|
|
@ -335,7 +335,7 @@ if userconf.get('HAVE_PIPE2') == 1
|
|||
endif
|
||||
|
||||
rz_userconf_h = configure_file(
|
||||
input: 'librz/include/rz_userconf.h.acr',
|
||||
input: 'librz/include/rz_userconf.h.in',
|
||||
output: 'rz_userconf.h',
|
||||
configuration: userconf,
|
||||
install_dir: rizin_incdir
|
||||
|
|
@ -350,7 +350,6 @@ message('Version Patch: @0@0'.format(rizin_version_patch))
|
|||
message('Version GitTip: @0@0'.format(gittip))
|
||||
|
||||
versionconf = configuration_data()
|
||||
versionconf.set_quoted('MESON_VERSION', meson.version())
|
||||
versionconf.set('RZ_VERSION_MAJOR', rizin_version_major)
|
||||
versionconf.set('RZ_VERSION_MINOR', rizin_version_minor)
|
||||
versionconf.set('RZ_VERSION_PATCH', rizin_version_patch)
|
||||
|
|
@ -378,7 +377,7 @@ pcconf = configuration_data()
|
|||
pcconf.set('PREFIX', rizin_prefix)
|
||||
pcconf.set('VERSION', rizin_version)
|
||||
libr_pc = configure_file(
|
||||
input: 'librz/librz.pc.acr',
|
||||
input: 'librz/librz.pc.in',
|
||||
output: 'librz.pc',
|
||||
configuration: pcconf,
|
||||
install_dir: get_option('libdir') / 'pkgconfig'
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue