RPA Toolkit
renamed rpa2 to rpa
authorMartin Stoilov <martin@rpasearch.com>
Mon, 16 May 2011 02:26:36 +0000 (19:26 -0700)
committerMartin Stoilov <martin@rpasearch.com>
Mon, 16 May 2011 02:26:36 +0000 (19:26 -0700)
44 files changed:
build/linux/build.mk
rgrep/build/linux/rgrep.mk
rjs/build/linux/rjs.mk
rpa/build/linux/rpa.mk [moved from rpa2/build/linux/rpa.mk with 82% similarity]
rpa/build/linux/x86_64/Makefile [moved from rpa2/build/linux/x86_64/Makefile with 100% similarity]
rpa/rpa.h [moved from rpa2/rpa.h with 100% similarity]
rpa/rpacache.c [moved from rpa2/rpacache.c with 100% similarity]
rpa/rpacache.h [moved from rpa2/rpacache.h with 100% similarity]
rpa/rpacompiler.c [moved from rpa2/rpacompiler.c with 100% similarity]
rpa/rpacompiler.h [moved from rpa2/rpacompiler.h with 100% similarity]
rpa/rpadbex.c [moved from rpa2/rpadbex.c with 100% similarity]
rpa/rpadbex.h [moved from rpa2/rpadbex.h with 100% similarity]
rpa/rpaerror.h [moved from rpa2/rpaerror.h with 100% similarity]
rpa/rpaoptimization.c [moved from rpa2/rpaoptimization.c with 100% similarity]
rpa/rpaoptimization.h [moved from rpa2/rpaoptimization.h with 100% similarity]
rpa/rpaparser.c [moved from rpa2/rpaparser.c with 100% similarity]
rpa/rpaparser.h [moved from rpa2/rpaparser.h with 100% similarity]
rpa/rparecord.c [moved from rpa2/rparecord.c with 100% similarity]
rpa/rparecord.h [moved from rpa2/rparecord.h with 100% similarity]
rpa/rpastat.c [moved from rpa2/rpastat.c with 100% similarity]
rpa/rpastat.h [moved from rpa2/rpastat.h with 100% similarity]
rpa/rpavm.c [moved from rpa2/rpavm.c with 100% similarity]
rpa/rpavm.h [moved from rpa2/rpavm.h with 100% similarity]
tests/testmisc/build/linux/misc-tests.mk
tests/testrjs/build/linux/testrjs.mk
tests/testrpa/build/linux/testrpa2.mk [moved from tests/testrpa2/build/linux/testrpa2.mk with 79% similarity]
tests/testrpa/build/linux/x86_64/Makefile [moved from tests/testrpa2/build/linux/x86_64/Makefile with 100% similarity]
tests/testrpa/common.h [moved from tests/testrpa2/common.h with 100% similarity]
tests/testrpa/rpacompiler-altexp.c [moved from tests/testrpa2/rpacompiler-altexp.c with 100% similarity]
tests/testrpa/rpacompiler-class.c [moved from tests/testrpa2/rpacompiler-class.c with 100% similarity]
tests/testrpa/rpacompiler-exp.c [moved from tests/testrpa2/rpacompiler-exp.c with 100% similarity]
tests/testrpa/rpacompiler-minusexp.c [moved from tests/testrpa2/rpacompiler-minusexp.c with 100% similarity]
tests/testrpa/rpacompiler-notexp.c [moved from tests/testrpa2/rpacompiler-notexp.c with 100% similarity]
tests/testrpa/rpacompiler-rule.c [moved from tests/testrpa2/rpacompiler-rule.c with 100% similarity]
tests/testrpa/rpacompiler-rulealtrec.c [moved from tests/testrpa2/rpacompiler-rulealtrec.c with 100% similarity]
tests/testrpa/rpacompiler-ruleloop.c [moved from tests/testrpa2/rpacompiler-ruleloop.c with 100% similarity]
tests/testrpa/rpacompiler-ruleloopcls.c [moved from tests/testrpa2/rpacompiler-ruleloopcls.c with 100% similarity]
tests/testrpa/rpacompiler-rulerec.c [moved from tests/testrpa2/rpacompiler-rulerec.c with 100% similarity]
tests/testrpa/rpaparser-test.c [moved from tests/testrpa2/rpaparser-test.c with 100% similarity]
tests/testrpa/rpavm-matchchr.c [moved from tests/testrpa2/rpavm-matchchr.c with 100% similarity]
tests/testrpa/rpavm-matchrng.c [moved from tests/testrpa2/rpavm-matchrng.c with 100% similarity]
tests/testrpa/rpavm-mnode.c [moved from tests/testrpa2/rpavm-mnode.c with 100% similarity]
tests/testrpa/rpavm-ref.c [moved from tests/testrpa2/rpavm-ref.c with 100% similarity]
tests/testrpa/test.sh [moved from tests/testrpa2/test.sh with 100% similarity]

index f2ab5f3..8e1cd0a 100644 (file)
@@ -1,30 +1,30 @@
 all:
        +make -C $(SRCDIR)/rlib/build/$(OS)/$(ARCHDIR) all
-       +make -C $(SRCDIR)/rpa2/build/$(OS)/$(ARCHDIR) all
+       +make -C $(SRCDIR)/rpa/build/$(OS)/$(ARCHDIR) all
        +make -C $(SRCDIR)/rvm/build/$(OS)/$(ARCHDIR) all
        +make -C $(SRCDIR)/rjs/build/$(OS)/$(ARCHDIR) all
        +make -C $(SRCDIR)/tests/testmisc/build/$(OS)/$(ARCHDIR) all
-       +make -C $(SRCDIR)/tests/testrpa2/build/$(OS)/$(ARCHDIR) all
+       +make -C $(SRCDIR)/tests/testrpa/build/$(OS)/$(ARCHDIR) all
        +make -C $(SRCDIR)/tests/testrjs/build/$(OS)/$(ARCHDIR) all
        +make -C $(SRCDIR)/rgrep/build/$(OS)/$(ARCHDIR) all
 
 distclean: clean
        +make -C $(SRCDIR)/rlib/build/$(OS)/$(ARCHDIR) distclean
-       +make -C $(SRCDIR)/rpa2/build/$(OS)/$(ARCHDIR) distclean
+       +make -C $(SRCDIR)/rpa/build/$(OS)/$(ARCHDIR) distclean
        +make -C $(SRCDIR)/rvm/build/$(OS)/$(ARCHDIR) distclean
        +make -C $(SRCDIR)/rjs/build/$(OS)/$(ARCHDIR) distclean
        +make -C $(SRCDIR)/tests/testmisc/build/$(OS)/$(ARCHDIR) distclean
-       +make -C $(SRCDIR)/tests/testrpa2/build/$(OS)/$(ARCHDIR) distclean
+       +make -C $(SRCDIR)/tests/testrpa/build/$(OS)/$(ARCHDIR) distclean
        +make -C $(SRCDIR)/tests/testrjs/build/$(OS)/$(ARCHDIR) distclean
        +make -C $(SRCDIR)/rgrep/build/$(OS)/$(ARCHDIR) distclean
 
 clean:
        +make -C $(SRCDIR)/rlib/build/$(OS)/$(ARCHDIR) clean
-       +make -C $(SRCDIR)/rpa2/build/$(OS)/$(ARCHDIR) clean
+       +make -C $(SRCDIR)/rpa/build/$(OS)/$(ARCHDIR) clean
        +make -C $(SRCDIR)/rvm/build/$(OS)/$(ARCHDIR) clean
        +make -C $(SRCDIR)/rjs/build/$(OS)/$(ARCHDIR) clean
        +make -C $(SRCDIR)/tests/testmisc/build/$(OS)/$(ARCHDIR) clean
-       +make -C $(SRCDIR)/tests/testrpa2/build/$(OS)/$(ARCHDIR) clean
+       +make -C $(SRCDIR)/tests/testrpa/build/$(OS)/$(ARCHDIR) clean
        +make -C $(SRCDIR)/tests/testrjs/build/$(OS)/$(ARCHDIR) clean
        +make -C $(SRCDIR)/rgrep/build/$(OS)/$(ARCHDIR) clean
 
index c37b5d9..48566c3 100644 (file)
@@ -1,6 +1,6 @@
 RLIB_SRCDIR = $(SRCDIR)/rlib
 RVM_SRCDIR = $(SRCDIR)/rvm
-RPA_SRCDIR = $(SRCDIR)/rpa2
+RPA_SRCDIR = $(SRCDIR)/rpa
 RGREP_SRCDIR = $(SRCDIR)/rgrep
 INCLUDE = -I$(SRCDIR)/arch/$(OS)/$(ARCHDIR) -I$(RLIB_SRCDIR) -I$(RVM_SRCDIR) -I$(RPA_SRCDIR) -I$(RGREP_SRCDIR) -I$(RGREP_SRCDIR)/unix
 
@@ -8,7 +8,7 @@ INCLUDE = -I$(SRCDIR)/arch/$(OS)/$(ARCHDIR) -I$(RLIB_SRCDIR) -I$(RVM_SRCDIR) -I$
 LIBS = -L$(RLIB_SRCDIR)/build/$(OS)/$(ARCHDIR)/out 
 LIBS += -L$(RVM_SRCDIR)/build/$(OS)/$(ARCHDIR)/out 
 LIBS += -L$(RPA_SRCDIR)/build/$(OS)/$(ARCHDIR)/out 
-LIBS += -lrpa2 -lrvm -lrlib -lpthread -lm --static
+LIBS += -lrpa -lrvm -lrlib -lpthread -lm --static
 OBJECTS        = $(OUTDIR)/rpagrep.o $(OUTDIR)/main.o $(OUTDIR)/fsenum.o $(OUTDIR)/rpagrepdep.o $(OUTDIR)/rpagreputf.o
 RPAGREP        = rgrep
 
index 6ff6693..3ef88be 100644 (file)
@@ -1,6 +1,6 @@
 RLIB_SRCDIR = $(SRCDIR)/rlib
 RVM_SRCDIR = $(SRCDIR)/rvm
-RPA_SRCDIR = $(SRCDIR)/rpa2
+RPA_SRCDIR = $(SRCDIR)/rpa
 RJS_SRCDIR = $(SRCDIR)/rjs
 RJS_LIB = $(OUTDIR)/librjs.a
 RJS_SO = $(OUTDIR)/librjs.so.1.0
@@ -12,7 +12,7 @@ LIBS = -L$(RLIB_SRCDIR)/build/$(OS)/$(ARCHDIR)/out
 LIBS += -L$(RVM_SRCDIR)/build/$(OS)/$(ARCHDIR)/out 
 LIBS += -L$(RPA_SRCDIR)/build/$(OS)/$(ARCHDIR)/out 
 LIBS += -L$(RJS_SRCDIR)/build/$(OS)/$(ARCHDIR)/out 
-LIBS += -lrjs -lrpa2 -lrvm -lrlib -lpthread -lm --static
+LIBS += -lrjs -lrpa -lrvm -lrlib -lpthread -lm --static
 
 RJS_OBJECTS =  \
        $(OUTDIR)/rjs.o \
similarity index 82%
rename from rpa2/build/linux/rpa.mk
rename to rpa/build/linux/rpa.mk
index e33156f..644b185 100644 (file)
@@ -1,6 +1,6 @@
-RPA_SRCDIR = $(SRCDIR)/rpa2
-RPA_LIB = $(OUTDIR)/librpa2.a
-RPA_SO = $(OUTDIR)/librpa2.so.1.0
+RPA_SRCDIR = $(SRCDIR)/rpa
+RPA_LIB = $(OUTDIR)/librpa.a
+RPA_SO = $(OUTDIR)/librpa.so.1.0
 
 CFLAGS += -I$(RVM_SRCDIR)/config -I$(SRCDIR)/rlib -I$(SRCDIR)/rvm
 
@@ -29,7 +29,7 @@ $(RPA_LIB): $(RPA_OBJECTS)
        $(AR) -cr $@ $^
 
 $(RPA_SO): $(RPA_OBJECTS)
-       $(CC) $(LDFLAGS) -shared -Wl,-soname,librpa2.so -o $@ $^
+       $(CC) $(LDFLAGS) -shared -Wl,-soname,librpa.so -o $@ $^
 
 $(OUTDIR):
        @mkdir $(OUTDIR)
similarity index 100%
rename from rpa2/rpa.h
rename to rpa/rpa.h
similarity index 100%
rename from rpa2/rpacache.c
rename to rpa/rpacache.c
similarity index 100%
rename from rpa2/rpacache.h
rename to rpa/rpacache.h
similarity index 100%
rename from rpa2/rpacompiler.c
rename to rpa/rpacompiler.c
similarity index 100%
rename from rpa2/rpacompiler.h
rename to rpa/rpacompiler.h
similarity index 100%
rename from rpa2/rpadbex.c
rename to rpa/rpadbex.c
similarity index 100%
rename from rpa2/rpadbex.h
rename to rpa/rpadbex.h
similarity index 100%
rename from rpa2/rpaerror.h
rename to rpa/rpaerror.h
similarity index 100%
rename from rpa2/rpaoptimization.c
rename to rpa/rpaoptimization.c
similarity index 100%
rename from rpa2/rpaoptimization.h
rename to rpa/rpaoptimization.h
similarity index 100%
rename from rpa2/rpaparser.c
rename to rpa/rpaparser.c
similarity index 100%
rename from rpa2/rpaparser.h
rename to rpa/rpaparser.h
similarity index 100%
rename from rpa2/rparecord.c
rename to rpa/rparecord.c
similarity index 100%
rename from rpa2/rparecord.h
rename to rpa/rparecord.h
similarity index 100%
rename from rpa2/rpastat.c
rename to rpa/rpastat.c
similarity index 100%
rename from rpa2/rpastat.h
rename to rpa/rpastat.h
similarity index 100%
rename from rpa2/rpavm.c
rename to rpa/rpavm.c
similarity index 100%
rename from rpa2/rpavm.h
rename to rpa/rpavm.h
index a42d709..e5717d9 100644 (file)
@@ -1,16 +1,16 @@
 ROBJECT_SRCDIR = $(SRCDIR)/robject
 RLIB_SRCDIR = $(SRCDIR)/rlib
 RVM_SRCDIR = $(SRCDIR)/rvm
-RPA2_SRCDIR = $(SRCDIR)/rpa2
+RPA_SRCDIR = $(SRCDIR)/rpa
 RAST_SRCDIR = $(SRCDIR)/rast
 TESTS_SRCDIR = $(SRCDIR)/tests/testmisc
-INCLUDE = -I$(SRCDIR)/arch/$(OS)/$(ARCHDIR) -I$(ROBJECT_SRCDIR) -I$(RLIB_SRCDIR) -I$(RVM_SRCDIR) -I$(RPA2_SRCDIR)
+INCLUDE = -I$(SRCDIR)/arch/$(OS)/$(ARCHDIR) -I$(ROBJECT_SRCDIR) -I$(RLIB_SRCDIR) -I$(RVM_SRCDIR) -I$(RPA_SRCDIR)
 
 LIBS =  -L$(ROBJECT_SRCDIR)/build/$(OS)/$(ARCHDIR)/out 
 LIBS += -L$(RLIB_SRCDIR)/build/$(OS)/$(ARCHDIR)/out 
 LIBS += -L$(RVM_SRCDIR)/build/$(OS)/$(ARCHDIR)/out 
-LIBS += -L$(RPA2_SRCDIR)/build/$(OS)/$(ARCHDIR)/out 
-LIBS += -lrpa2 -lrvm -lrlib -lpthread -lm --static
+LIBS += -L$(RPA_SRCDIR)/build/$(OS)/$(ARCHDIR)/out 
+LIBS += -lrpa -lrvm -lrlib -lpthread -lm --static
 
 
 TESTS  += $(OUTDIR)/funcarg-test
index 75a7fb7..a21c50e 100644 (file)
@@ -1,17 +1,17 @@
 ROBJECT_SRCDIR = $(SRCDIR)/robject
 RLIB_SRCDIR = $(SRCDIR)/rlib
 RVM_SRCDIR = $(SRCDIR)/rvm
-RPA2_SRCDIR = $(SRCDIR)/rpa2
+RPA_SRCDIR = $(SRCDIR)/rpa
 RJS_SRCDIR = $(SRCDIR)/rjs
 TESTS_SRCDIR = $(SRCDIR)/tests/testrjs
-INCLUDE = -I$(SRCDIR)/arch/$(OS)/$(ARCHDIR) -I$(ROBJECT_SRCDIR) -I$(RLIB_SRCDIR) -I$(RVM_SRCDIR) -I$(RJS_SRCDIR) -I$(RPA2_SRCDIR) 
+INCLUDE = -I$(SRCDIR)/arch/$(OS)/$(ARCHDIR) -I$(ROBJECT_SRCDIR) -I$(RLIB_SRCDIR) -I$(RVM_SRCDIR) -I$(RJS_SRCDIR) -I$(RPA_SRCDIR) 
 
 LIBS =  -L$(ROBJECT_SRCDIR)/build/$(OS)/$(ARCHDIR)/out 
 LIBS += -L$(RLIB_SRCDIR)/build/$(OS)/$(ARCHDIR)/out 
 LIBS += -L$(RVM_SRCDIR)/build/$(OS)/$(ARCHDIR)/out 
 LIBS += -L$(RJS_SRCDIR)/build/$(OS)/$(ARCHDIR)/out 
-LIBS += -L$(RPA2_SRCDIR)/build/$(OS)/$(ARCHDIR)/out 
-LIBS += -lrjs -lrpa2 -lrvm -lrlib -lpthread -lm --static
+LIBS += -L$(RPA_SRCDIR)/build/$(OS)/$(ARCHDIR)/out 
+LIBS += -lrjs -lrpa -lrvm -lrlib -lpthread -lm --static
 
 
 TESTS   += $(OUTDIR)/rjs-simple
similarity index 79%
rename from tests/testrpa2/build/linux/testrpa2.mk
rename to tests/testrpa/build/linux/testrpa2.mk
index a46b428..1febc62 100644 (file)
@@ -1,14 +1,14 @@
 RLIB_SRCDIR = $(SRCDIR)/rlib
 RVM_SRCDIR = $(SRCDIR)/rvm
-RPA2_SRCDIR = $(SRCDIR)/rpa2
-TESTS_SRCDIR = $(SRCDIR)/tests/testrpa2
-INCLUDE = -I$(SRCDIR)/arch/$(OS)/$(ARCHDIR) -I$(RLIB_SRCDIR) -I$(RVM_SRCDIR) -I$(RPA2_SRCDIR)
+RPA_SRCDIR = $(SRCDIR)/rpa
+TESTS_SRCDIR = $(SRCDIR)/tests/testrpa
+INCLUDE = -I$(SRCDIR)/arch/$(OS)/$(ARCHDIR) -I$(RLIB_SRCDIR) -I$(RVM_SRCDIR) -I$(RPA_SRCDIR)
 
 
 LIBS = -L$(RLIB_SRCDIR)/build/$(OS)/$(ARCHDIR)/out 
 LIBS += -L$(RVM_SRCDIR)/build/$(OS)/$(ARCHDIR)/out 
-LIBS += -L$(RPA2_SRCDIR)/build/$(OS)/$(ARCHDIR)/out 
-LIBS += -lrpa2 -lrvm -lrlib -lpthread -lm --static
+LIBS += -L$(RPA_SRCDIR)/build/$(OS)/$(ARCHDIR)/out 
+LIBS += -lrpa -lrvm -lrlib -lpthread -lm --static
 
 
 TESTS  += $(OUTDIR)/rpavm-matchchr
@@ -32,7 +32,7 @@ all : $(OUTDIR) $(TESTS)
 
 
 $(OUTDIR)/%: $(TESTS_SRCDIR)/%.c
-       + $(CC) $(CFLAGS) -o $(OUTDIR)/$* $(TESTS_SRCDIR)/$*.c  -lrpa2 $(LIBS) $(INCLUDE)
+       + $(CC) $(CFLAGS) -o $(OUTDIR)/$* $(TESTS_SRCDIR)/$*.c  -lrpa $(LIBS) $(INCLUDE)
 
 
 $(OUTDIR)/%.o: $(TESTS_SRCDIR)/%.rpa
similarity index 100%
rename from tests/testrpa2/test.sh
rename to tests/testrpa/test.sh