You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Bert Huijben <be...@qqmail.nl> on 2014/03/06 09:50:16 UTC
RE: svn commit: r1574720 - /subversion/trunk/build.conf
> -----Original Message-----
> From: stsp@apache.org [mailto:stsp@apache.org]
> Sent: donderdag 6 maart 2014 00:28
> To: commits@subversion.apache.org
> Subject: svn commit: r1574720 - /subversion/trunk/build.conf
>
> Author: stsp
> Date: Wed Mar 5 23:27:57 2014
> New Revision: 1574720
>
> URL: http://svn.apache.org/r1574720
> Log:
> Add missing descriptions for several libraries to build.conf.
> These descriptions are used in pkg-config .pc files and I noticed
> a few .pc files were lacking them.
Thanks for updating these :)
>
> * build.conf
> (libsvn_fs_base, libsvn_fs_fs, libsvn_fs_x,
> libsvn_fs_util, libsvn_ra, libsvn_ra_serf,
> libsvn_ra_svn, libsvn_ra_local): Describe these libraries.
>
> Modified:
> subversion/trunk/build.conf
>
> Modified: subversion/trunk/build.conf
> URL:
> http://svn.apache.org/viewvc/subversion/trunk/build.conf?rev=1574720&r1
> =1574719&r2=1574720&view=diff
> ==========================================================
> ====================
> --- subversion/trunk/build.conf (original)
> +++ subversion/trunk/build.conf Wed Mar 5 23:27:57 2014
> @@ -273,6 +273,7 @@ add-install-deps = $(SVN_FS_LIB_INSTALL_
> msvc-export = svn_fs.h private/svn_fs_private.h
>
> [libsvn_fs_base]
> +description = Subversion Filesystem Base Library
> type = fs-module
> path = subversion/libsvn_fs_base
> sources = *.c bdb/*.c util/*.c
> @@ -281,6 +282,7 @@ libs = libsvn_delta libsvn_subr aprutil
> msvc-static = yes
>
> [libsvn_fs_fs]
> +description = Subversion FSFS Repository Filesystem Library
> type = fs-module
> path = subversion/libsvn_fs_fs
> install = fsmod-lib
> @@ -288,6 +290,7 @@ libs = libsvn_delta libsvn_subr aprutil
> msvc-static = yes
>
> [libsvn_fs_x]
> +description = Subversion FSX Repository Filesystem Library
> type = fs-module
> path = subversion/libsvn_fs_x
> install = fsmod-lib
> @@ -296,6 +299,7 @@ msvc-static = yes
>
> # Low-level grab bag of utilities
> [libsvn_fs_util]
> +description = Subversion Filesystem Utility Library
> type = lib
> install = fsmod-lib
> path = subversion/libsvn_fs_util
> @@ -305,7 +309,7 @@ msvc-static = yes
>
> # General API for accessing repositories
> [libsvn_ra]
> -description = Subversion Repository Access Library
> +description = Subversion General Repository Access Library
> type = lib
> path = subversion/libsvn_ra
> libs = libsvn_delta libsvn_subr ra-libs apriconv apr
This hunk of the patch makes the result on the Windows shared libraries slightly less accurate.
On Windows the libraries with msvc-static = true are compiled into static libraries, that are then later linked into the parent libraries and applications. So our libsvn_ra-1.dll doesn't just contain libsvn_ra, but also libsvn_ra_svn and libsvn_ra_serf.
But now it has the description 'Subversion General Repository Access Library'...
> @@ -317,6 +321,7 @@ msvc-export = svn_ra.h private\svn_ra_pr
>
> # Accessing repositories via DAV through serf
> [libsvn_ra_serf]
> +description = Subversion HTTP/WebDAV Protocol Repository Access Library
> type = ra-module
> path = subversion/libsvn_ra_serf
> install = serf-lib
> @@ -325,6 +330,7 @@ msvc-static = yes
>
> # Accessing repositories via SVN
> [libsvn_ra_svn]
> +description = Subversion SVN Protocol Repository Access Library
> type = ra-module
> path = subversion/libsvn_ra_svn
> install = ramod-lib
> @@ -333,6 +339,7 @@ msvc-static = yes
>
> # Accessing repositories via direct libsvn_fs
> [libsvn_ra_local]
> +description = Subversion Local Repository Access Library
> type = ra-module
> path = subversion/libsvn_ra_local
> install = ramod-lib
And because until recently we didn't use the description on *nix, the only reason to fill in the description was to produce Win32 resources.
I'm trying to find where we produce the pkg-config files, but I can't find it... Do you know where we write these?
Bert
Re: svn commit: r1574720 - /subversion/trunk/build.conf
Posted by Branko Čibej <br...@wandisco.com>.
On 06.03.2014 12:57, Stefan Sperling wrote:
> On Thu, Mar 06, 2014 at 09:50:16AM +0100, Bert Huijben wrote:
>>> @@ -305,7 +309,7 @@ msvc-static = yes
>>>
>>> # General API for accessing repositories
>>> [libsvn_ra]
>>> -description = Subversion Repository Access Library
>>> +description = Subversion General Repository Access Library
>>> type = lib
>>> path = subversion/libsvn_ra
>>> libs = libsvn_delta libsvn_subr ra-libs apriconv apr
>> This hunk of the patch makes the result on the Windows shared libraries slightly less accurate.
>>
>> On Windows the libraries with msvc-static = true are compiled into static libraries, that are then later linked into the parent libraries and applications. So our libsvn_ra-1.dll doesn't just contain libsvn_ra, but also libsvn_ra_svn and libsvn_ra_serf.
>>
>> But now it has the description 'Subversion General Repository Access Library'...
>>
> Do you have any suggestions about what to do instead?
Split "decription" from "pkg-description". Have fun updating the build
generator. :)
-- Brane
--
Branko Čibej | Director of Subversion
WANdisco // Non-Stop Data
e. brane@wandisco.com
Re: svn commit: r1574720 - /subversion/trunk/build.conf
Posted by Stefan Sperling <st...@elego.de>.
On Thu, Mar 06, 2014 at 09:50:16AM +0100, Bert Huijben wrote:
> > @@ -305,7 +309,7 @@ msvc-static = yes
> >
> > # General API for accessing repositories
> > [libsvn_ra]
> > -description = Subversion Repository Access Library
> > +description = Subversion General Repository Access Library
> > type = lib
> > path = subversion/libsvn_ra
> > libs = libsvn_delta libsvn_subr ra-libs apriconv apr
>
> This hunk of the patch makes the result on the Windows shared libraries slightly less accurate.
>
> On Windows the libraries with msvc-static = true are compiled into static libraries, that are then later linked into the parent libraries and applications. So our libsvn_ra-1.dll doesn't just contain libsvn_ra, but also libsvn_ra_svn and libsvn_ra_serf.
>
> But now it has the description 'Subversion General Repository Access Library'...
>
Do you have any suggestions about what to do instead?
> I'm trying to find where we produce the pkg-config files, but I can't find it... Do you know where we write these?
The descriptions are written into .pc.in files by gen-make.py