[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: Adding svn_dirent to the Windows build (was: Re: svn commit: r33396 - trunk/subversion/tests/libsvn_subr)

From: Bert Huijben <bert_at_vmoo.com>
Date: Sun, 5 Oct 2008 18:38:55 +0200

> -----Original Message-----
> From: Daniel Shahaf [mailto:d.s_at_daniel.shahaf.name]
> Sent: zondag 5 oktober 2008 18:34
> To: dev_at_subversion.tigris.org
> Subject: Adding svn_dirent to the Windows build (was: Re: svn commit:
> r33396 - trunk/subversion/tests/libsvn_subr)
>
> Daniel Shahaf wrote on Thu, 2 Oct 2008 at 20:28 +0300:
> > But more importantly, r33211 also made copy_tests 74 pass on Windows.
> > (The test is XFail on trunk, but passes on the branch. My fault for
> not
> > making this clearer at the time I committed the fix.) I think the
> > proper fix now is just:
> >
> > Index: subversion/libsvn_wc/copy.c
> >
> ===================================================================
> > --- subversion/libsvn_wc/copy.c (revision 33373)
> > +++ subversion/libsvn_wc/copy.c (working copy)
> > @@ -334,8 +334,8 @@ get_copyfrom_url_rev_via_parent(const char
> *src_pa
> >
> > /* Don't look for parent_path in src_access if it can't be
> > there... */
> > - if
> (svn_path_is_ancestor(svn_wc_adm_access_path(src_access),
> > - parent_path))
> > + if
> (svn_dirent_is_ancestor(svn_wc_adm_access_path(src_access),
> > + parent_path))
> > {
> > SVN_ERR(svn_wc_adm_retrieve(&parent_access,
> src_access,
> > parent_path, pool));
>
> With the above patch, the libsvn_wc dll fails to link, even after I add
> the missing '#include "svn_dirent_uri.h"' and add svn_dirent_uri.h to
> build.conf. How do I fix this?

Adding the #include is probably enough and regenerating the makefiles (via
gen_make.py) should handle the rest of the dependency tracking.

What compilation/linking error do you get?

(The dirent code is part of libsvn_subr which is linked to libsvn_wc)

        Bert

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-10-05 18:39:10 CEST

This is an archived mail posted to the Subversion Dev mailing list.