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

Re: svn commit: r21293 - trunk/build/generator

From: Daniel Rall <dlr_at_collab.net>
Date: 2006-09-02 01:14:39 CEST

On Mon, 28 Aug 2006, djh@tigris.org wrote:
...
> Fix Windows build for neon 0.26.x.
>
> * build/generator/gen_win.py
> (get_win_defines): Define SVN_NEON_0_26 as appropriate.
...
> --- trunk/build/generator/gen_win.py (original)
> +++ trunk/build/generator/gen_win.py Mon Aug 28 06:57:30 2006
> @@ -620,6 +620,9 @@
> # check if we have a newer neon (0.25.x)
> if self.neon_ver >= 25000:
> fakedefines.append("SVN_NEON_0_25=1")
> + # check for neon 0.26.x or newer
> + if self.neon_ver >= 26000:
> + fakedefines.append("SVN_NEON_0_26=1")

I don't claim to know the intricacies of the 'doze build, but don't we
need to do the check for "self.neon_ver >= 26000" first, and put
subsequent checks in "else" blocks? Otherwise, we'll be adding
multiple elements to fakedefines...

Index: build/generator/gen_win.py
===================================================================
--- gen_win.py (revision 21332)
+++ gen_win.py (working copy)
@@ -617,12 +617,12 @@
     if self.enable_nls:
       fakedefines.append("ENABLE_NLS")
       
- # check if we have a newer neon (0.25.x)
- if self.neon_ver >= 25000:
- fakedefines.append("SVN_NEON_0_25=1")
     # check for neon 0.26.x or newer
     if self.neon_ver >= 26000:
       fakedefines.append("SVN_NEON_0_26=1")
+ # check if we have a newer neon (0.25.x)
+ elif self.neon_ver >= 25000:
+ fakedefines.append("SVN_NEON_0_25=1")
 
     # check we have sasl
     if self.sasl_path:

  • application/pgp-signature attachment: stored
Received on Sat Sep 2 01:13:29 2006

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