Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Date: 25 Nov 2002 04:17:11 -0000
Message-ID: <20021125041711.88656.qmail@icarus.apache.org>
From: wsanchez@apache.org
To: httpd-2.0-cvs@apache.org
Subject: cvs commit: httpd-2.0/build binbuild.sh

wsanchez    2002/11/24 20:17:11

  Modified:    build    binbuild.sh
  Log:
  Don't use GNU tar.
  Problem here is that GNU tar creates tar archives which are not POSIX-compliant and cannot be unpacked using a POSIX tar program.
  Typical oopsie is a developer uses binbuild to pack up an httpd release on a system which does not include gtar in the standard distro, but it's there on the developer's computer.  User downloads it and find that it won't unpack with standard tar, even though it claims to be a tar archive.  Blah.
  
  Revision  Changes    Path
  1.41      +15 -17    httpd-2.0/build/binbuild.sh
  
  Index: binbuild.sh
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/build/binbuild.sh,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- binbuild.sh	12 Aug 2002 14:21:48 -0000	1.40
  +++ binbuild.sh	25 Nov 2002 04:17:11 -0000	1.41
  @@ -15,7 +15,6 @@
   CONFIGPARAM="--enable-layout=Apache --prefix=$BUILD_DIR --enable-mods-shared=most --with-expat=$APFULLDIR/srclib/apr-util/xml/expat --enable-static-support"
   VER=`echo $APDIR |sed s/httpd-//`
   TAR="`srclib/apr/build/PrintPath tar`"
  -GTAR="`srclib/apr/build/PrintPath gtar`"
   GZIP="`srclib/apr/build/PrintPath gzip`"
   
   if [ x$1 != x ]; then
  @@ -149,26 +148,25 @@
     echo "ERROR: Failed to build Apache. See \"build.log\" for details."
     exit 1;
   else
  -  if [ "x$GTAR" != "x" ]
  +  if [ "x$TAR" != "x" ]
     then
  -    $GTAR -zcf ../httpd-$VER-$OS.tar.gz -C .. httpd-$VER
  -  else
  -    if [ "x$TAR" != "x" ]
  +    case "x$OS" in
  +      x*os390*) $TAR -cfU ../httpd-$VER-$OS.tar -C .. httpd-$VER;;
  +      *) (cd .. && $TAR -cf httpd-$VER-$OS.tar httpd-$VER);;
  +    esac
  +    if [ "x$GZIP" != "x" ]
       then
  -      case "x$OS" in
  -        x*os390*) $TAR -cfU ../httpd-$VER-$OS.tar -C .. httpd-$VER;;
  -	    *) (cd .. && $TAR -cf httpd-$VER-$OS.tar httpd-$VER);;
  -      esac
  -      if [ "x$GZIP" != "x" ]
  -      then
  -        $GZIP ../httpd-$VER-$OS.tar
  -      fi
  +      $GZIP -9 ../httpd-$VER-$OS.tar
       else
  -      echo "ERROR: Could not find a 'tar' program!"
  -      echo "       Please execute the following commands manually:"
  -      echo "         tar -cf ../httpd-$VER-$OS.tar ."
  -      echo "         gzip ../httpd-$VER-$OS.tar"
  +      echo "WARNING: Could not find a 'gzip' program!"
  +      echo "       Please execute the following command manually:"
  +      echo "         gzip -9 ../httpd-$VER-$OS.tar"
       fi
  +  else
  +    echo "ERROR: Could not find a 'tar' program!"
  +    echo "       Please execute the following commands manually:"
  +    echo "         tar -cf ../httpd-$VER-$OS.tar ."
  +    echo "         gzip -9 ../httpd-$VER-$OS.tar"
     fi
   
     if [ -f ../httpd-$VER-$OS.tar.gz ] && [ -f ../httpd-$VER-$OS.README ]