Ooh! Thanks! When I disabled the requirement to supply that option, I
neglected to see the ripple outcome.
Thx!
-g
On Sep 18, 2008, at 9:49, rhuijben_at_tigris.org wrote:
> Author: rhuijben
> Date: Thu Sep 18 07:49:21 2008
> New Revision: 33159
>
> Log:
> Following up to r33105, fix windows build when --with-sqlite is not
> passed
> to gen-make.py.
>
> * build/generator/gen_win.py
> (get_win_includes): Only add sqlite to fakeincludes when
> sqlite_path is
> set.
> (get_win_lib_dirs): Only add sqlite to fakelibdirs when sqlite_path
> is
> set.
>
> Modified:
> trunk/build/generator/gen_win.py
>
> Modified: trunk/build/generator/gen_win.py
> URL: http://svn.collab.net/viewvc/svn/trunk/build/generator/gen_win.py?pathrev=33159&r1=33158&r2=33159
> ===
> ===
> ===
> =====================================================================
> --- trunk/build/generator/gen_win.py Thu Sep 18 06:17:32 2008
> (r33158)
> +++ trunk/build/generator/gen_win.py Thu Sep 18 07:49:21 2008
> (r33159)
> @@ -848,10 +848,10 @@ class WinGeneratorBase(GeneratorBase):
> if target.lang == "ruby":
> fakeincludes.extend(self.ruby_includes)
>
> - fakeincludes.extend([
> - self.apath(self.zlib_path),
> - self.apath(self.sqlite_path, 'inc'),
> - ])
> + fakeincludes.extend(self.apath(self.zlib_path))
> +
> + if self.sqlite_path:
> + fakeincludes.extend(self.apath(self.sqlite_path, 'inc'))
>
> if self.sasl_path:
> fakeincludes.append(self.apath(self.sasl_path, 'include'))
> @@ -871,8 +871,9 @@ class WinGeneratorBase(GeneratorBase):
> fakelibdirs = [ self.apath(self.bdb_path, "lib"),
> self.apath(self.neon_path),
> self.apath(self.zlib_path),
> - self.apath(self.sqlite_path, "lib"),
> ]
> + if self.sqlite_path:
> + fakelibdirs.append(self.apath(self.sqlite_path, "lib"))
> if self.sasl_path:
> fakelibdirs.append(self.apath(self.sasl_path, "lib"))
> if self.serf_lib:
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: svn-unsubscribe_at_subversion.tigris.org
> For additional commands, e-mail: svn-help_at_subversion.tigris.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-09-18 17:00:43 CEST