Merge branch 'master' of https://github.com/UpstandingHackers/hammer into cxx

.gitignore

@@ -17,3 +17,4 @@ TAGS
 docs/milestone2.dot.pdf
 *.dot.pdf
 Session.vim
+*.gcov

.travis.yml

@@ -5,6 +5,10 @@ compiler:
 before_install:
   - sudo apt-get update -qq
   - sudo apt-get install -qq libboost1.48-dev
-script: scons
+  - sudo pip install cpp-coveralls --use-mirrors
+script: 
+  - scons --coverage
+after_success:
+  - coveralls
 notifications:
   irc: "irc.upstandinghackers.com#hammer"

README.md

@@ -4,6 +4,7 @@ Hammer is written in C, but will provide bindings for other languages. If you do
 
 Hammer currently builds under Linux. (Windows and OSX are coming.)
 
+[![Build Status](https://travis-ci.org/UpstandingHackers/hammer.png)](https://travis-ci.org/UpstandingHackers/hammer)
 Features
 ========
 * Bit-oriented -- grammars can include single-bit flags or multi-bit constructs that span character boundaries, with no hassle

SConstruct

@@ -13,6 +13,12 @@ AddOption("--variant",
           action="store",
           help="Build variant (debug or opt)")
 
+AddOption("--coverage",
+          dest="coverage",
+          default=False,
+          action="store_true",
+          help="Build with coverage instrumentation")
+
 env['BUILDDIR'] = 'build/$VARIANT'
 
 dbg = env.Clone(VARIANT='debug')
@@ -26,6 +32,12 @@ if GetOption("variant") == 'debug':
 else:
     env = opt
 
+if GetOption("coverage"):
+    env.Append(CFLAGS=["-fprofile-arcs", "-ftest-coverage"],
+               CXXFLAGS=["-fprofile-arcs", "-ftest-coverage"],
+               LDFLAGS=["-fprofile-arcs", "-ftest-coverage"],
+               LIBS=['gcov'])
+
 if os.getenv("CC") == "clang":
     env.Replace(CC="clang",
                 CXX="clang++")