You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Greg Stein <gs...@gmail.com> on 2010/04/14 14:27:18 UTC

Re: svn commit: r933938 - in /subversion/trunk: build.conf subversion/include/private/svn_sqlite.h subversion/libsvn_fs_fs/fs_fs.c subversion/libsvn_subr/sqlite.c subversion/libsvn_subr/sqlite.sql

I've got a patch coming up...

On Wed, Apr 14, 2010 at 10:26, Philip Martin <ph...@wandisco.com> wrote:
> "Bert Huijben" <be...@qqmail.nl> writes:
>
>>> --- subversion/trunk/subversion/libsvn_subr/sqlite.c (original)
>>> +++ subversion/trunk/subversion/libsvn_subr/sqlite.c Wed Apr 14 13:05:56
>>> 2010
>>> @@ -28,6 +28,7 @@
>>>  #include "svn_io.h"
>>>  #include "svn_dirent_uri.h"
>>>  #include "svn_checksum.h"
>>> +#include "sqlite.h"
>>
>> Why did you add this include?
>>
>> A normal sqlite amalgamation has only sqlite3.c, sqlite3.h and sqlite3ext.h. This adds a dependency to another sqlite distribution format.
>
> It's the Subversion specific file generated from sqlite.sql.  Perhaps
> I should use a different name?
>
> --
> Philip
>

Re: svn commit: r933938 - in /subversion/trunk: build.conf subversion/include/private/svn_sqlite.h subversion/libsvn_fs_fs/fs_fs.c subversion/libsvn_subr/sqlite.c subversion/libsvn_subr/sqlite.sql

Posted by Greg Stein <gs...@gmail.com>.
Fixed in r933969

On Wed, Apr 14, 2010 at 10:27, Greg Stein <gs...@gmail.com> wrote:
> I've got a patch coming up...
>
> On Wed, Apr 14, 2010 at 10:26, Philip Martin <ph...@wandisco.com> wrote:
>> "Bert Huijben" <be...@qqmail.nl> writes:
>>
>>>> --- subversion/trunk/subversion/libsvn_subr/sqlite.c (original)
>>>> +++ subversion/trunk/subversion/libsvn_subr/sqlite.c Wed Apr 14 13:05:56
>>>> 2010
>>>> @@ -28,6 +28,7 @@
>>>>  #include "svn_io.h"
>>>>  #include "svn_dirent_uri.h"
>>>>  #include "svn_checksum.h"
>>>> +#include "sqlite.h"
>>>
>>> Why did you add this include?
>>>
>>> A normal sqlite amalgamation has only sqlite3.c, sqlite3.h and sqlite3ext.h. This adds a dependency to another sqlite distribution format.
>>
>> It's the Subversion specific file generated from sqlite.sql.  Perhaps
>> I should use a different name?
>>
>> --
>> Philip
>>
>

Re: svn commit: r933938 - in /subversion/trunk: build.conf subversion/include/private/svn_sqlite.h subversion/libsvn_fs_fs/fs_fs.c subversion/libsvn_subr/sqlite.c subversion/libsvn_subr/sqlite.sql

Posted by Greg Stein <gs...@gmail.com>.
On Wed, Apr 14, 2010 at 10:52, Philip Martin <ph...@wandisco.com> wrote:
> Greg Stein <gs...@gmail.com> writes:
>
>> I've got a patch coming up...
>
> Hmm...
>
> $ (cd ../src && ./gen-make.py)
> WARNING: "internal_statements.h" header not found, file subversion/libsvn_subr/sqlite.c
> $ (cd ../src && ./gen-make.py)
> $
>
> The first build-outputs.mk doesn't list internal_statements.h as a
> dependency of sqlite.lo.  Can gen-make generate the sqlite headers
> before determining dependencies?  If not should autogen.sh run
> gen-make twice?

Fixed in r933981

Re: svn commit: r933938 - in /subversion/trunk: build.conf subversion/include/private/svn_sqlite.h subversion/libsvn_fs_fs/fs_fs.c subversion/libsvn_subr/sqlite.c subversion/libsvn_subr/sqlite.sql

Posted by Philip Martin <ph...@wandisco.com>.
Greg Stein <gs...@gmail.com> writes:

> I've got a patch coming up...

Hmm...

$ (cd ../src && ./gen-make.py)
WARNING: "internal_statements.h" header not found, file subversion/libsvn_subr/sqlite.c
$ (cd ../src && ./gen-make.py)
$

The first build-outputs.mk doesn't list internal_statements.h as a
dependency of sqlite.lo.  Can gen-make generate the sqlite headers
before determining dependencies?  If not should autogen.sh run
gen-make twice?

-- 
Philip