httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From minf...@apache.org
Subject cvs commit: httpd-2.0/build get-version.sh
Date Tue, 15 Apr 2003 16:14:39 GMT
minfrin     2003/04/15 09:14:38

  Modified:    .        Tag: APACHE_2_0_BRANCH CHANGES buildconf
  Added:       build    Tag: APACHE_2_0_BRANCH get-version.sh
  Log:
  Backport the version parsing for RPM from v2.1 to v2.0
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.988.2.78 +4 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.77
  retrieving revision 1.988.2.78
  diff -u -r1.988.2.77 -r1.988.2.78
  --- CHANGES	15 Apr 2003 16:07:42 -0000	1.988.2.77
  +++ CHANGES	15 Apr 2003 16:14:33 -0000	1.988.2.78
  @@ -1,5 +1,9 @@
   Changes with Apache 2.0.46
   
  +  *) Add code to buildconf that produces an httpd.spec file from
  +     httpd.spec.in, using build/get-version.sh from APR.
  +     [Graham Leggett]
  +
     *) Fixed a segfault when multiple ProxyBlock directives were used.
        PR: 19023 [Sami Tikka <sami.tikka@f-secure.com>]
   
  
  
  
  1.27.2.7  +15 -0     httpd-2.0/buildconf
  
  Index: buildconf
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/buildconf,v
  retrieving revision 1.27.2.6
  retrieving revision 1.27.2.7
  diff -u -r1.27.2.6 -r1.27.2.7
  --- buildconf	30 Mar 2003 21:29:03 -0000	1.27.2.6
  +++ buildconf	15 Apr 2003 16:14:36 -0000	1.27.2.7
  @@ -181,4 +181,19 @@
   rm -f config.cache
   ${AUTOCONF:-autoconf} 2>&1 | grep -v "$cross_compile_warning"
   
  +echo rebuilding rpm spec file
  +( VMMN=`build/get-version.sh mmn include/ap_mmn.h MODULE_MAGIC_NUMBER`
  +  REVISION=`build/get-version.sh all include/ap_release.h AP_SERVER`
  +  VERSION=`echo $REVISION | cut -d- -s -f1`
  +  RELEASE=`echo $REVISION | cut -d- -s -f2`
  +  if [ "x$VERSION" = "x" ]; then
  +    VERSION=$REVISION
  +    RELEASE=1
  +  fi
  +  cat ./build/rpm/httpd.spec.in | \
  +  sed -e "s/APACHE_VERSION/$VERSION/" \
  +      -e "s/APACHE_RELEASE/$RELEASE/" \
  +      -e "s/APACHE_MMN/$VMMN/" \
  +  > httpd.spec )
  +
   exit 0
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +0 -0      httpd-2.0/build/get-version.sh
  
  Index: get-version.sh
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/build/get-version.sh,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  
  
  

Mime
View raw message