Changeset 745 for trunk/server/release-scripts

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• release-scripts/build-htmlman-git (copied) (copied from vendor/current/release-scripts/build-htmlman-git )
• release-scripts/build-htmlman-nogit (copied) (copied from vendor/current/release-scripts/build-htmlman-nogit )
• release-scripts/build-manpages-git (copied) (copied from vendor/current/release-scripts/build-manpages-git )
• release-scripts/build-manpages-nogit (copied) (copied from vendor/current/release-scripts/build-manpages-nogit )
• release-scripts/create-tarball (modified) (8 diffs)

trunk/server/release-scripts/create-tarball

@@ -4 +4 @@
 OPT_BRANCH=""
 OPT_DOCSDIR=""
-OPT_TAG=""
 OPT_KEYID=""
 
@@ -33 +32 @@
     echo "    --branch <name>    Specify the branch to to create the archive file from"
     echo "    --copy-docs <dir>  Copy documentation from <dir> rather than building"
-    echo "    --tag <name>       Tag name for release"
     echo "    --keyid <email>    The GnuPG key ID used to sign the release tag"
     echo ""
@@ -68 +66 @@
                 shift
                 ;;
-            --tag)
-                shift
-                if [ -z "$1" ]; then
-                    printUsage
-                    return 1
-                fi
-                OPT_TAG="$1"
-                shift
-                ;;
             --keyid)
                 shift
@@ -101 +90 @@
 
 ##
-## Build the dopcumentation (may be a no-op)
+## Build the documentation (may be a no-op)
 ##
 
@@ -146 +135 @@
 function createReleaseTag
 {
-    if [ -z "${OPT_TAG}" ]; then
-        echo "Tagging disabled"
-        return 0
-    fi
-
-    if [ "x`git tag -l ${OPT_TAG}`" != "x" ]; then
-        echo -n "Tag exists.  Do you wish to overwrite? (y/N): "
+    tagname="$1"
+
+    if [ "x`git tag -l ${tagname}`" != "x" ]; then
+        echo -n "Tag '${tagname}' exists.  Do you wish to overwrite? (y/N): "
         read answer
 
@@ -169 +155 @@
     fi
 
-    git tag -u ${OPT_KEYID} ${OPT_TAG}
-    exitOnError $? "Failed to create tag"
+    git tag -u ${OPT_KEYID} ${tagname}
+    exitOnError $? "Failed to create tag '${tagname}'"
 
     return 0
@@ -214 +200 @@
     # the DFSG)
 
-    #if [ -d source4 ]; then
-    #   echo "Removing RFCs"
-    #   find source4/ -name "rfc*.txt" -exec rm -f {} \;
-    #fi
+    if [ -d source4 ]; then
+        echo "Removing RFCs"
+        find source4/ -name "rfc*.txt" -exec /bin/rm -f {} \;
+        /bin/rm -f source4/ldap_server/devdocs/draft-armijo-ldap-syntax-00.txt
+        /bin/rm -f source4/ldap_server/devdocs/ldapext-ldapv3-vlv-04.txt
+    fi
+
+    /bin/rm -f Makefile configure configure.developer
 
     packaging/bin/update-pkginfo ${version} 1 ""
@@ -238 +228 @@
     popd
 
-    createReleaseTag
+    createReleaseTag "samba-${version}"
     exitOnError $? "Failed to create release tag"