bzr-svn cannot be compiled for Subversion 1.5.* without hand-editing setup.py

[Alexey Borzenkov]

The problem is that Subversion 1.5 does not have libsvn_ra_dav-1.lib anymore: this prevents bzr-svn from compiling out of the box. While it is not difficult to remove libsvn_ra_dav-1 by hand every time (and I'm sure that's how people compile it right now), it is not ideal and would be good if bzr-svn would only try to link to libraries that actually exist. The attached adds a filter to only link against existing subversion libraries on Windows.

[Alexey Borzenkov (snaury)]

Oh, I withdraw my patch. Just tried this at work and something turned out to be very different, my patch no longer works, at least not with Visual Studio.

[Jelmer Vernooij (jelmer)]

Is the bug report still valid?

[Alexey Borzenkov (snaury)]

Yes, but I have no clue how to fix this properly. :(

The problem is that there are two distributions of Subversion for Windows. Binaries built against Apache 2.0 (with libraries libapr, libapriconv and libaprutil) and binaries built against Apache 2.2 (with libraries libapr-1, libapriconv-1 and libaprutil-1). So my patch was working for Apache 2.0 binaries (which I installed by accident, distribution filenames don't even reflect if binaries are apache 2.0 or 2.2) and then at work (where I had Apache 2.2 binaries) my patch did more harm than good, first not linking to apr at all, and then later failing to copy dlls in install_lib_with_dlls.

This turns out rather complicated. Ideal solution would be sort of autodetect if we are linking against Subversion 1.4/1.5 and Apache 2.0/2.2, but I'm not entirely sure what would be an ideal way to do that. Looking thru header files it doesn't seem we can grep for exact information either. :(

Would you accept a patch that does a fuzzy testing, based on absence of libsvn_ra_dav-1.dll and and presence of -1 in libapr*.dll in ${SVN_DEV}/bin? It's not ideal, but it might work...

[Alexey Borzenkov (snaury)]

Oops. I was wrong about subversion, we can search svn_version.h for the version number. And apr_version.h for apr, where 0.* appear to be for Apache 2.0 and 1.* appear to be for Apache 2.2. Working on a patch. :)

[Alexey Borzenkov (snaury)]

Done and here's the patch, formed with bzr send this time.

[Jelmer Vernooij (jelmer)]

Was this tested against svn 1.5 and 1.4, and with Visual Studio? Other than that, looks good to me.

[Alexey Borzenkov (snaury)]

Not yet, I'll only be able to test it with 1.4 and Visual Studio at work in several hours.

[Alexey Borzenkov (snaury)]

Jelmer, here's an improved patch. I tested this with Visual Studio and Subversion 1.4.6/1.5.2 (1.4.6 only Apache 2.2 ones, because I don't have the others and they are no longer available for download). This patch also adds libraries that became shared in 1.5 to the list of files copied to plugin directory and removes log.info mistakenly added in the previous patch.