svn commit: r723603 - in /httpd/site/trunk/dist/tools: release.sh roll.sh

[pq...@apache.org]

Author: pquerna
Date: Thu Dec  4 22:15:48 2008
New Revision: 723603

URL: http://svn.apache.org/viewvc?rev=723603&view=rev
Log:
When creating a release for trunk/2.3.x, create separate tarballs for dependencies, rather than always bundling them.

Modified:
    httpd/site/trunk/dist/tools/release.sh
    httpd/site/trunk/dist/tools/roll.sh

Modified: httpd/site/trunk/dist/tools/release.sh
URL: http://svn.apache.org/viewvc/httpd/site/trunk/dist/tools/release.sh?rev=723603&r1=723602&r2=723603&view=diff
==============================================================================
--- httpd/site/trunk/dist/tools/release.sh (original)
+++ httpd/site/trunk/dist/tools/release.sh Thu Dec  4 22:15:48 2008
@@ -83,6 +83,7 @@
 project="$1"
 version="$2"
 user="$3"
+separate_deps=0
 
 case "$1" in
   httpd-2.0)
@@ -125,6 +126,7 @@
     apr_xxx_in_srclib=1
     apr_tag="1.3.3"
     apu_tag="1.3.4"
+    separate_deps=1
     ;;
   *)
     echo "ERROR: '$1' is an unknown project." >&2
@@ -259,4 +261,4 @@
 
 cp ${dirname}/CHANGES CHANGES_${major}.${minor}
 
-${ROLL} ${dirname} ${user} || exit 1
+${ROLL} ${dirname} ${user} ${separate_deps}|| exit 1

Modified: httpd/site/trunk/dist/tools/roll.sh
URL: http://svn.apache.org/viewvc/httpd/site/trunk/dist/tools/roll.sh?rev=723603&r1=723602&r2=723603&view=diff
==============================================================================
--- httpd/site/trunk/dist/tools/roll.sh (original)
+++ httpd/site/trunk/dist/tools/roll.sh Thu Dec  4 22:15:48 2008
@@ -15,13 +15,15 @@
 
 dirname="$1"
 user="$2"
+separate_deps="$3"
 
-if test "$#" != 1 && test "$#" != 2; then
-  echo "USAGE: $0 SOURCE [SIGNING-USER]" >&2
+if test "$#" != 1 && test "$#" != 2 && test "$#" != 3; then
+  echo "USAGE: $0 SOURCE [SIGNING-USER] [separate_dependencies]" >&2
   echo "  see the comments in this script for more info." >&2
   exit 1
 fi
 
+
 split="---------------------------------------------------------------------"
 
 echo $split
@@ -55,6 +57,20 @@
 find $dirname/docs/manual -name \*.xml -o -name \*.xml.\* | xargs rm -rf 
 find $dirname/docs/manual -name \*.xsl -o -name \*.xsl.\* | xargs rm -rf 
 
+if test "${separate_deps}" = 1; then
+    echo $split
+    echo ""
+    echo "Moving dependencies to their own tarball, .gz, and .bz2 files ..."
+    echo ""
+    depsdir="${dirname}-deps/${dirname}"
+    mkdir -p ${depsdir}/srclib
+    mv "${dirname}/srclib/apr" "${depsdir}/srclib"
+    mv "${dirname}/srclib/apr-util" "${depsdir}/srclib"
+    tar -C "${dirname}-deps" -cf ${dirname}-deps.tar ${dirname}
+    gzip -9 --to-stdout ${dirname}-deps.tar > ${dirname}-deps.tar.gz
+    bzip2 -9 ${dirname}-deps.tar
+fi
+
 echo $split
 echo ""
 echo "Building the tarball, .gz, and .bz2 files ..."
@@ -73,6 +89,12 @@
 if test -x "${md5sum}"; then
   ${md5sum} ${dirname}.tar.gz > ${dirname}.tar.gz.md5
   ${md5sum} ${dirname}.tar.bz2 > ${dirname}.tar.bz2.md5
+  if test -f "${dirname}-deps.tar.gz"; then
+    ${md5sum} ${dirname}-deps.tar.gz > ${dirname}-deps.tar.gz.md5
+  fi
+  if test -f "${dirname}-deps.tar.bz2"; then
+    ${md5sum} ${dirname}-deps.tar.bz2 > ${dirname}-deps.tar.bz2.md5
+  fi
 fi
 
 if test -x "`which pgp 2> /dev/null`"; then
@@ -82,6 +104,13 @@
 
   pgp -sba ${dirname}.tar.gz ${args}
   pgp -sba ${dirname}.tar.bz2 ${args}
+  if test -f "${dirname}-deps.tar.gz"; then
+    pgp -sba ${dirname}.tar.gz ${args}
+  fi
+
+  if test -f "${dirname}-deps.tar.bz2"; then
+    pgp -sba ${dirname}.tar.bz2 ${args}
+  fi
 elif test -x "`which gpg 2> /dev/null`"; then
   if test -z "${user}"; then
     args="--default-key ${args}"
@@ -91,6 +120,12 @@
 
   gpg --armor ${args} --detach-sign ${dirname}.tar.gz
   gpg --armor ${args} --detach-sign ${dirname}.tar.bz2
+  if test -f "${dirname}-deps.tar.gz"; then
+    gpg --armor ${args} --detach-sign ${dirname}-deps.tar.gz
+  fi
+  if test -f "${dirname}-deps.tar.bz2"; then
+    gpg --armor ${args} --detach-sign ${dirname}-deps.tar.bz2
+  fi
 else
   echo "PGP or GnuPG not found!  Not signing release!"
 fi