Rearranging some stuff.

6 files changed, 48 insertions, 12 deletions

diff --git a/Makefile b/Makefile
index ea8b1db..60a31b8 100644
--- a/Makefile
+++ b/Makefile
@@ -5,18 +5,26 @@
 # terms of the license contained in the file LICENSE.
 #
 
+PREFIX := /home/eichlan/testroot
 OBJECTS := $(patsubst %.cpp,%.o,$(wildcard src/stable/*.cpp src/unstable/*.cpp src/experimental/*.cpp))
-HEADERS := bu bu/signals.h bu/autoconfig.h bu/version.h bu/config.h $(foreach fn,$(wildcard src/stable/*.h src/unstable/*.h src/experimental/*.h),bu/$(notdir ${fn})) $(patsubst src/%,bu/%,$(wildcard src/compat/*.h))
+HEADERS := bu/signals.h bu/autoconfig.h bu/version.h bu/config.h $(foreach fn,$(wildcard src/stable/*.h src/unstable/*.h src/experimental/*.h),bu/$(notdir ${fn})) $(patsubst src/%,bu/%,$(wildcard src/compat/*.h))
 TOOLS := $(patsubst src/tools/%.cpp,%,$(wildcard src/tools/*.cpp))
 UNITS := $(patsubst src/unit/%.unit,unit/%,$(wildcard src/unit/*.unit))
 TESTS := $(patsubst src/tests/%.cpp,tests/%,$(wildcard src/tests/*.cpp))
 
-.PHONY: default all headers clean tests
+.PHONY: default all headers clean tests install
 
 default: libbu++.a tools
 
 all: default tests
 
+install: libbu++.a tools
+        install -d ${PREFIX}/{include/bu/compat,lib,bin}
+        install -m u=rw,go=r $(filter-out bu/compat/%,${HEADERS}) ${PREFIX}/include/bu
+        install -m u=rw,go=r $(filter bu/compat/%,${HEADERS}) ${PREFIX}/include/bu/compat
+        install -m u=rw,go=r libbu++.a ${PREFIX}/lib
+        install ${TOOLS} ${PREFIX}/bin
+
 tests: ${UNITS} ${TESTS}
 
 clean:
@@ -49,7 +57,7 @@ src/autoconfig.h src/version.h: autoconfig
 src/signals.h: pregen/signals.h
         cp $< $@
 
-headers: ${HEADERS}
+headers: bu ${HEADERS}
 
 tools: ${TOOLS}
 
@@ -93,6 +101,6 @@ tests/lzma:
 tests/threadid:
         g++ -ggdb -W -Wall -I. -L. $< -o $@ -lbu++ -lpthread
 
-libbu++.a: ${HEADERS} ${OBJECTS}
+libbu++.a: bu ${HEADERS} ${OBJECTS}
         ar -r libbu++.a ${OBJECTS}
 
diff --git a/default.bld b/default.bld
index 3e7b692..b828713 100644
--- a/default.bld
+++ b/default.bld
@@ -244,6 +244,7 @@ target PKG_BASE
                 "LICENSE",
                 "Doxyfile",
                 "Makefile",
+                "version",
                 files("*.bld"),
                 "support/vim/syntax/taf.vim",
                 "support/vim/ftdetect/taf.vim",
@@ -311,10 +312,10 @@ target PKG_BASE + ".xz"
 rule "tarball"
 {
         input matches("LICENSE", "Makefile", "*.cpp", "*.h", "*.conf", "*.bld",
-                "Doxyfile", "*.vim", "*.sh", "*.unit", "api");
+                "Doxyfile", "*.vim", "*.sh", "*.unit", "api", "version");
         profile "build"
         {
-                OUTDIR = OUTPUT.replace(".tar.bz2","");
+                OUTDIR = OUTPUT.replace(".tar","");
                 execute("tar -f ./${OUTPUT} --transform=\"s@^@${OUTDIR}/@\" -c ${INPUT}");
         }
 }
diff --git a/src/experimental/blowfish.cpp b/src/experimental/blowfish.cpp
index d01ecd3..7ff8a4d 100644
--- a/src/experimental/blowfish.cpp
+++ b/src/experimental/blowfish.cpp
@@ -1,2 +1,6 @@
 #include "bu/blowfish.h"
 
+template class Bu::CipherModeEcb<8, Bu::Blowfish<1> >;
+template class Bu::CipherModeCfb<8, Bu::Blowfish<1> >;
+template class Bu::CipherModeCbc<8, Bu::Blowfish<1> >;
+template class Bu::CipherModeOfb<8, Bu::Blowfish<1> >;
diff --git a/src/stable/ringbuffer.h b/src/stable/ringbuffer.h
index d4b5993..79c5a15 100644
--- a/src/stable/ringbuffer.h
+++ b/src/stable/ringbuffer.h
@@ -67,16 +67,15 @@ namespace Bu
                                 iStart = 0;
                                 iEnd = 1;
                                 va.construct( &aData[0], v );
+                                return;
                         }
                         else if( iStart == iEnd )
                         {
-                                throw ExceptionBase("Hey, it's full!");
-                        }
-                        else
-                        {
-                                va.construct( &aData[iEnd], v );
-                                iEnd = (iEnd+1)%iCapacity;
+                                // The ringbuffer is full
+                                dequeue();
                         }
+                        va.construct( &aData[iEnd], v );
+                        iEnd = (iEnd+1)%iCapacity;
                 }
 
                 value dequeue()
@@ -104,6 +103,16 @@ namespace Bu
                         return aData[(iIndex+iStart)%iCapacity];
                 }
 
+                value &first()
+                {
+                        return aData[iStart];
+                }
+
+                value &last()
+                {
+                        return aData[(iEnd-1+iCapacity)%iCapacity];
+                }
+
                 int getSize()
                 {
                         if( iStart < 0 )
@@ -201,6 +210,20 @@ namespace Bu
                         return core->get( 0 );
                 }
 
+                virtual value &first()
+                {
+                        _hardCopy();
+
+                        return core->first();
+                }
+
+                virtual value &last()
+                {
+                        _hardCopy();
+
+                        return core->last();
+                }
+
                 value &operator[]( int iIndex )
                 {
                         _hardCopy();
diff --git a/src/tools/bnfcompile.cpp b/src/tests/bnfcompile.cpp
index af7a0eb..af7a0eb 100644
--- a/src/tools/bnfcompile.cpp
+++ b/src/tests/bnfcompile.cpp
diff --git a/src/tools/parser.cpp b/src/tests/parser.cpp
index af53bc8..af53bc8 100644
--- a/src/tools/parser.cpp
+++ b/src/tests/parser.cpp