Changeset 740 for vendor/current/lib/talloc/script

Timestamp:

Nov 14, 2012, 12:59:34 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

Location:

vendor/current/lib/talloc/script

Files:

• mksigs.pl (modified) (3 diffs)
• mksyms.awk (modified) (3 diffs)
• release-script.sh (modified) (3 diffs)

vendor/current/lib/talloc/script/mksigs.pl

@@ -28 +28 @@
 
 my $in_comment = 0;
+my $in_doxygen = 0;
 my $extern_C_block = 0;
 
@@ -40 +41 @@
                         next;
                 }
+        }
+
+        # find end of DOXYGEN section
+        if ($in_doxygen) {
+                if ($LINE =~ /^#\s*else(?:\s+.*)?$/) {
+                        $in_doxygen = 0;
+                }
+                next;
         }
 
@@ -69 +78 @@
                 $LINE .= " " . $LINE2;
         }
+
+        # remove DOXYGEN sections
+        if ($LINE =~ /^#\s*ifdef\s+DOXYGEN(?:\s+.*)?$/) {
+                $in_doxygen = 1;
+                next;
+        }
+
 
         # remove all preprocessor directives

vendor/current/lib/talloc/script/mksyms.awk

@@ -9 +9 @@
 BEGIN {
         inheader=0;
+        indoxygen=0;
 }
 
@@ -21 +22 @@
                 next;
         }
+        if (indoxygen) {
+                if (match($0,"^#[ \t]*else[ \t]*.*$")) {
+                        indoxygen = 0;
+                }
+                next;
+        }
 }
 
-/^static/ || /^[ \t]*typedef/ || !/^[a-zA-Z\_]/ {
+/^static/ || /^[ \t]*typedef/ || !/^[a-zA-Z\_\#]/ {
         next;
 }
@@ -34 +41 @@
 }
 
+/^#[ \t]*ifdef[ \t]*DOXYGEN[ \t]*.*$/ {
+        indoxygen=1;
+        next;
+}
+
 # look for function headers:
 {
         gotstart = 0;
         if ($0 ~ /^[A-Za-z_][A-Za-z0-9_]+/) {
-        gotstart = 1;
+                gotstart = 1;
         }
         if(!gotstart) {

vendor/current/lib/talloc/script/release-script.sh

@@ -1 +1 @@
 #!/bin/bash
+
+LNAME=talloc
+LINCLUDE=talloc.h
 
 if [ "$1" = "" ]; then
@@ -6 +9 @@
 fi
 
-if [ ! -d "lib/talloc" ]; then
+if [ ! -d "lib/${LNAME}" ]; then
     echo "Run this script from the samba base directory."
     exit 1
 fi
-
-# Check exports and signatures are up to date
-pushd lib/talloc
-./script/abi_checks.sh talloc talloc.h
-abicheck=$?
-popd
-if [ ! "$abicheck" = "0" ]; then
-    echo "ERROR: ABI Checks produced warnings!"
-    exit 1
-fi
-
-git clean -f -x -d lib/talloc
-git clean -f -x -d lib/replace
 
 curbranch=`git branch |grep "^*" | tr -d "* "`
@@ -30 +20 @@
 
 # Checkout the release tag
-git branch -f talloc-release-script-${strver} talloc-${strver}
+git branch -f ${LNAME}-release-script-${strver} ${LNAME}-${strver}
 if [ ! "$?" = "0" ];  then
-    echo "Unable to checkout talloc-${strver} release"
+    echo "Unable to checkout ${LNAME}-${strver} release"
     exit 1
 fi
 
-git checkout talloc-release-script-${strver}
+function cleanquit {
+    #Clean up
+    git checkout $curbranch
+    git branch -d ${LNAME}-release-script-${strver}
+    exit $1
+}
+
+# NOTE: use cleanquit after this point
+git checkout ${LNAME}-release-script-${strver}
 
 # Test configure agrees with us
-confver=`grep "^AC_INIT" lib/talloc/configure.ac | tr -d "AC_INIT(talloc, " | tr -d ")"`
+confver=`grep "^AC_INIT" lib/${LNAME}/configure.ac | tr -d "AC_INIT(${LNAME}, " | tr -d ")"`
 if [ ! "$confver" = "$version" ]; then
     echo "Wrong version, requested release for ${version}, found ${confver}"
-    exit 1
+    cleanquit 1
 fi
 
+# Check exports and signatures are up to date
+pushd lib/${LNAME}
+./script/abi_checks.sh ${LNAME} ${LINCLUDE}
+abicheck=$?
+popd
+if [ ! "$abicheck" = "0" ]; then
+    echo "ERROR: ABI Checks produced warnings!"
+    cleanquit 1
+fi
+
+git clean -f -x -d lib/${LNAME}
+git clean -f -x -d lib/replace
+
 # Now build tarball
-cp -a lib/talloc talloc-${version}
-cp -a lib/replace talloc-${version}/libreplace
-pushd talloc-${version}
+cp -a lib/${LNAME} ${LNAME}-${version}
+cp -a lib/replace ${LNAME}-${version}/libreplace
+pushd ${LNAME}-${version}
 ./autogen.sh
 popd
-tar cvzf talloc-${version}.tar.gz talloc-${version}
-rm -fr talloc-${version}
+tar cvzf ${LNAME}-${version}.tar.gz ${LNAME}-${version}
+rm -fr ${LNAME}-${version}
 
-#Clean up
-git checkout $curbranch
-git branch -d talloc-release-script-${strver}
+cleanquit 0
+