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

Re: Attn: Windows Devs -- Need to add missing sqlite build options for Windows (issue #3364)

From: Ivan Zhakov <ivan_at_visualsvn.com>
Date: Wed, 18 Feb 2009 19:44:16 +0300

On Wed, Feb 18, 2009 at 7:08 PM, Mark Phippard <markphip_at_gmail.com> wrote:
> On Wed, Feb 18, 2009 at 11:02 AM, Bert Huijben <rhuijben_at_sharpsvn.net> wrote:
>> Is it a problem to just keep the current build option?
>> (+1 on making the amalgamation default on Windows)
>>
>> The amalgamation build makes it impossible to re-use Sqlite from
>> applications that use both Subversion and Sqlite (Requiring them to link to
>> two separate copies).
>
> That said, I am not against supporting other options as long as we can
> make the default fairly easy.
>
Paul, Mark and Bert,

Please check attached patch. I've implemented the same behavior as
*nix system which is described in build\ac-macros\sqlite.m4:
[[[
   If a --with-sqlite=PREFIX option is passed, look for a suitable sqlite
   either installed under the directory PREFIX or as an amalgamation file
   at the path PREFIX. In this case ignore any sqlite-amalgamation/ subdir
   within the source tree.

   If no --with-sqlite option is passed, look first for
   sqlite-amalgamation/sqlite3.c which should be the amalgamated version of
   the source distribution. If the amalgamation exists and is the wrong
   version, exit with a failure. If no sqlite-amalgamation/ subdir is
   present, search for a sqlite installed on the system.
]]]

So existing builds should not be broken with this patch. While simple
point --with-sqlite to directory with SQLite amalgamation directory or
putting it to directory sqlite-amalgamation should be enough to build
Subversion.

Log message:
[[[
Add support to build and use SQLite amalgamation version on Windows.
This implements the same behavior as *nix build system does.

* build/generator/gen_win.py
  (parse_options): set self.sqlite_path to sqlite-amalgamation
directory if --with-sqlite
   parameter not specified.
  (get_win_defines): Add SVN_SQLITE_INLINE define in SQLite amalgamation used.
  (get_win_includes,get_win_lib_dirs): Use headers and libraries from
correct location if
   SQLite amalgamation used.
  (_find_sqlite): Try SQLite amalgamation if compiled SQLite not found
in specified
   location.
]]]

Testing is very appreciated.

-- 
Ivan Zhakov
VisualSVN Team
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1186952

Received on 2009-02-18 17:44:46 CET

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