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

Re: [PATCH] Remove APR ICONV dependency on Windows (was SVN Win32 Developers -- need some help)

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2007-07-05 15:10:53 CEST

On 7/5/07, Mark Phippard <markphip@gmail.com> wrote:
> On 7/5/07, Ivan Zhakov <chemodax@gmail.com> wrote:
> > On 7/3/07, D.J. Heap <djheap@gmail.com> wrote:
> > > On 7/2/07, Ivan Zhakov <chemodax@gmail.com> wrote:
> > > [snip]
> > > > Here is revisited patch. Major vhanges from previous version:
> > > > - Use MLang API for converting page name to page id.
> > > > - All Windows stuff moved to separate file win32_xlate.c.
> > > >
> > > > [[[
> > > > Remove APR ICONV dependency on Windows and use native Windows
> > > > character conversion API (MultiByteToWideChar/WideCharToMultiByte).
> > > >
> > >
> > >
> > > I've built and posted binaries with this patch at:
> > >
> > > http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=8682&expandFolder=8682&folderID=8682
> > >
> > > I still get 2 fs-test failures with VS6 -- haven't had time to dig
> > > into them yet.
> > >
> > > Also, I think we should probably check the return of CoInit and not
> > > call CoUninit if it fails (because CoInit/CoInitEx has already been
> > > called with a different apartment or something).
> > >
> > Good point! I've added check for return value of CoInitialize() and
> > also added logic to detect when COM already initialized for different
> > apartment.
> >
> > I think that patch is acceptable for trunk, thus I've committed it in
> > r25640. Review more than welcome :)
> >
> > On 7/3/07, Daniel Rall <dlr@collab.net> wrote:
> > > Just a nitpick, but some of the formatting is pretty inconsistent with
> > > the rest of the code base (use of Hungarian notation, lack of
> > > whitespace between data type and value in type casts, etc.).
> > Thanks, I've checked my patch again and fixed what I found.
>
> Thanks Ivan.
>
> Is it possible to build apr-util without iconv now? Or do we still
> have to build apr-iconv and ship the DLL and just know that we are now
> not actually using it?

AFAIK Subversion doesn't build apr/apr-util anymore?
Anyway: you must patch the apr build a little bit to make sure that
the apr-iconv dll isn't needed anymore:

there's a file 'apu.hw' which gets copied to 'apu.h' in the build
process. Depending on where you got the apr sources (repository
checkout or tarball), you have to edit the hw or the h file.
You have to change the defines:
APU_HAVE_APR_ICONV and APU_HAVE_ICONV to be both '0', not '1'.
Then you must of course do a rebuild of apr (and I think apr-util too).

Stefan

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Jul 5 15:10:52 2007

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