Merge remote branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

[openldap] / build / mkrelease

diff --git a/build/mkrelease b/build/mkrelease
index f8fdaaba11b40b9fa3e8d0d122c31a177fa8dad1..d72d617756c75089c4b78f2d4634e5d76449026a 100755 (executable)
--- a/build/mkrelease
+++ b/build/mkrelease
@@ -2,7 +2,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2006 The OpenLDAP Foundation.
+## Copyright 1998-2013 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -14,25 +14,26 @@
 ## <http://www.OpenLDAP.org/license.html>.
 #
 # Make a release
-#      mkrelease RELNAME CVSTAG CVSMODULES
-# where CVSTAG is the tag to export from the current CVSROOT
 #
 
 #
 # This script MUST NOT add files to the export nor modify
-# any file in the export.
+# any file in the export, exceptions:
+#      make guide.html
 #
 
 set -e                 # exit immediately if any errors occur
 
 if test $# != 3 ; then
-       echo 'usage: mkrelease RELNAME CVSTAG CVSMODULES ...'
+       echo 'usage: mkrelease REPO RELNAME TAG'
        exit 1
 fi
 
+REPO=$1
+shift
 RELNAME=openldap-$1
 shift
-CVSTAG=$1
+TAG=$1
 shift
 
 if test -e $RELNAME ; then
@@ -41,10 +42,9 @@ if test -e $RELNAME ; then
 fi
 
 echo Release: $RELNAME
-echo CVS Tag: $CVSTAG
-echo Modules: $*
+echo Tag: $TAG
 
-cvs -q export -kkv -r $CVSTAG -d $RELNAME $*
+git archive --format=tar --prefix="${RELNAME}/" --remote="${REPO}" "$TAG" |  tar xvf -
 
 if test ! -d $RELNAME ; then
        echo "error: $RELNAME doesn't exists"
@@ -58,6 +58,11 @@ else
        echo "No guide"
 fi
 
+if test -e $RELNAME/libraries/liblunicode/ucdata/uctable.h ; then
+       echo "touching uctable.h..."
+       touch $RELNAME/libraries/liblunicode/ucdata/uctable.h
+fi
+
 if test ! -e $RELNAME/build/version.sh ; then
        echo "No build version"
        OL_STRING="something"