You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Jens Peters <jp...@gmx.de> on 2008/06/08 12:16:31 UTC
[PATCH] Honor cyrus-sasl default installation location
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.
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@gmx.de
]]]
Re: [PATCH] Honor cyrus-sasl default installation location
Posted by Jens Peters <jp...@gmx.de>.
Daniel Shahaf wrote:
> It didn't for you, but it does work for other people. The latter is the
> focus of my question.
>
The initial lines of code are made by vgeorgescu as suggested by brane
and djh. Is anybody of you around there to comment if you use(d) a stock
or custom installation of libsasl?
Regards,
Jens
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] Honor cyrus-sasl default installation location
Posted by Daniel Shahaf <d....@daniel.shahaf.co.il>.
Mark Phippard wrote on Sat, 14 Jun 2008 at 12:20 -0400:
> On Sat, Jun 14, 2008 at 12:06 PM, Daniel Shahaf <d....@daniel.shahaf.co.il> wrote:
> > Jens Peters wrote on Sat, 14 Jun 2008 at 17:43 +0200:
> >> Daniel Shahaf wrote:
> >> > 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?
> >>
> >> Actually it didn't. At least not on my two windows system where I build
> >
> > It didn't for you, but it does work for other people. The latter is the
> > focus of my question.
>
> Are you sure it works for other people? I sign the Windows builds and
> have not been building with SASL. I do not think Paul Burba does
> either.
>
I assume it works for the person who wrote the code. I think Bert also
tried SASL recently.
Daniel
(who isn't building SASL, either)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] Honor cyrus-sasl default installation location
Posted by Mark Phippard <ma...@gmail.com>.
On Sat, Jun 14, 2008 at 12:06 PM, Daniel Shahaf <d....@daniel.shahaf.co.il> wrote:
> Jens Peters wrote on Sat, 14 Jun 2008 at 17:43 +0200:
>> Daniel Shahaf wrote:
>> > 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?
>>
>> Actually it didn't. At least not on my two windows system where I build
>
> It didn't for you, but it does work for other people. The latter is the
> focus of my question.
Are you sure it works for other people? I sign the Windows builds and
have not been building with SASL. I do not think Paul Burba does
either.
--
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] Honor cyrus-sasl default installation location
Posted by Daniel Shahaf <d....@daniel.shahaf.co.il>.
Jens Peters wrote on Sat, 14 Jun 2008 at 17:43 +0200:
> Daniel Shahaf wrote:
> > 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?
>
> Actually it didn't. At least not on my two windows system where I build
It didn't for you, but it does work for other people. The latter is the
focus of my question.
> libsasl myself. Building libsasl on windows is pretty straight forward and
> 'nmake install' creates the following structure:
>
> bin
> doc
> include
> lib
>
> whereas the libsasl.dll lives in bin and libsasl.lib is found in lib. Having
> dll's in bin is also the common setup on windows for lots of other, mostly
> ported from linux/unix, projects (eg. bdb, gettext, openssl
, svn
> ).
>
> Regards,
> jens
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] Honor cyrus-sasl default installation location
Posted by Jens Peters <jp...@gmx.de>.
Daniel Shahaf wrote:
> 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?
Actually it didn't. At least not on my two windows system where I build
libsasl myself. Building libsasl on windows is pretty straight forward
and 'nmake install' creates the following structure:
bin
doc
include
lib
whereas the libsasl.dll lives in bin and libsasl.lib is found in lib.
Having dll's in bin is also the common setup on windows for lots of
other, mostly ported from linux/unix, projects (eg. bdb, gettext, openssl).
Regards,
jens
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] Honor cyrus-sasl default installation location
Posted by Jens Peters <jp...@gmx.de>.
Daniel Shahaf wrote:
> 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.
Ah, yes, I see. Actually, now that I'm reading your message, I remember
that I had the same issue with include. The installation places the
headers files in /include/sasl while the src ditribution keeps them in
include. Because I don't wanted to change the subversion source I just
moved the headers in the installation folder (and as result I never saw
a TSVN exclamation mark that I changed something in opposite to
win-test.py and so I forgot :(). Since make_gen.py is actually not very
consequent when setting up a windows environment (eg. http, apr, openssl
are source distributions while bdb, svn-intl are installation folders)
it wouldn't help much to apply my patch. I try to remember that
--with-sasl should point to the src distribution.
The nice way I guess would be to alter gen_make.py arguments to use
with-sasl-src, with-http-src etc. where it fits.
Regards,
jens
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] Honor cyrus-sasl default installation location
Posted by Daniel Shahaf <d....@daniel.shahaf.co.il>.
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@gmx.de
> > ]]]
> >
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] Honor cyrus-sasl default installation location
Posted by Jens Peters <jp...@gmx.de>.
Daniel Shahaf wrote:
> Why did it work before your patch?
A new patch with a better log message, it really wasn't my best day when
sending this and the javahl patch.. :(
[[[
Assume that libsasl.dll is found in 'bin' instead of 'lib' folder as
this is the default installation location on Windows.
* win-tests.py
Change the location where to look for libsasl.dll from 'lib' to 'bin'.
Patch by: jpeters7677@gmx.de
]]]
Re: [PATCH] Honor cyrus-sasl default installation location
Posted by Daniel Shahaf <d....@daniel.shahaf.co.il>.
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?
> 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@gmx.de
> ]]]
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org