You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2011/02/09 13:32:57 UTC
svn commit: r1068863 - /subversion/trunk/build/generator/gen_msvc_dsp.py
Author: rhuijben
Date: Wed Feb 9 12:32:57 2011
New Revision: 1068863
URL: http://svn.apache.org/viewvc?rev=1068863&view=rev
Log:
Following up on r1034362, fix generating the Visual C++ 6.0 style project
and workspace files. Visual C++ 6.0 is no longer supported by Microsoft,
but is still the default compiler used for Windows support by the Apr and
Httpd projects.
* build/generator/gen_msvc_dsp.py
(write_project): Take template from the right folder.
(write): Fetch sql header dependencies.
Modified:
subversion/trunk/build/generator/gen_msvc_dsp.py
Modified: subversion/trunk/build/generator/gen_msvc_dsp.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_msvc_dsp.py?rev=1068863&r1=1068862&r2=1068863&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_msvc_dsp.py (original)
+++ subversion/trunk/build/generator/gen_msvc_dsp.py Wed Feb 9 12:32:57 2011
@@ -98,10 +98,23 @@ class Generator(gen_win.WinGeneratorBase
'instrument_purify_quantify' : self.instrument_purify_quantify,
}
- self.write_with_template(fname, 'msvc_dsp.ezt', data)
+ self.write_with_template(fname, 'templates/msvc_dsp.ezt', data)
def write(self):
"Write a Workspace (.dsw)"
+
+ # Gather sql targets for inclusion in svn_config project.
+ class _eztdata(object):
+ def __init__(self, **kw):
+ vars(self).update(kw)
+
+ import sys
+ sql=[]
+ for hdrfile, sqlfile in sorted(self.graph.get_deps(gen_base.DT_SQLHDR),
+ key=lambda t: t[0]):
+ sql.append(_eztdata(header=hdrfile.replace('/', '\\'),
+ source=sqlfile[0].replace('/', '\\'),
+ svn_python=sys.executable))
self.move_proj_file(self.projfilesdir,
'svn_config.dsp',
@@ -157,4 +170,4 @@ class Generator(gen_win.WinGeneratorBase
'targets' : targets,
}
- self.write_with_template('subversion_msvc.dsw', 'msvc_dsw.ezt', data)
+ self.write_with_template('subversion_msvc.dsw', 'templates/msvc_dsw.ezt', data)
Re: svn commit: r1068863 - /subversion/trunk/build/generator/gen_msvc_dsp.py
Posted by Joe Swatosh <jo...@gmail.com>.
Hi Bert,
On Thu, Feb 10, 2011 at 2:54 AM, Bert Huijben <be...@qqmail.nl> wrote:
>> -----Original Message-----
>> From: Joe Swatosh [mailto:joe.swatosh@gmail.com]
>> Sent: woensdag 9 februari 2011 23:43
>> To: dev@subversion.apache.org
>> Cc: rhuijben@apache.org
>> Subject: Re: svn commit: r1068863 -
>> /subversion/trunk/build/generator/gen_msvc_dsp.py
>>
>> On Wed, Feb 9, 2011 at 4:32 AM, <rh...@apache.org> wrote:
>> > Author: rhuijben
>> > Date: Wed Feb 9 12:32:57 2011
>> > New Revision: 1068863
>> >
>> > URL: http://svn.apache.org/viewvc?rev=1068863&view=rev
>> > Log:
>> > Following up on r1034362, fix generating the Visual C++ 6.0 style
>> project
>> > and workspace files. Visual C++ 6.0 is no longer supported by
>> Microsoft,
>> > but is still the default compiler used for Windows support by the Apr
>> and
>> > Httpd projects.
>> >
>> > * build/generator/gen_msvc_dsp.py
>> > (write_project): Take template from the right folder.
>> > (write): Fetch sql header dependencies.
>> >
>>
>> Hi Bert,
>> Thanks! I get much further, but I also needed this to build:
>>
>> Index: subversion/include/svn_types.h
>> ===================================================================
>> --- subversion/include/svn_types.h (revision 1069119)
>> +++ subversion/include/svn_types.h (working copy)
>> @@ -29,6 +29,7 @@
>>
>> /* ### this should go away, but it causes too much breakage right now
>> */
>> #include <stdlib.h>
>> +#include <limits.h> /* for ULONG_MAX */
>
> I think we should use one of the apr defines instead. Leaving this for
> somebody else to fix.
Understood. I just put the include here because SVN_LINENUM_MAX_VALUE
is #define'd using it around line 1189. And I included it in the
patch I sent you for completeness.
Curious that no one else gets compile failures. Probably the vagaries
of differing implementations, everyone else's probably includes
limits.h indirectly. What approach would you recommend for getting
this addressed?
>
>>
>> #include <apr.h> /* for apr_size_t, apr_int64_t, ... */
>> #include <apr_errno.h> /* for apr_status_t */
>> Index: build/generator/templates/svn_config.dsp.ezt
>> ===================================================================
>> --- build/generator/templates/svn_config.dsp.ezt (revision
>> 1069119)
>> +++ build/generator/templates/svn_config.dsp.ezt (working copy)
>> @@ -75,7 +75,7 @@
>> InputPath=..\..\subversion\svn_private_config.hw
>>
>> "..\..\subversion\svn_private_config.h" : $(SOURCE) "$(INTDIR)"
>> "$(OUTDIR)"
>> - copy ..\..\subversion\svn_private_config.hw
>> ..\..\subversion\svn_private_config.h > nul
>> + copy ..\..\..\subversion\svn_private_config.hw
>> ..\..\..\subversion\svn_private_config.h > nul
>>
>> # End Custom Build
>
> Fixed in r1069335. Can you confirm that this patch works for you?
>
> Bert
>
Works a treat! Thanks.
--
Joe
RE: svn commit: r1068863 - /subversion/trunk/build/generator/gen_msvc_dsp.py
Posted by Bert Huijben <be...@qqmail.nl>.
> -----Original Message-----
> From: Joe Swatosh [mailto:joe.swatosh@gmail.com]
> Sent: woensdag 9 februari 2011 23:43
> To: dev@subversion.apache.org
> Cc: rhuijben@apache.org
> Subject: Re: svn commit: r1068863 -
> /subversion/trunk/build/generator/gen_msvc_dsp.py
>
> On Wed, Feb 9, 2011 at 4:32 AM, <rh...@apache.org> wrote:
> > Author: rhuijben
> > Date: Wed Feb 9 12:32:57 2011
> > New Revision: 1068863
> >
> > URL: http://svn.apache.org/viewvc?rev=1068863&view=rev
> > Log:
> > Following up on r1034362, fix generating the Visual C++ 6.0 style
> project
> > and workspace files. Visual C++ 6.0 is no longer supported by
> Microsoft,
> > but is still the default compiler used for Windows support by the Apr
> and
> > Httpd projects.
> >
> > * build/generator/gen_msvc_dsp.py
> > (write_project): Take template from the right folder.
> > (write): Fetch sql header dependencies.
> >
>
> Hi Bert,
> Thanks! I get much further, but I also needed this to build:
>
> Index: subversion/include/svn_types.h
> ===================================================================
> --- subversion/include/svn_types.h (revision 1069119)
> +++ subversion/include/svn_types.h (working copy)
> @@ -29,6 +29,7 @@
>
> /* ### this should go away, but it causes too much breakage right now
> */
> #include <stdlib.h>
> +#include <limits.h> /* for ULONG_MAX */
I think we should use one of the apr defines instead. Leaving this for
somebody else to fix.
>
> #include <apr.h> /* for apr_size_t, apr_int64_t, ... */
> #include <apr_errno.h> /* for apr_status_t */
> Index: build/generator/templates/svn_config.dsp.ezt
> ===================================================================
> --- build/generator/templates/svn_config.dsp.ezt (revision
> 1069119)
> +++ build/generator/templates/svn_config.dsp.ezt (working copy)
> @@ -75,7 +75,7 @@
> InputPath=..\..\subversion\svn_private_config.hw
>
> "..\..\subversion\svn_private_config.h" : $(SOURCE) "$(INTDIR)"
> "$(OUTDIR)"
> - copy ..\..\subversion\svn_private_config.hw
> ..\..\subversion\svn_private_config.h > nul
> + copy ..\..\..\subversion\svn_private_config.hw
> ..\..\..\subversion\svn_private_config.h > nul
>
> # End Custom Build
Fixed in r1069335. Can you confirm that this patch works for you?
Bert
Re: svn commit: r1068863 - /subversion/trunk/build/generator/gen_msvc_dsp.py
Posted by Joe Swatosh <jo...@gmail.com>.
On Wed, Feb 9, 2011 at 4:32 AM, <rh...@apache.org> wrote:
> Author: rhuijben
> Date: Wed Feb �9 12:32:57 2011
> New Revision: 1068863
>
> URL: http://svn.apache.org/viewvc?rev=1068863&view=rev
> Log:
> Following up on r1034362, fix generating the Visual C++ 6.0 style project
> and workspace files. Visual C++ 6.0 is no longer supported by Microsoft,
> but is still the default compiler used for Windows support by the Apr and
> Httpd projects.
>
> * build/generator/gen_msvc_dsp.py
> �(write_project): Take template from the right folder.
> �(write): Fetch sql header dependencies.
>
Hi Bert,
Thanks! I get much further, but I also needed this to build:
Index: subversion/include/svn_types.h
===================================================================
--- subversion/include/svn_types.h (revision 1069119)
+++ subversion/include/svn_types.h (working copy)
@@ -29,6 +29,7 @@
/* ### this should go away, but it causes too much breakage right now */
#include <stdlib.h>
+#include <limits.h> /* for ULONG_MAX */
#include <apr.h> /* for apr_size_t, apr_int64_t, ... */
#include <apr_errno.h> /* for apr_status_t */
Index: build/generator/templates/svn_config.dsp.ezt
===================================================================
--- build/generator/templates/svn_config.dsp.ezt (revision 1069119)
+++ build/generator/templates/svn_config.dsp.ezt (working copy)
@@ -75,7 +75,7 @@
InputPath=..\..\subversion\svn_private_config.hw
"..\..\subversion\svn_private_config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- copy ..\..\subversion\svn_private_config.hw
..\..\subversion\svn_private_config.h > nul
+ copy ..\..\..\subversion\svn_private_config.hw
..\..\..\subversion\svn_private_config.h > nul
# End Custom Build
Thanks,
--
Joe