svn commit: r105909 - httpd/httpd/dist/tools

[je...@apache.org]

Author: jerenkrantz
Date: Fri Nov 19 17:28:36 2004
New Revision: 105909

Modified:
   httpd/httpd/dist/tools/release.sh
   httpd/httpd/dist/tools/roll.sh
Log:
First cut at producing SVN-compatible release scripts.  Also adds bz2 rolls.


Modified: httpd/httpd/dist/tools/release.sh
==============================================================================
--- httpd/httpd/dist/tools/release.sh	(original)
+++ httpd/httpd/dist/tools/release.sh	Fri Nov 19 17:28:36 2004
@@ -64,19 +64,16 @@
 
 case "$1" in
   httpd-2.0)
-    repos_name="httpd-2.0"
-    tag_prefix="APACHE"
     ver_path="include/ap_release.h"
     ver_define="AP_SERVER_PATCHLEVEL"
 
     expected_major="2"
     expected_minor="0"
-    
+
     apr_xxx_in_srclib=1
+    apr_tag="0.9.5"
     ;;
   httpd-2.1)
-    repos_name="httpd-2.0"
-    tag_prefix="APACHE"
     ver_path="include/ap_release.h"
     ver_define="AP_SERVER_PATCHLEVEL"
 
@@ -84,6 +81,7 @@
     expected_minor="1"
 
     apr_xxx_in_srclib=1
+    apr_tag="1.0.1"
     ;;
   *)
     echo "ERROR: '$1' is an unknown project." >&2
@@ -98,10 +96,10 @@
 if test ${tagged_release}; then
   tagname="${tag}"
 else
-  tagname="${tag_prefix}_${major}_${minor}_${patch}"
+  tagname="${version}"
 fi
 
-dirname="`echo ${repos_name} | sed 's/-[0-9]*\.[0-9]*$//'`"
+dirname="`echo ${project} | sed 's/-[0-9]*\.[0-9]*$//'`"
 dirname="${dirname}-${version}"
 if test "${postfix}" != ""; then
   postfix="-${postfix}"
@@ -140,18 +138,19 @@
 
 echo $split
 echo ""
-echo "Starting CVS export of ${repos_name} to ${dirname} ..."
+echo "Starting SVN export of ${project} to ${dirname} ..."
 echo ""
 
-cvs -d cvs.apache.org:/home/cvs export -r ${tagname} -d ${dirname} ${repos_name} > /dev/null || exit 1
+svn export http://svn.apache.org/repos/asf/httpd/httpd/tags/${tagname} ${dirname} > /dev/null || exit 1
+# > /dev/null || exit 1
 
 ### Add a check to see if what was checked out matches $vsn
 
 if test ${apr_xxx_in_srclib}; then
-  ( cd ${dirname}/srclib &&
-    cvs -d cvs.apache.org:/home/cvs export -r ${tagname} apr >/dev/null &&
-    cvs -d cvs.apache.org:/home/cvs export -r ${tagname} apr-util >/dev/null
-  ) || exit 1
+  echo "Starting SVN export of apr-${apr_tag} to ${dirname}/srclib ..."
+  svn export http://svn.apache.org/repos/asf/apr/apr/tags/${apr_tag} ${dirname}/srclib/apr > /dev/null || exit 1
+  echo "Starting SVN export of apr-util-${apr_tag} to ${dirname}/srclib ..."
+  svn export http://svn.apache.org/repos/asf/apr/apr-util/tags/${apr_tag} ${dirname}/srclib/apr-util > /dev/null || exit 1
 fi
 
 echo $split
@@ -208,4 +207,3 @@
 cp ${dirname}/CHANGES CHANGES_${major}.${minor}
 
 ${ROLL} ${dirname} ${user} || exit 1
-

Modified: httpd/httpd/dist/tools/roll.sh
==============================================================================
--- httpd/httpd/dist/tools/roll.sh	(original)
+++ httpd/httpd/dist/tools/roll.sh	Fri Nov 19 17:28:36 2004
@@ -34,7 +34,6 @@
 echo "files via buildconf ..."
 echo ""
 
-find $dirname -name .cvsignore | xargs rm -f
 find $dirname -name autom4te*.cache | xargs rm -rf
 find $dirname -name STATUS | xargs rm -rf
 
@@ -56,6 +55,7 @@
 
 tar cf ${dirname}.tar ${dirname}
 gzip -9 --to-stdout ${dirname}.tar > ${dirname}.tar.gz
+bzip2 -c ${dirname}.tar > ${dirname}.tar.bz2
 compress ${dirname}.tar
 
 echo $split
@@ -67,6 +67,7 @@
 if test -x "${md5sum}"; then
   ${md5sum} ${dirname}.tar.gz > ${dirname}.tar.gz.md5
   ${md5sum} ${dirname}.tar.Z > ${dirname}.tar.Z.md5
+  ${md5sum} ${dirname}.tar.bz2 > ${dirname}.tar.bz2.md5
 fi
 
 if test -x "`which pgp 2> /dev/null`"; then
@@ -75,6 +76,7 @@
   fi
 
   pgp -sba ${dirname}.tar.gz ${args}
+  pgp -sba ${dirname}.tar.bz2 ${args}
   pgp -sba ${dirname}.tar.Z ${args}
 elif test -x "`which gpg 2> /dev/null`"; then
   if test -n "${user}"; then
@@ -82,6 +84,7 @@
   fi
 
   gpg --armor ${args} --detach-sign ${dirname}.tar.gz
+  gpg --armor ${args} --detach-sign ${dirname}.tar.bz2
   gpg --armor ${args} --detach-sign ${dirname}.tar.Z
 else
   echo "PGP or GnuPG not found!  Not signing release!"