X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=build%2Fcheck-customs;h=b22975055c17e92e220fb872765116b2c6c61baf;hb=6829bc0163f6ecfc8ae70ee7b3ce2b79e7484dfe;hp=3c471df585b4aa066d9ce0c5db472eaa218c5d6a;hpb=136c4f2fe9e1b7df2929c240e5a94973f596a259;p=libucw.git

diff --git a/build/check-customs b/build/check-customs
index 3c471df5..b2297505 100755
--- a/build/check-customs
+++ b/build/check-customs
@@ -1,6 +1,6 @@
 #!/bin/bash
 # A script for testing compilability of different configurations
-# (c) 2004--2005 Martin Mares <mj@ucw.cz>
+# (c) 2004--2006 Martin Mares <mj@ucw.cz>
 
 set -e
 
@@ -13,27 +13,13 @@ function try
 	mkdir $TDIR
 	echo "### Test $TEST: $@ ###" | tee $TDIR/log
 
-	CUST=$1
-	shift
-	SUBST=
-	APP="!!### Added by check-customs:"
-	while [ -n "$1" ] ; do
-		X=$1
-		Y=${X#!}
-		if [ "$X" != "$Y" ] ; then
-			SUBST="${S}/^$Y/s/^/# /;"
-		else
-			APP="$APP!$X"
-		fi
-		shift
-	done
-
 	(
 		cd $TDIR
-		cp -a ../../$CUST custom
-		sed "$SUBST;p;d" <../../$CUST/config.mk >custom/config.mk
-		echo $APP | tr ! '\n' >>custom/config.mk
-		if ! make -f ../../Makefile s=../.. >>log 2>&1 ; then
+		if ! ../../configure $@ CC=gcc-3.4 >>log 2>&1 ; then
+			echo "	CANNOT CONFIGURE"
+			exit 1
+		fi
+		if ! make >>log 2>&1 ; then
 			echo "	FAILED"
 			exit 1
 		fi
@@ -47,13 +33,15 @@ if [ -n "$1" ] ; then
 	try "$@"
 else
 	try free									# the free version
-	try bare !CONFIG_INDEXER !CONFIG_SEARCH						# absolutely stripped version
+	try bare -CONFIG_INDEXER -CONFIG_SEARCH						# absolutely stripped version
 	try bare									# the bare version
 	try debug/matcher-test								# bare + custom stats and matchers
-	try centrum !CONFIG_GATHERER !CONFIG_GATHERD !CONFIG_SHEPHERD !CONFIG_REAPD !CONFIG_INDEXER !CONFIG_MUX !CONFIG_WATSON	# search servers
-	try centrum !CONFIG_GATHERER !CONFIG_GATHERD !CONFIG_SHEPHERD !CONFIG_REAPD !CONFIG_MUX !CONFIG_WATSON	# indexing server
-	try centrum !CONFIG_GATHERD !CONFIG_SHEPHERD !CONFIG_INDEXER !CONFIG_SEARCH !CONFIG_MUX !CONFIG_WATSON	# reapd server
-	try centrum 		 							# full Centrum config
-	try debug/custom CONFIG_SHARED=1						# debugging configuration with shared libs
-	try debug/custom								# debugging configuration
+	try centrum/cz ROLE=search1-x							# various Centrum.cz configurations
+	try centrum/cz ROLE=indexer
+	try centrum/cz ROLE=gather
+	try centrum/cz ROLE=reap+watson
+	try centrum/cz ROLE=all CONFIG_PARTMAP_IS_MMAP
+	try centrum/pl ROLE=all
+	try debug CONFIG_SHARED								# debugging configuration with shared libs
+	try debug									# debugging configuration
 fi