You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Ivan Zhakov <ch...@gmail.com> on 2005/12/06 22:54:28 UTC
[PATCH] Eliminate intermediate build_neon.bat on Windows
Hi, Branko and Erik!
I am trying making Windows building scripts plainer and more stable.
In attached patch I replace build_neon.bat with calling nmake directly
from neon project file. I consider it plainer and help in situation
when there are several version of VS exists on computer. I am going to
commit it tomorrow if nobody complains. Please let me know if you like
this idea, so I make this behavior for zlib.
[[
Eliminate intermediate build_neon.bat on Windows.
* build.conf
(neon): Change project file location to neon's directory.
* build/generator/build_neon.ezt: Remove file.
* build/generator/gen_win.py
(__init__): Remove build_neon.bat file generation.
(write_neon_project_file): Change neon project file location. Pass
additional parameters to template.
* build/generator/neon.dsp.ezt
* build/generator/neon.vcproj.ezt: Change command line to call nmake
directly instead of build_neon.bat. Replace absolute paths to
relative.
]]
--
Ivan Zhakov
Re: [PATCH] Eliminate intermediate build_neon.bat on Windows
Posted by Mark Phippard <ma...@softlanding.com>.
Branko Čibej <br...@xbc.nu> wrote on 12/12/2005 06:53:00 AM:
> Ivan Zhakov wrote:
>
> >I consider when we make Windows DLLs we should link to openssl static
> >by default.
> >
> >
> I agree in priciple, but consider the following:
>
> * Doing this will, again remove the possibility of creating
> Subversion DLLs from the existing static libs with a simple relink
> (that's assuming that we still link with the dynamic openssl in
> the static libs, which IMHO is the only sane option).
> * There's work going on that will add SSL support to svnserve. Do we
> want to absorb the size of a static openssl _twice_ in our
binaries?
>
>
> I know there are problems with openssl DLL version mismatches. We can
> solve them by doing the same as we do with libintl -- compiling our own
> OpenSSL DLL (which we already do) under a different name.
My motiviation for making OpenSSL static was based entirely on this issue
(version mismatch). So if the build could make its own named version of
the DLL's that would do it for me.
Mark
_____________________________________________________________________________
Scanned for SoftLanding Systems, Inc. and SoftLanding Europe Plc by IBM Email Security Management Services powered by MessageLabs.
_____________________________________________________________________________
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] Eliminate intermediate build_neon.bat on Windows
Posted by Branko Čibej <br...@xbc.nu>.
Ivan Zhakov wrote:
>I consider when we make Windows DLLs we should link to openssl static
>by default.
>
>
I agree in priciple, but consider the following:
* Doing this will, again remove the possibility of creating
Subversion DLLs from the existing static libs with a simple relink
(that's assuming that we still link with the dynamic openssl in
the static libs, which IMHO is the only sane option).
* There's work going on that will add SSL support to svnserve. Do we
want to absorb the size of a static openssl _twice_ in our binaries?
I know there are problems with openssl DLL version mismatches. We can
solve them by doing the same as we do with libintl -- compiling our own
OpenSSL DLL (which we already do) under a different name.
>Also if you have some time will be great you prepare patch to add
>option "--openssl-static" to gen-make.py.
>
>--
>Ivan Zhakov
>
>
--
-- Brane
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] Eliminate intermediate build_neon.bat on Windows
Posted by Mark Phippard <ma...@softlanding.com>.
Ivan Zhakov <ch...@gmail.com> wrote on 12/08/2005 09:00:49 AM:
> Yes, but now you should tweak neon.dsp.ezt (neon.vcproj.ezt).
> I consider when we make Windows DLLs we should link to openssl static
> by default.
> Also if you have some time will be great you prepare patch to add
> option "--openssl-static" to gen-make.py.
Sorry, that is over my head. Also, the OpenSSL change is pretty easy to
do manually. What is really needed, in my opinion, is a switch to say you
do not want BDB. That takes a lot of editing of the generated files and
is a pain to do.
In my case, I am creating a "pure client" so I do not need it. I am also
trying to reduce the DLL dependencies for JavaHL because in that
environment it is easier to have DLL problems.
Mark
_____________________________________________________________________________
Scanned for SoftLanding Systems, Inc. and SoftLanding Europe Plc by IBM Email Security Management Services powered by MessageLabs.
_____________________________________________________________________________
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] Eliminate intermediate build_neon.bat on Windows
Posted by Ivan Zhakov <ch...@gmail.com>.
On 12/8/05, Mark Phippard <ma...@softlanding.com> wrote:
> Ivan Zhakov <ch...@gmail.com> wrote on 12/08/2005 05:36:34 AM:
>
> > On 12/8/05, Branko Čibej <br...@xbc.nu> wrote:
> > > Ivan Zhakov wrote:
> > > > Hi, Branko and Erik!
> > > > I am trying making Windows building scripts plainer and more stable.
> > > > In attached patch I replace build_neon.bat with calling nmake
> directly
> > > > from neon project file. I consider it plainer and help in situation
> > > > when there are several version of VS exists on computer. I am going
> to
> > > > commit it tomorrow if nobody complains. Please let me know if you
> like
> > > > this idea, so I make this behavior for zlib.
> > > >
> > > Looks good in general, but please make sure that it works in all
> > > combinations with/without zlib and openssl.
> > Commited in r17691. Of course, I have tested it in all possible
> configurations.
>
> I make a custom build of SVN where I tweak build_neon.bat so that Neon
> would use static OpenSSL. Would that still be possible after this change?
Yes, but now you should tweak neon.dsp.ezt (neon.vcproj.ezt).
I consider when we make Windows DLLs we should link to openssl static
by default.
Also if you have some time will be great you prepare patch to add
option "--openssl-static" to gen-make.py.
--
Ivan Zhakov
Re: [PATCH] Eliminate intermediate build_neon.bat on Windows
Posted by Branko Čibej <br...@xbc.nu>.
Ivan Zhakov wrote:
> On 12/8/05, Branko Čibej <br...@xbc.nu> wrote:
>
>> Ivan Zhakov wrote:
>>
>>> Hi, Branko and Erik!
>>> I am trying making Windows building scripts plainer and more stable.
>>> In attached patch I replace build_neon.bat with calling nmake directly
>>> from neon project file. I consider it plainer and help in situation
>>> when there are several version of VS exists on computer. I am going to
>>> commit it tomorrow if nobody complains. Please let me know if you like
>>> this idea, so I make this behavior for zlib.
>>>
>>>
>> Looks good in general, but please make sure that it works in all
>> combinations with/without zlib and openssl.
>>
> Commited in r17691. Of course, I have tested it in all possible configurations.
>
I assumed you did, but it's nice to be on the safe side. :)
>> If you're about to do the same for ZLib, you might take a look at using
>> the Windows makefile that comes with ZLib 1.2.x, like we use the Neon
>> makefile. (We don't support ZLib 1.1.x any more, so that wouldn't be a
>> problem.)
>>
> Thanks, I'll take a look. But it seems we already use ZLib's makefile
> (win32\Makefile.msc)
>
Oh, right. I didn't quite remember how far I'd got with that the last
time I was tweaking the build.
-- Brane
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] Eliminate intermediate build_neon.bat on Windows
Posted by Mark Phippard <ma...@softlanding.com>.
Ivan Zhakov <ch...@gmail.com> wrote on 12/08/2005 05:36:34 AM:
> On 12/8/05, Branko Čibej <br...@xbc.nu> wrote:
> > Ivan Zhakov wrote:
> > > Hi, Branko and Erik!
> > > I am trying making Windows building scripts plainer and more stable.
> > > In attached patch I replace build_neon.bat with calling nmake
directly
> > > from neon project file. I consider it plainer and help in situation
> > > when there are several version of VS exists on computer. I am going
to
> > > commit it tomorrow if nobody complains. Please let me know if you
like
> > > this idea, so I make this behavior for zlib.
> > >
> > Looks good in general, but please make sure that it works in all
> > combinations with/without zlib and openssl.
> Commited in r17691. Of course, I have tested it in all possible
configurations.
I make a custom build of SVN where I tweak build_neon.bat so that Neon
would use static OpenSSL. Would that still be possible after this change?
Mark
_____________________________________________________________________________
Scanned for SoftLanding Systems, Inc. and SoftLanding Europe Plc by IBM Email Security Management Services powered by MessageLabs.
_____________________________________________________________________________
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] Eliminate intermediate build_neon.bat on Windows
Posted by Ivan Zhakov <ch...@gmail.com>.
On 12/8/05, Branko Čibej <br...@xbc.nu> wrote:
> Ivan Zhakov wrote:
> > Hi, Branko and Erik!
> > I am trying making Windows building scripts plainer and more stable.
> > In attached patch I replace build_neon.bat with calling nmake directly
> > from neon project file. I consider it plainer and help in situation
> > when there are several version of VS exists on computer. I am going to
> > commit it tomorrow if nobody complains. Please let me know if you like
> > this idea, so I make this behavior for zlib.
> >
> Looks good in general, but please make sure that it works in all
> combinations with/without zlib and openssl.
Commited in r17691. Of course, I have tested it in all possible configurations.
> If you're about to do the same for ZLib, you might take a look at using
> the Windows makefile that comes with ZLib 1.2.x, like we use the Neon
> makefile. (We don't support ZLib 1.1.x any more, so that wouldn't be a
> problem.)
Thanks, I'll take a look. But it seems we already use ZLib's makefile
(win32\Makefile.msc)
--
Ivan Zhakov
Re: [PATCH] Eliminate intermediate build_neon.bat on Windows
Posted by Branko Čibej <br...@xbc.nu>.
Ivan Zhakov wrote:
> Hi, Branko and Erik!
> I am trying making Windows building scripts plainer and more stable.
> In attached patch I replace build_neon.bat with calling nmake directly
> from neon project file. I consider it plainer and help in situation
> when there are several version of VS exists on computer. I am going to
> commit it tomorrow if nobody complains. Please let me know if you like
> this idea, so I make this behavior for zlib.
>
Looks good in general, but please make sure that it works in all
combinations with/without zlib and openssl.
If you're about to do the same for ZLib, you might take a look at using
the Windows makefile that comes with ZLib 1.2.x, like we use the Neon
makefile. (We don't support ZLib 1.1.x any more, so that wouldn't be a
problem.)
-- Brane
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org