From 958579fd8b42ec59c43ce36b27ae3af4c4380ade Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
Date: Sun, 6 Jan 2013 10:04:11 +0000
Subject: [PATCH] Automate release archive generation (merge r4676, r4677 and
 r4679 from trunk)

git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/2.2.x@4695 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 iscsi-scst/Makefile              |  3 +++
 qla2x00t/Makefile                |  3 +++
 scripts/generate-release-archive | 18 ++++++++++++++++++
 scst/Makefile                    |  3 +++
 scst_local/Makefile              |  3 +++
 srpt/Makefile                    |  2 +-
 6 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100755 scripts/generate-release-archive

diff --git a/iscsi-scst/Makefile b/iscsi-scst/Makefile
index e96ebaaa4..da9d7f11c 100644
--- a/iscsi-scst/Makefile
+++ b/iscsi-scst/Makefile
@@ -132,4 +132,7 @@ enable_proc:
 	@cmp $(INCDIR)/iscsi_scst_ver.h $(INCDIR)/iscsi_scst_ver.h.aa >/dev/null; if [[ $$? = 0 ]]; then rm $(INCDIR)/iscsi_scst_ver.h.aa; echo "sed failed: wrong original state?"; false; fi
 	rm $(INCDIR)/iscsi_scst_ver.h.aa
 
+release-archive:
+	../scripts/generate-release-archive iscsi-scst "$$(sed -n 's/^#define[[:blank:]]ISCSI_VERSION_STRING[[:blank:]]*\"\([^\"]*\)\".*/\1/p' include/iscsi_scst_ver.h)"
+
 .PHONY: all mods progs install clean extraclean debug2release release2debug debug2perf perf2debug disable_proc enable_proc
diff --git a/qla2x00t/Makefile b/qla2x00t/Makefile
index d97bd2430..57a3477d8 100644
--- a/qla2x00t/Makefile
+++ b/qla2x00t/Makefile
@@ -67,3 +67,6 @@ extraclean: clean
 .PHONY: all tgt install uninstall clean extraclean
 
 endif
+
+release-archive:
+	../scripts/generate-release-archive qla2x00t "$$(sed -n 's/^#define[[:blank:]]Q2T_VERSION_STRING[[:blank:]]*\"\([^\"]*\)\".*/\1/p' qla2x00-target/qla2x00t.h)"
diff --git a/scripts/generate-release-archive b/scripts/generate-release-archive
new file mode 100755
index 000000000..1c4fe2d75
--- /dev/null
+++ b/scripts/generate-release-archive
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+usage() {
+    echo "Usage: $(basename $0) name version"
+}
+
+if [ $# != 2 ]; then
+    usage
+    exit 1
+fi
+
+scriptdir="$(dirname "$0")"
+name="$1"
+version="$2"
+
+tar --owner=root --group=root --transform="s|^|$name-$version/|" \
+  -cjf $name-$version.tar.bz2 $($scriptdir/list-source-files) &&
+ls -l $name-$version.tar.bz2
diff --git a/scst/Makefile b/scst/Makefile
index 96d86c0ec..664ea00d8 100644
--- a/scst/Makefile
+++ b/scst/Makefile
@@ -57,6 +57,9 @@ disable_proc:
 enable_proc:
 	cd $(SCST_DIR) && $(MAKE) $@
 
+release-archive:
+	../scripts/generate-release-archive scst "$$(sed -n 's/^#define[[:blank:]]SCST_VERSION_NAME[[:blank:]]*\"\([^\"]*\)\".*/\1/p' include/scst_const.h)"
+
 help:
 	@echo "		all (the default) : make all"
 	@echo "		clean             : clean files"
diff --git a/scst_local/Makefile b/scst_local/Makefile
index 5166105c6..cf5cbeda6 100644
--- a/scst_local/Makefile
+++ b/scst_local/Makefile
@@ -108,5 +108,8 @@ perf2debug:
 	@cmp Makefile Makefile.aa >/dev/null; if [[ $$? = 0 ]]; then rm Makefile.aa; echo "sed failed: wrong original state?"; false; fi
 	rm Makefile.aa
 
+release-archive:
+	../scripts/generate-release-archive scst_local "$$(sed -n 's/^#define[[:blank:]]SCST_LOCAL_VERSION[[:blank:]]*\"\([^\"]*\)\".*/\1/p' scst_local.c)"
+
 .PHONY: all tgt install uninstall clean extraclean debug2release release2debug debug2perf perf2debug
 
diff --git a/srpt/Makefile b/srpt/Makefile
index e63a898ec..d4716557f 100644
--- a/srpt/Makefile
+++ b/srpt/Makefile
@@ -118,6 +118,6 @@ debug2perf:
 	$(call set_var,build_mode,BUILDMODE,PERF)
 
 release-archive:
-	@version="$$(sed -n 's/^#define DRV_VERSION[ 	]*\"\([0-9.]*\).*/\1/p' src/ib_srpt.c)"; tar --owner=root --group=root --transform="s|^|srpt-$$version/|" -cjf srpt-$$version.tar.bz2 $$(svn status -v -q | grep -v '^D' | cut -c11- | while read rev1 rev2 user path; do [ -d "$$path" ] || echo "$$path"; done) && ls -l srpt-$$version.tar.bz2
+	../scripts/generate-release-archive srpt "$$(sed -n 's/^#define[[:blank:]]DRV_VERSION[[:blank:]]*\"\([^\"]*\)\".*/\1/p' src/ib_srpt.c)"
 
 .PHONY: all install clean extraclean 2debug 2release 2perf