[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2401-g7b2f25d

[Stefan Metzmacher]

The branch, v3-2-test has been updated
       via  7b2f25dd78f8e67b2ac4b5cd333fb788669fd2d3 (commit)
      from  ec4e8954402280c12c08cad0cb7cd9d3acb14152 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 7b2f25dd78f8e67b2ac4b5cd333fb788669fd2d3
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu May 22 16:27:22 2008 +0200

    build: add symbol versioning to libtdb via script/mksyms.*
    
    metze

-----------------------------------------------------------------------

Summary of changes:
 source/Makefile.in       |    2 +-
 source/script/mksyms.awk |    3 ---
 source/script/mksyms.sh  |   25 +++++++++++++++++++++----
 3 files changed, 22 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/Makefile.in b/source/Makefile.in
index 71b2018..b71bb34 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -1576,7 +1576,7 @@ $(LIBTALLOC_STATIC_TARGET): $(BINARY_PREREQS) $(LIBTALLOC_OBJ0)
 MKSYMS_SH = $(srcdir)/script/mksyms.sh
 
 $(LIBTDB_SYMS): $(LIBTDB_HEADERS)
-	@$(MKSYMS_SH) $(AWK) $@ $(LIBTDB_HEADERS)
+	@$(MKSYMS_SH) $(AWK) $(builddir)/library-versions $@ $(LIBTDB_HEADERS)
 
 $(LIBTDB_SHARED_TARGET): $(BINARY_PREREQS) $(LIBTDB_OBJ) $(LIBTDB_SYMS)
 	@echo Linking shared library $@
diff --git a/source/script/mksyms.awk b/source/script/mksyms.awk
index a30bea4..dfe51db 100644
--- a/source/script/mksyms.awk
+++ b/source/script/mksyms.awk
@@ -9,9 +9,6 @@
 BEGIN {
 	inheader=0;
 	current_file="";
-	print "#"
-	print "# This file is automatically generated with \"make symbols\". DO NOT EDIT "
-	print "#"
 	print "{"
 	print "\tglobal:"
 }
diff --git a/source/script/mksyms.sh b/source/script/mksyms.sh
index 51d3fbd..d2f3f3a 100755
--- a/source/script/mksyms.sh
+++ b/source/script/mksyms.sh
@@ -15,26 +15,43 @@ LANG=C; export LANG
 LC_ALL=C; export LC_ALL
 LC_COLLATE=C; export LC_COLLATE
 
-if [ $# -lt 2 ]
+if [ $# -lt 3 ]
 then
-  echo "Usage: $0 awk output_file header_files"
+  echo "Usage: $0 awk versionfile output_file header_files"
   exit 1
 fi
 
 awk="$1"
 shift
 
+versionfile="$1"
+shift
+
 symsfile="$1"
 shift
 symsfile_tmp="$symsfile.$$.tmp~"
 
+libname=`basename $symsfile | cut -d '.' -f1`
+verline=`grep $libname $versionfile`
+majver=`echo -n "$verline" | cut -d ':' -f2`
+minver=`echo -n "$verline" | cut -d ':' -f3`
+upname=`echo -n "$libname" | sed -e 's/^lib//' | tr '[a-z]' '[A-Z]'`
+symver="${upname}_${majver}_${minver}"
+
 proto_src="`echo $@ | tr ' ' '\n' | sort | uniq `"
 
-echo creating $symsfile
+echo "creating $symsfile for $symver"
 
 mkdir -p `dirname $symsfile`
 
-${awk} -f `dirname $0`/mksyms.awk $proto_src > $symsfile_tmp
+cat > $symsfile_tmp <<_ACEOF
+#
+# This file is automatically generated with "$0". DO NOT EDIT
+#
+$symver
+_ACEOF
+
+${awk} -f `dirname $0`/mksyms.awk $proto_src >> $symsfile_tmp
 
 if cmp -s $symsfile $symsfile_tmp 2>/dev/null
 then


-- 
Samba Shared Repository