Add some Jam files and merge rsign into ranal

This commit is contained in:
pancake 2013-12-31 05:30:39 +01:00
parent 6fe529ab5c
commit dba63fbd3c
28 changed files with 81 additions and 32 deletions

2
configure vendored
View File

@ -459,7 +459,7 @@ for A in ${ENVWORDS} ; do
SEDFLAGS="${SEDFLAGS}s,@${A}@,${VAR},g;"
done
SEDFLAGS="${SEDFLAGS}'"
for A in ./config-user.mk libr/include/r_userconf.h pkgcfg/r_io.pc pkgcfg/r_db.pc pkgcfg/r_magic.pc pkgcfg/r_asm.pc pkgcfg/r_bin.pc pkgcfg/r_anal.pc pkgcfg/r_hash.pc pkgcfg/r_cons.pc pkgcfg/r_diff.pc pkgcfg/r_core.pc pkgcfg/r_lang.pc pkgcfg/r_socket.pc pkgcfg/r_debug.pc pkgcfg/r_reg.pc pkgcfg/r_cmd.pc pkgcfg/r_config.pc pkgcfg/r_flags.pc pkgcfg/r_syscall.pc pkgcfg/r_sign.pc pkgcfg/r_util.pc pkgcfg/r_search.pc pkgcfg/r_bp.pc pkgcfg/r_lib.pc pkgcfg/r_parse.pc pkgcfg/r_fs.pc ; do # SUBDIRS
for A in ./config-user.mk libr/include/r_userconf.h pkgcfg/r_io.pc pkgcfg/r_db.pc pkgcfg/r_magic.pc pkgcfg/r_asm.pc pkgcfg/r_bin.pc pkgcfg/r_anal.pc pkgcfg/r_hash.pc pkgcfg/r_cons.pc pkgcfg/r_diff.pc pkgcfg/r_core.pc pkgcfg/r_lang.pc pkgcfg/r_socket.pc pkgcfg/r_debug.pc pkgcfg/r_reg.pc pkgcfg/r_cmd.pc pkgcfg/r_config.pc pkgcfg/r_flags.pc pkgcfg/r_syscall.pc pkgcfg/r_util.pc pkgcfg/r_search.pc pkgcfg/r_bp.pc pkgcfg/r_lib.pc pkgcfg/r_parse.pc pkgcfg/r_fs.pc ; do # SUBDIRS
if [ -f "${VPATH}/${A}.acr" ]; then
SD_TARGET=${A}
else

View File

@ -135,7 +135,6 @@ SUBDIRS ./config-user.mk
pkgcfg/r_config.pc
pkgcfg/r_flags.pc
pkgcfg/r_syscall.pc
pkgcfg/r_sign.pc
pkgcfg/r_util.pc
pkgcfg/r_search.pc
pkgcfg/r_bp.pc

View File

@ -12,7 +12,7 @@ LIBS0=util hash
LIBS1=reg cons db magic lib diff bp search config socket
LIBS2=syscall cmd lang io crypto flags bin
LIBS3=fs anal
LIBS4=parse sign
LIBS4=parse
LIBS5=asm debug
LIBS6=egg
#LIBS6+=print

View File

@ -22,7 +22,7 @@ include ${STATIC_ANAL_PLUGINS}
STATIC_OBJS=$(addprefix $(LTOP)/anal/p/,$(STATIC_OBJ))
OBJLIBS=meta.o reflines.o ref.o op.o fcn.o bb.o var.o
OBJLIBS+=cond.o value.o cc.o diff.o types.o fcnstore.o
OBJLIBS+=hint.o vm.o anal.o data.o xrefs.o esil.o
OBJLIBS+=hint.o vm.o anal.o data.o xrefs.o esil.o sign.o
OBJS=${STATIC_OBJS} ${OBJLIBS} ${CPARSE_OBJS}

7
libr/bp/Jamroot Normal file
View File

@ -0,0 +1,7 @@
OBJS = bp.c io.c plugin.c watch.c traptrace.c io.c ;
OBJS += p/bp_arm.c p/bp_mips.c p/bp_sh.c ;
OBJS += p/bp_bf.c p/bp_ppc.c p/bp_x86.c ;
lib r_bp : $(OBJS) :
<define>CORELIB
<include>. <include>../include <library>../util ;

3
libr/config/Jamroot Normal file
View File

@ -0,0 +1,3 @@
OBJS = config.c callback.c ;
lib r_config : $(OBJS) : <include>../include <library>../util ;

4
libr/cons/Jamroot Normal file
View File

@ -0,0 +1,4 @@
OBJS = cons.c pipe.c output.c grep.c canvas.c ;
OBJS += line.c hud.c rgb.c input.c pal.c editor.c ;
lib r_cons : $(OBJS) : <include>../include <library>../util ;

4
libr/crypto/Jamroot Normal file
View File

@ -0,0 +1,4 @@
OBJS = crypto.c ;
OBJS += p/crypto_aes.c p/crypto_aes_algo.c ;
lib r_crypto : $(OBJS) : <include>../include <library>../lib ;

3
libr/db/Jamroot Normal file
View File

@ -0,0 +1,3 @@
OBJS = db.c table.c pair.c ;
lib r_db : $(OBJS) : <include>../include <library>../util <library>../../shlr/sdb ;

3
libr/diff/Jamroot Normal file
View File

@ -0,0 +1,3 @@
OBJS = diff.c bdiff.c ;
lib r_diff : $(OBJS) : <include>../include <library>../util ;

6
libr/flags/Jamroot Normal file
View File

@ -0,0 +1,6 @@
OBJS = flags.c sort.c spaces.c ;
lib r_config : $(OBJS) :
<include>../include
<library>../util
<library>../cons ;

4
libr/hash/Jamroot Normal file
View File

@ -0,0 +1,4 @@
OBJS = state.c md5c.c crc16.c crc32.c sha1.c hash.c md4.c ;
OBJS += hamdist.c entropy.c sha2.c calc.c xxhash.c adler32.c ;
lib r_hash : $(OBJS) : <include>../include ;

View File

@ -953,3 +953,5 @@ extern RAnalPlugin r_anal_plugin_gb;
#endif
#endif
#include <r_sign.h>

3
libr/lib/Jamroot Normal file
View File

@ -0,0 +1,3 @@
OBJS = lib.c ;
lib r_lib : $(OBJS) : <include>../include <library>../util ;

8
libr/magic/Jamroot Normal file
View File

@ -0,0 +1,8 @@
OBJS = apprentice.c ascmagic.c fsmagic.c funcs.c ;
OBJS += is_tar.c magic.c print.c softmagic.c ;
lib r_magic : $(OBJS) :
<define>HAVE_CONFIG_H
<include>.
<include>../include
<library>../util ;

View File

@ -24,8 +24,6 @@
/* #define HAVE_ZLIB_H 1 DO NOT ENABLE YET -- chl */
/* #define HAVE_LIBZ 1 DO NOT ENABLE YET -- ian */
#define HAVE_STRTOUL
#define HAVE_STRERROR
#define HAVE_VSNPRINTF
#define HAVE_SNPRINTF
#define HAVE_STRTOF

View File

@ -88,17 +88,6 @@ int file_looks_utf8(const unsigned char *, size_t, unichar *, size_t *);
extern const char *file_names[];
extern const size_t file_nnames;
#ifndef HAVE_STRERROR
extern int sys_nerr;
extern char *sys_errlist[];
#define strerror(e) \
(((e) >= 0 && (e) < sys_nerr) ? sys_errlist[(e)] : "Unknown error")
#endif
#ifndef HAVE_STRTOUL
#define strtoul(a, b, c) strtol(a, b, c)
#endif
#ifndef HAVE_VASPRINTF
int vasprintf(char **ptr, const char *format_string, va_list vargs);
#endif

3
libr/reg/Jamroot Normal file
View File

@ -0,0 +1,3 @@
OBJS = reg.c arena.c value.c ;
lib r_reg : $(OBJS) : <include>../include <library>../util ;

View File

@ -1,7 +0,0 @@
include ../config.mk
NAME=r_sign
DEPS=r_util r_anal
OBJS=sign.o
include ../rules.mk

View File

@ -1,6 +0,0 @@
OBJ=rasign2.o
BIN=rasign2
BINDEPS=r_sign r_anal r_reg r_syscall r_diff r_db r_util
include ../../rules.mk
include ../../db/r.mk

3
libr/socket/Jamroot Normal file
View File

@ -0,0 +1,3 @@
OBJS = socket.c proc.c http.c http_server.c ;
lib r_socket : $(OBJS) : <include>../include <library>../util ;

View File

@ -13,7 +13,7 @@ dobin() {
# rabin2 -s ../binr/$1/$1 | cut -d = -f 8 > $t/b/$1.s
}
LIBS="anal asm bin bp cmd config cons crypto db debug diff flags hash io lang lib line meta parse print reg search sign socket syscall sysproxy th util vm core"
LIBS="anal asm bin bp cmd config cons crypto db debug diff flags hash io lang lib line parse print reg search socket syscall sysproxy th util vm core"
for a in $LIBS ; do
dolib ${a}
done

3
libr/syscall/Jamroot Normal file
View File

@ -0,0 +1,3 @@
OBJS = syscall.c ioports.c ;
lib r_syscall : $(OBJS) : <include>../include <library>../util <library>../db ;

8
libr/util/Jamroot Normal file
View File

@ -0,0 +1,8 @@
OBJS = mem.c pool.c num.c str.c hex.c file.c alloca.c range.c log.c ;
OBJS += prof.c cache.c sys.c buf.c w32-sys.c base64.c base85.c name.c ;
OBJS += list.c flist.c ht.c ht64.c mixed.c btree.c chmod.c graph.c ;
OBJS += regex/regcomp.c regex/regerror.c regex/regexec.c uleb128.c ;
OBJS += sandbox.c calc.c thread.c lock.c strpool.c bitmap.c strht.c ;
OBJS += p_date.c p_format.c print.c p_seven.c slist.c randomart.c strbuf.c ;
lib r_util : $(OBJS) : <include>../include ;

View File

@ -36,7 +36,7 @@ $(SDBLIB) sdb/sdb:
cp -f sdb/src/.sdb sdb/sdb
.PHONY: sdb-sync sync-sdb sdbclean
F=README.md config.mk src Makefile
F=README.md config.mk src Makefile Jamroot
SYNCFILES=$(addprefix sdb.vc/,${F})
I=../libr/include

12
shlr/sdb/Jamroot Normal file
View File

@ -0,0 +1,12 @@
CFILES = src/buffer.c src/ht.c src/ls.c src/query.c src/sdbn.c ;
CFILES += src/cdb.c src/json.c src/sdb.c src/util.c ;
CFILES += src/cdb_make.c src/lock.c src/ns.c src/sdba.c ;
#CFILES += src/json/api.c src/json/path.c src/json/rangstr.c ;
#CFILES += src/json/js0n.c ;
lib sdb : $(CFILES) : <link>static <include>. ;
# exe sdb : $(CFILES) src/main.c : <include>. ;
ret = [ SHELL "echo '#define SDB_VERSION \"0.6.6\"' > src/sdb-version.h" ] ;