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

Re: [PATCH] Honor cyrus-sasl default installation location

From: Daniel Shahaf <d.s_at_daniel.shahaf.co.il>
Date: Sat, 14 Jun 2008 21:37:41 +0300 (Jerusalem Daylight Time)

Daniel Shahaf wrote on Sat, 14 Jun 2008 at 17:25 +0300:
> Jens Peters wrote on Sun, 8 Jun 2008 at 14:16 +0200:
> > Hello there,
> >
> > When you build cyrus sasl on windows and finally run make install then the
> > libsasl.dll is located at the bin directory. I think win-test.py should honor
> > that. The attached patch fixes that.
> >
>
> Why did it work before your patch?
>

In the SASL source distribution, the libsasl.dll is found inside the 'lib'
directory. So other people may have passing --with-sasl=path/to/sasl-src/,
while you're passing the path to the installed SASL.

I think we could look in both places. Example: (untested)

Index: win-tests.py
===================================================================
--- win-tests.py (revision 31733)
+++ win-tests.py (working copy)
@@ -253,8 +253,16 @@ def locate_libs():
       dlls.append(partial_path + '.dll')
 
   if gen_obj.sasl_path is not None:
- dlls.append(os.path.join(gen_obj.sasl_path, 'lib', 'libsasl.dll'))
+ def libsasl_dll_path(dir):
+ return os.path.join(gen_obj.sasl_path, dir, 'libsasl.dll')
 
+ if os.path.exists(libsasl_dll_path('lib')):
+ # libsasl.dll in SASL source
+ dlls.append(libsasl_dll_path('lib'))
+ else:
+ # libsasl.dll in SASL installed directory (by 'make install')
+ dlls.append(libsasl_dll_path('bin'))
+
   for dll in dlls:
     copy_changed_file(dll, abs_objdir)
 
Does it work for you?

Daniel

> > Regards,
> > Jens
> >
> > [[[
> > * win-tests.py
> > Assume that libsasl.dll is found in 'bin' instead of 'lib' folder as this is
> > the default installation location.
> >
> > Patch by: jpeters7677_at_gmx.de
> > ]]]
> >
>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-06-14 20:38:01 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.