httpd-apreq-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject svn commit: r151086 - in httpd/apreq/trunk: CHANGES STATUS acinclude.m4 build/get-version.sh
Date Thu, 03 Feb 2005 00:11:16 GMT
Author: joes
Date: Wed Feb  2 16:11:13 2005
New Revision: 151086

URL: http://svn.apache.org/viewcvs?view=rev&rev=151086
Log:

Make our "libtool current interface" number depend on apr's 
major number.  This allows libapreq2 to be installed into a 
system-wide location while avoiding ABI conflicts arising from
our apr-based interfaces.

Modified:
    httpd/apreq/trunk/CHANGES
    httpd/apreq/trunk/STATUS
    httpd/apreq/trunk/acinclude.m4
    httpd/apreq/trunk/build/get-version.sh

Modified: httpd/apreq/trunk/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/apreq/trunk/CHANGES?view=diff&r1=151085&r2=151086
==============================================================================
--- httpd/apreq/trunk/CHANGES (original)
+++ httpd/apreq/trunk/CHANGES Wed Feb  2 16:11:13 2005
@@ -5,6 +5,12 @@
 @section v2_05 Changes with libapreq2-2.05
 
 
+- C API [joes]
+  Make our "libtool current interface" number depend on apr's 
+  major number.  This allows libapreq2 to be installed into a 
+  system-wide location while avoiding ABI conflicts arising from
+  our apr-based interfaces.
+
 - C API [Max Kellermann]
   mod_apreq must check the return value of apreq_brigade_concat
   to avoid a RAM-consuming infinite loop.  A bad APREQ_TempDir 

Modified: httpd/apreq/trunk/STATUS
URL: http://svn.apache.org/viewcvs/httpd/apreq/trunk/STATUS?view=diff&r1=151085&r2=151086
==============================================================================
--- httpd/apreq/trunk/STATUS (original)
+++ httpd/apreq/trunk/STATUS Wed Feb  2 16:11:13 2005
@@ -34,6 +34,11 @@
 
 TODO:
 
+    - Document the new apr-dependency in our soname's major version:
+
+         libapreq2.so.2.x.y  <--- has apr-0's ABI
+         libapreq2.so.3.x.y  <--- has apr-1's ABI
+
     - We need to add some basic charset support.  Long discussion 
       starts here:
               http://article.gmane.org/gmane.comp.apache.apreq/2371

Modified: httpd/apreq/trunk/acinclude.m4
URL: http://svn.apache.org/viewcvs/httpd/apreq/trunk/acinclude.m4?view=diff&r1=151085&r2=151086
==============================================================================
--- httpd/apreq/trunk/acinclude.m4 (original)
+++ httpd/apreq/trunk/acinclude.m4 Wed Feb  2 16:11:13 2005
@@ -53,7 +53,7 @@
                 APACHE2_INCLUDES=-I`$APACHE2_APXS -q INCLUDEDIR`
 
                 APR_MAJOR_VERSION=`$APACHE2_APXS -q APR_VERSION 2>/dev/null | cut -d.
-f 1`
-                if test ${APR_MAJOR_VERSION:=0} -eq 0; then
+                if test ${APR_MAJOR_VERSION:="0"} -eq 0; then
                     apr_config=apr-config
                     apu_config=apu-config 
                 else
@@ -168,9 +168,19 @@
         get_version="$abs_srcdir/build/get-version.sh"
         version_hdr="$abs_srcdir/src/apreq_version.h"
 
-        APREQ_LIBTOOL_VERSION=`$get_version libtool $version_hdr APREQ`
+        # set version data
+
         APREQ_MAJOR_VERSION=`$get_version major $version_hdr APREQ`
-        APREQ_DOTTED_VERSION=`$get_version all $version_hdr APREQ`
+        APREQ_MINOR_VERSION=`$get_version minor $version_hdr APREQ`
+        APREQ_PATCH_VERSION=`$get_version patch $version_hdr APREQ`
+        APREQ_DOTTED_VERSION=`$get_version all  $version_hdr APREQ`
+
+        # XXX: APR_MAJOR_VERSION doesn't yet work for static builds
+        APREQ_LIBTOOL_CURRENT=`expr $APREQ_MAJOR_VERSION + $APREQ_MINOR_VERSION + $APR_MAJOR_VERSION`
+        APREQ_LIBTOOL_REVISION=$APREQ_PATCH_VERSION
+        APREQ_LIBTOOL_AGE=$APREQ_MINOR_VERSION
+
+        APREQ_LIBTOOL_VERSION="$APREQ_LIBTOOL_CURRENT:$APREQ_LIBTOOL_REVISION:$APREQ_LIBTOOL_AGE"
 
         APREQ_LIBNAME="apreq$APREQ_MAJOR_VERSION"
         APREQ_INCLUDES=""
@@ -256,3 +266,4 @@
   echo [$]0 [$]ac_configure_args '"[$]@"' >> $1
   chmod +x $1
 ])dnl
+

Modified: httpd/apreq/trunk/build/get-version.sh
URL: http://svn.apache.org/viewcvs/httpd/apreq/trunk/build/get-version.sh?view=diff&r1=151085&r2=151086
==============================================================================
--- httpd/apreq/trunk/build/get-version.sh (original)
+++ httpd/apreq/trunk/build/get-version.sh Wed Feb  2 16:11:13 2005
@@ -8,12 +8,13 @@
 #
 #   get-version.sh all returns a dotted version number
 #   get-version.sh major returns just the major version number
-#   get-version.sh libtool returns a version "libtool -version-info" format
+#   get-version.sh minor returns just the minor version number
+#   get-version.sh patch returns just the match version number
 #
 
 if test $# != 3; then
   echo "USAGE: $0 CMD INCLUDEDIR PREFIX"
-  echo "  where CMD is one of: all, major, libtool"
+  echo "  where CMD is one of: all, major, minor, patch"
   exit 1
 fi
 
@@ -23,14 +24,15 @@
 major="`sed -n $major_sed $2`"
 minor="`sed -n $minor_sed $2`"
 patch="`sed -n $patch_sed $2`"
-ltmaj="`expr $major + $minor`"
 
 if test "$1" = "all"; then
   echo ${major}.${minor}.${patch}
 elif test "$1" = "major"; then
   echo ${major}
-elif test "$1" = "libtool"; then
-  echo ${ltmaj}:${patch}:${minor}
+elif test "$1" = "minor"; then
+  echo ${minor}
+elif test "$1" = "patch"; then
+  echo ${patch}
 else
   echo "ERROR: unknown version CMD ($1)"
   exit 1



Mime
View raw message