X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Makefile;h=eeb0d80f40abf91c6a791e2c10b4660989e7561f;hb=5443435c4c2b6e4386c5334b5b8358273f2bae93;hp=0c860c48ba34542fee0a9f8ce238c149cf283d4e;hpb=d8bc539afe01f0fb69fe1a63148c5c20eec19723;p=senf.git

diff --git a/Makefile b/Makefile
index 0c860c4..eeb0d80 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,19 @@
 #----------------------------------------------------------------------
 # Some SCONS shortcuts
 #----------------------------------------------------------------------
-SCONS=scons
+CONCURRENCY_LEVEL ?= $(shell grep process /proc/cpuinfo | wc -l)
+
+ifdef final
+  SCONS_ARGS += "final="$(final)
+endif
+ifdef debug
+  SCONS_ARGS += "debug="$(debug)
+endif
+ifdef profile
+  SCONS_ARGS += "profile="$(profile)
+endif
+
+SCONS=scons -j $(CONCURRENCY_LEVEL) $(SCONS_ARGS)
 
 default: build
 
@@ -9,88 +21,66 @@ build:
 	$(SCONS)
 
 clean:
-	$(SCONS) --clean
+	$(SCONS) --clean all
+	find ./ -name \*.gcno | xargs rm -f
+	find ./ -name \*.gcda | xargs rm -f
+	find ./ -name \*.gcov | xargs rm -f
+	rm -f test_coverage.info
+	rm -rf /doc/test_coverage
 
-all_docs all_tests:
+all_docs all_tests all:
+	$(SCONS) $@
+	
+%/test %/doc:
 	$(SCONS) $@
 
-#----------------------------------------------------------------------
-# Subversion stuff
-#----------------------------------------------------------------------
-SVN_REVISION = $(shell svn info|grep '^Revision: '|awk '{print $$2}')
-
-svn_version:
-	@echo $(SVN_REVISION)
+%/build:
+	$(SCONS) $*
 
 #----------------------------------------------------------------------
-# Building SENF requires some debian packages
+# remote compile targets
 #----------------------------------------------------------------------
-DEB_BASE   = scons build-essential binutils-dev
-DEB_BOOST  = libboost-dev libboost-test-dev
-DEB_BOOST += libboost-date-time-dev libboost-regex-dev libboost-thread-dev
-DEB_DOC    = doxygen dia tidy xsltproc graphviz
+JOBS := 1
 
-prerequisites:
-	aptitude install $(DEB_BASE) $(DEB_BOOST) $(DEB_DOC)
+all@% all_docs@% all_tests@% build@%:
+	ssh $* "cd `pwd` && $(MAKE) -j $(JOBS) $(firstword $(subst @, ,$@))"
 
+	
 #----------------------------------------------------------------------
-# Debian package info
+# test coverage
 #----------------------------------------------------------------------
-PKG_NAME=senf-dev
-PKG_ARCH=i386
-PKG_VERS=0.0.$(SVN_REVISION)-1
-PKG_FILE = $(PKG_NAME)-$(PKG_VERS)_$(PKG_ARCH).deb
+test_coverage:
+	$(SCONS) debug=1 EXTRA_CCFLAGS="-fprofile-arcs -ftest-coverage" EXTRA_LIBS="gcov" all_tests
+	ln -s ../../boost/ include/senf/  # ugly work-around
+	lcov --directory . --capture --output-file /tmp/test_coverage.info --base-directory .
+#	lcov --output-file /tmp/test_coverage.info.tmp --extract test_coverage.info \*/senf/\*
+	lcov --output-file test_coverage.info --remove /tmp/test_coverage.info \*/include/\*
+	genhtml --output-directory doc/test_coverage --title "all_tests" test_coverage.info
+	rm /tmp/test_coverage.info
+	rm include/senf/boost
 
 #----------------------------------------------------------------------
-# Debian package structure
+# Subversion stuff
 #----------------------------------------------------------------------
-DEB_TOP = ./debian
-DEB_CTL = $(DEB_TOP)/DEBIAN
-DEB_LIB = $(DEB_TOP)/usr/lib/senf
-DEB_INC = $(DEB_TOP)/usr/include/senf
-DEB_DOC = $(DEB_TOP)/usr/share/doc/senf
+svn_version:
+	@svnversion
 
 #----------------------------------------------------------------------
-# Debian package content
+# Building SENF requires some debian packages
 #----------------------------------------------------------------------
-SENF_LIBS = *.a
-SENF_HDRS = $$(find -path './XXXdebian' -prune \
-                 -o -iname \*.h \
-                 -o -iname \*.hh \
-                 -o -iname \*.ih \
-                 -o -iname \*.c \
-                 -o -iname \*.cc \
-                 -o -iname \*.ct \
-                 -o -iname \*.cci \
-                 -o -iname \*.cti \
-                 -o -iname \*.mpp \
-)
+DEB_BASE   = build-essential
 
-package: $(PKG_FILE)
-$(PKG_FILE): build
-	rm -rf $(DEB_TOP)
-	mkdir -p $(DEB_CTL) $(DEB_INC) $(DEB_LIB) $(DEB_DOC)
-	find $(DEB_TOP) -type d | xargs chmod 755
-	tar cf - $(SENF_HDRS) | (cd $(DEB_INC) && tar xf -)
-	tar cf - $(SENF_LIBS) | (cd $(DEB_LIB) && tar xf -)
-	sed -e 's,PKG_VERSION,$(PKG_VERS),' control > $(DEB_CTL)/control
-	$(MAKE) deb-doc
-	dpkg-deb --build debian $(PKG_FILE)
+# This line parses the 'Build-Depends' entry from debian/control
+DEB_SENF   = $(shell perl -an -F'[:,]' -e '					\
+	       	         BEGIN{ $$,=" " }					\
+	       	         $$P=0 if /^\S/;					\
+			 map {s/\(.*\)//} @F;					\
+	       	         print @F if $$P;					\
+	       	         if (/^Build-Depends:/) { print @F[1..$$\#F]; $$P=1 }'	\
+	       	     debian/control | xargs echo)
 
-#----------------------------------------------------------------------
-# Extract documentation files from source tree
-#----------------------------------------------------------------------
-deb-doc:
-	rsync -rz \
-		--filter="- debian/*" \
-		--filter="- .svn" \
-		--filter="+ */" \
-		--filter="+ *.html" \
-		--filter="+ *.css" \
-		--filter="+ *.png" \
-		--filter="+ *.php" \
-		--filter="+ *.idx" \
-		--filter="+ *.log" \
-		--filter="- *" \
-		. $(DEB_DOC)
+prerequisites:
+	aptitude install $(DEB_BASE) $(DEB_SENF)
 
+package:
+	$(SCONS) deb