From ba2dd67864a618c90a383879c47f201ea0713231 Mon Sep 17 00:00:00 2001
From: tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb>
Date: Sat, 28 Jun 2008 22:05:47 +0000
Subject: Integrate changes from Zaptel. builder is now indeed independent of
 dahdi/zaptel .

git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@4377 5390a7c7-147a-4af0-8ec9-7488f05a26cb
---
 build_tools/builder         | 10 +++++-----
 build_tools/test_kernel_git |  9 +++++++--
 2 files changed, 12 insertions(+), 7 deletions(-)

(limited to 'build_tools')

diff --git a/build_tools/builder b/build_tools/builder
index e85be77..a0311f5 100755
--- a/build_tools/builder
+++ b/build_tools/builder
@@ -127,7 +127,7 @@ case "$1" in
 init)
 	mkdir -p $LOGS_DIR
 	cat <<EOF | $SQLITE $DB
-CREATE TABLE runs(name TEXT PRIMARY KEY, time INTEGER DEFAULT CURRENT_TIMESTAMP, zap_ver TEXT);
+CREATE TABLE runs(name TEXT PRIMARY KEY, time INTEGER DEFAULT CURRENT_TIMESTAMP, driver_ver TEXT);
 CREATE TABLE results(name TEXT, system TEXT, kvers TEXT, result INTEGER, fail_type TEXT, log TEXT);
 EOF
 	mkdir -p $LOGS_DIR
@@ -136,12 +136,12 @@ EOF
 build)
 	cd $BASE_DIR
 	shift
+	
 	if [ "$*" != '' ]; then KERNELS_localhost="$*"; fi
-	#make update
-	make version.h
-	zap_ver=`awk -F'"' '/ZAPTEL_VERSION/{print $2}' version.h`
+	driver_ver=`$BUILD_SCRIPT version_driver`
 	build_name=`date '+%Y%m%d-%H%M%si'`
-	echo "INSERT INTO runs (name, zap_ver) VALUES ('$build_name', '$zap_ver');" | $SQLITE $DB
+
+	echo "INSERT INTO runs (name, driver_ver) VALUES ('$build_name', '$driver_ver');" | $SQLITE $DB
 
 	for host in $HOSTS; do
 		eval kernels="\$KERNELS_$host"
diff --git a/build_tools/test_kernel_git b/build_tools/test_kernel_git
index e6bf083..bb8fda0 100755
--- a/build_tools/test_kernel_git
+++ b/build_tools/test_kernel_git
@@ -14,6 +14,7 @@ usage() {
 	echo "  $me setver <kernel_ver>   Set the kernel version"
 	echo "  $me versions              Print available versions"
 	echo "  $me version               Print current (kernel) version"
+	echo "  $me version_driver        Print the version of Zaptel"
 	echo "  $me build                 Test-build"
 	echo "  $me git <git command>     Run <git command>"
 	echo ""
@@ -70,6 +71,11 @@ case "$command" in
 		echo -n "Actual: "
 		git describe | cut -c2-
 		;;
+	version_driver)
+		version_h=include/dahdi/version.h
+		make $version_h >/dev/null
+		awk -F'"' '/ZAPTEL_VERSION/{print $2}' $version_h
+		;;
 	setver)
 		kernel_ver="$2"
 		tag="v$kernel_ver"
@@ -77,13 +83,12 @@ case "$command" in
 		git-reset --hard "$tag"
 		make distclean
 		make defconfig modules_prepare
-		#make SUBDIRS=scripts # generate scripts/mod/modpost
 		set_var kernel_ver "$kernel_ver"
 		;;
 	test|build)
 		# you can pass extra parameters to the make command in
 		# two ways:
-		# 1. Set th value of MAKE_PARAMS in git_test.conf .
+		# 1. Set the value of MAKE_PARAMS in git_test.conf .
 		# 2. Any extra command-line parameter.
 		shift
 		make KSRC="$kernel_dir" KVERS=$kernel_ver $MAKE_PARAMS "$@"
-- 
cgit v1.2.3