You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by "Hyrum K. Wright" <hy...@mail.utexas.edu> on 2009/02/09 02:38:18 UTC
Re: svn commit: r35748 - in trunk: . build/generator
subversion/libsvn_fs_fs
Arfrever Frehtes Taifersar Arahesis wrote:
> Author: arfrever
> Date: Sun Feb 8 18:36:08 2009
> New Revision: 35748
>
> Log:
> Use '.sql_h' filename extension for headers generated from '.sql' files.
Yes, but Why?
> * Makefile.in
> (fast-clean, .SUFFIXES): Update.
> (.sql.h): Rename to ...
> (.sql.sql_h): ... this.
>
> * build.conf
> (private-built-includes): Update.
>
> * build/generator/gen_win.py
> (WinGeneratorBase._create_sqlite_headers): Update.
>
> * subversion/libsvn_fs_fs/rep-cache.c: Include "rep-cache-db.sql_h" instead of
> "rep-cache-db.h".
>
> Modified:
> trunk/Makefile.in
> trunk/build.conf
> trunk/build/generator/gen_win.py
> trunk/subversion/libsvn_fs_fs/rep-cache.c
>
> Modified: trunk/Makefile.in
> URL: http://svn.collab.net/viewvc/svn/trunk/Makefile.in?pathrev=35748&r1=35747&r2=35748
> ==============================================================================
> --- trunk/Makefile.in Sun Feb 8 16:37:38 2009 (r35747)
> +++ trunk/Makefile.in Sun Feb 8 18:36:08 2009 (r35748)
> @@ -327,10 +327,10 @@ locale-gnu-po-update:
> fast-clean: doc-clean
> @list='$(BUILD_DIRS)'; for i in $$list; do \
> echo "Cleaning $$i ..." ; \
> - (cd $$i && rm -f *.o *.lo *.la *.la-a *.spo *.mo && \
> + (cd $$i && rm -f *.sql_h *.o *.lo *.la *.la-a *.spo *.mo && \
> rm -rf .libs) ; \
> done
> - rm -f $(CLEAN_FILES) $(abs_srcdir)/subversion/libsvn_fs_fs/rep-cache-db.h
> + rm -f $(CLEAN_FILES)
> find $(abs_srcdir) -name "*.pyc" -exec rm {} ';'
>
> # clean all but bulky test output, returning to before './configure' was run.
> @@ -593,10 +593,10 @@ schema-clean:
> # Implicit rules for creating outputs from input files
> #
> .SUFFIXES:
> -.SUFFIXES: .c .cpp .lo .o .la-a .la \
> - .po .spo .mo .rnc .rng .dtd .xsd .sql .h
> +.SUFFIXES: .sql .sql_h .c .cpp .lo .o .la-a .la \
> + .po .spo .mo .rnc .rng .dtd .xsd
>
> -.sql.h:
> +.sql.sql_h:
> $(top_srcdir)/build/transform_sql.sh $< < $< > $(top_srcdir)/$@
>
> .c.o:
>
> Modified: trunk/build.conf
> URL: http://svn.collab.net/viewvc/svn/trunk/build.conf?pathrev=35748&r1=35747&r2=35748
> ==============================================================================
> --- trunk/build.conf Sun Feb 8 16:37:38 2009 (r35747)
> +++ trunk/build.conf Sun Feb 8 18:36:08 2009 (r35748)
> @@ -3,7 +3,7 @@
> #
> ######################################################################
> #
> -# Copyright (c) 2000-2008 CollabNet. All rights reserved.
> +# Copyright (c) 2000-2009 CollabNet. All rights reserved.
> #
> # This software is licensed as described in the file COPYING, which
> # you should have received as part of this distribution. The terms
> @@ -33,7 +33,7 @@ private-includes =
> subversion/libsvn_delta/compose_delta.c
> private-built-includes =
> subversion/svn_private_config.h
> - subversion/libsvn_fs_fs/rep-cache-db.h
> + subversion/libsvn_fs_fs/rep-cache-db.sql_h
> subversion/bindings/swig/proxy/swig_python_external_runtime.swg
> subversion/bindings/swig/proxy/swig_perl_external_runtime.swg
> subversion/bindings/swig/proxy/swig_ruby_external_runtime.swg
>
> Modified: trunk/build/generator/gen_win.py
> URL: http://svn.collab.net/viewvc/svn/trunk/build/generator/gen_win.py?pathrev=35748&r1=35747&r2=35748
> ==============================================================================
> --- trunk/build/generator/gen_win.py Sun Feb 8 16:37:38 2009 (r35747)
> +++ trunk/build/generator/gen_win.py Sun Feb 8 18:36:08 2009 (r35748)
> @@ -1387,7 +1387,7 @@ class WinGeneratorBase(GeneratorBase):
> os.path.join('subversion', 'libsvn_fs_fs', 'rep-cache-db'),
> ]
> for sql in sql_sources:
> - transform_sql.main(sql + '.sql', sql + '.h')
> + transform_sql.main(sql + '.sql', sql + '.sql_h')
>
> class ProjectItem:
> "A generic item class for holding sources info, config info, etc for a project"
>
> Modified: trunk/subversion/libsvn_fs_fs/rep-cache.c
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_fs_fs/rep-cache.c?pathrev=35748&r1=35747&r2=35748
> ==============================================================================
> --- trunk/subversion/libsvn_fs_fs/rep-cache.c Sun Feb 8 16:37:38 2009 (r35747)
> +++ trunk/subversion/libsvn_fs_fs/rep-cache.c Sun Feb 8 18:36:08 2009 (r35748)
> @@ -25,7 +25,7 @@
>
> #include "private/svn_sqlite.h"
>
> -#include "rep-cache-db.h"
> +#include "rep-cache-db.sql_h"
>
> /* A few magic values */
> #define REP_CACHE_SCHEMA_FORMAT 1
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=495&dsMessageId=1127037
>
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1127040
Re: svn commit: r35748 - in trunk: . build/generator
subversion/libsvn_fs_fs
Posted by "Hyrum K. Wright" <hy...@mail.utexas.edu>.
On Feb 12, 2009, at 8:35 AM, Hyrum K. Wright wrote:
> On Feb 11, 2009, at 8:36 AM, Justin Erenkrantz wrote:
>
>> On Tue, Feb 10, 2009 at 12:21 PM, Hyrum K. Wright
>> <hy...@mail.utexas.edu> wrote:
>>> So, just to recap: it sounds like sentiment has shifted against
>>> r35748. Shall we back it out?
>>
>> +1. -- justin
>
> Arfrever, were planning on doing this, so shall I? If it's not done
> by tomorrow, I'll go ahead and proceed.
Done in r35846.
-Hyrum
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1151481
Re: svn commit: r35748 - in trunk: . build/generator
subversion/libsvn_fs_fs
Posted by "Hyrum K. Wright" <hy...@mail.utexas.edu>.
On Feb 11, 2009, at 8:36 AM, Justin Erenkrantz wrote:
> On Tue, Feb 10, 2009 at 12:21 PM, Hyrum K. Wright
> <hy...@mail.utexas.edu> wrote:
>> So, just to recap: it sounds like sentiment has shifted against
>> r35748. Shall we back it out?
>
> +1. -- justin
Arfrever, were planning on doing this, so shall I? If it's not done
by tomorrow, I'll go ahead and proceed.
-Hyrum
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1145415
Re: svn commit: r35748 - in trunk: . build/generator
subversion/libsvn_fs_fs
Posted by Justin Erenkrantz <je...@apache.org>.
On Tue, Feb 10, 2009 at 12:21 PM, Hyrum K. Wright
<hy...@mail.utexas.edu> wrote:
> So, just to recap: it sounds like sentiment has shifted against
> r35748. Shall we back it out?
+1. -- justin
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1139173
Re: svn commit: r35748 - in trunk: . build/generator
subversion/libsvn_fs_fs
Posted by "Hyrum K. Wright" <hy...@mail.utexas.edu>.
So, just to recap: it sounds like sentiment has shifted against
r35748. Shall we back it out?
-Hyrum
On Feb 9, 2009, at 10:43 PM, Greg Stein wrote:
> We're going to have more at some point, but yah... this change sucks
> if it loses auto highlighting.
>
> Cheers,
> -g
>
> On Feb 9, 2009, at 20:33, Peter Samuelson <pe...@p12n.org> wrote:
>
>>
>>>>> Can you please further justify this change, or revert it?
>>>>
>>>> This change allows to genericize the 'fast-clean' target in
>>>> Makefile.in.
>>
>> So this was the only reason to do it?
>>
>> - rm -f $(CLEAN_FILES) $(abs_srcdir)/subversion/libsvn_fs_fs/
>> rep-cache-db.h
>> + rm -f $(CLEAN_FILES)
>>
>> [Hyrum K. Wright]
>>> Well, I seem to be the only one to cares about painting this
>>> bikeshed
>>> purple, so I'll concede. But I do so under protest. :P
>>
>> No, I don't like it either. If we had several .sql files that were
>> transformed into C header files, it would make sense to have a
>> different suffix ... but it appears this is all just for one file.
>> The editor syntax highlighting of an arbitrary new file type is a big
>> enough drawback in my mind.
>> --
>> Peter Samuelson | org-tld!p12n!peter | http://p12n.org/
>>
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1132229
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1135939
Re: svn commit: r35748 - in trunk: . build/generator
subversion/libsvn_fs_fs
Posted by Greg Stein <gs...@gmail.com>.
We're going to have more at some point, but yah... this change sucks
if it loses auto highlighting.
Cheers,
-g
On Feb 9, 2009, at 20:33, Peter Samuelson <pe...@p12n.org> wrote:
>
>>>> Can you please further justify this change, or revert it?
>>>
>>> This change allows to genericize the 'fast-clean' target in
>>> Makefile.in.
>
> So this was the only reason to do it?
>
> - rm -f $(CLEAN_FILES) $(abs_srcdir)/subversion/libsvn_fs_fs/
> rep-cache-db.h
> + rm -f $(CLEAN_FILES)
>
> [Hyrum K. Wright]
>> Well, I seem to be the only one to cares about painting this bikeshed
>> purple, so I'll concede. But I do so under protest. :P
>
> No, I don't like it either. If we had several .sql files that were
> transformed into C header files, it would make sense to have a
> different suffix ... but it appears this is all just for one file.
> The editor syntax highlighting of an arbitrary new file type is a big
> enough drawback in my mind.
> --
> Peter Samuelson | org-tld!p12n!peter | http://p12n.org/
>
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1132229
Re: svn commit: r35748 - in trunk: . build/generator
subversion/libsvn_fs_fs
Posted by Peter Samuelson <pe...@p12n.org>.
> >> Can you please further justify this change, or revert it?
> >
> > This change allows to genericize the 'fast-clean' target in Makefile.in.
So this was the only reason to do it?
- rm -f $(CLEAN_FILES) $(abs_srcdir)/subversion/libsvn_fs_fs/rep-cache-db.h
+ rm -f $(CLEAN_FILES)
[Hyrum K. Wright]
> Well, I seem to be the only one to cares about painting this bikeshed
> purple, so I'll concede. But I do so under protest. :P
No, I don't like it either. If we had several .sql files that were
transformed into C header files, it would make sense to have a
different suffix ... but it appears this is all just for one file.
The editor syntax highlighting of an arbitrary new file type is a big
enough drawback in my mind.
--
Peter Samuelson | org-tld!p12n!peter | http://p12n.org/
Re: svn commit: r35748 - in trunk: . build/generator
subversion/libsvn_fs_fs
Posted by Julian Foad <ju...@btopenworld.com>.
On Mon, 2009-02-09 at 12:31 -0600, Hyrum K. Wright wrote:
> Arfrever Frehtes Taifersar Arahesis wrote:
> > 2009-02-09 16:22:36 Hyrum K. Wright napisał(a):
> >> Hyrum K. Wright wrote:
> >>> Arfrever Frehtes Taifersar Arahesis wrote:
> >>>> 2009-02-09 03:38:18 Hyrum K. Wright napisał(a):
> >>>>> Arfrever Frehtes Taifersar Arahesis wrote:
> >>>>>> Author: arfrever
> >>>>>> Date: Sun Feb 8 18:36:08 2009
> >>>>>> New Revision: 35748
> >>>>>>
> >>>>>> Log:
> >>>>>> Use '.sql_h' filename extension for headers generated from '.sql' files.
> >>>>> Yes, but Why?
> >>>> This filename extension (or .sql.h) allows to easier distinguish headers generated from .sql files.
> >>> Does the text "This file is automatically generated from foo.sql" not accomplish
> >>> the same goal? Why not encode this redundancy in the source file, or even the
> >>> source file name (e.g., rep-cache-db.sql) instead of in *two* different
> >>> locations in the build system? It seems a bit redundant and cryptic.
> >>>
> >>> Btw, I had this conversation with somebody in IRC (and maybe should have
> >>> recorded it here) when the change was made from .sql.h to .h. I originally felt
> >>> that we should munge the output filename somehow, but further consideration has
> >>> led me to be against such.
> >> One more problem: we lose automatic syntax highlighting with the munged
> >> extension.
> >
> > :set filetype=c
> >
> >> Can you please further justify this change, or revert it?
> >
> > This change allows to genericize the 'fast-clean' target in Makefile.in.
>
> Well, I seem to be the only one to cares about painting this bikeshed purple, so
> I'll concede. But I do so under protest. :P
It looks to me like it was a bit ugly before this change, and is a bit
ugly after this change, just in a different way.
- Julian
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1130102
Re: svn commit: r35748 - in trunk: . build/generator
subversion/libsvn_fs_fs
Posted by "Hyrum K. Wright" <hy...@mail.utexas.edu>.
Arfrever Frehtes Taifersar Arahesis wrote:
> 2009-02-09 16:22:36 Hyrum K. Wright napisał(a):
>> Hyrum K. Wright wrote:
>>> Arfrever Frehtes Taifersar Arahesis wrote:
>>>> 2009-02-09 03:38:18 Hyrum K. Wright napisał(a):
>>>>> Arfrever Frehtes Taifersar Arahesis wrote:
>>>>>> Author: arfrever
>>>>>> Date: Sun Feb 8 18:36:08 2009
>>>>>> New Revision: 35748
>>>>>>
>>>>>> Log:
>>>>>> Use '.sql_h' filename extension for headers generated from '.sql' files.
>>>>> Yes, but Why?
>>>> This filename extension (or .sql.h) allows to easier distinguish headers generated from .sql files.
>>> Does the text "This file is automatically generated from foo.sql" not accomplish
>>> the same goal? Why not encode this redundancy in the source file, or even the
>>> source file name (e.g., rep-cache-db.sql) instead of in *two* different
>>> locations in the build system? It seems a bit redundant and cryptic.
>>>
>>> Btw, I had this conversation with somebody in IRC (and maybe should have
>>> recorded it here) when the change was made from .sql.h to .h. I originally felt
>>> that we should munge the output filename somehow, but further consideration has
>>> led me to be against such.
>> One more problem: we lose automatic syntax highlighting with the munged
>> extension.
>
> :set filetype=c
>
>> Can you please further justify this change, or revert it?
>
> This change allows to genericize the 'fast-clean' target in Makefile.in.
Well, I seem to be the only one to cares about painting this bikeshed purple, so
I'll concede. But I do so under protest. :P
-Hyrum
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1129936
Re: svn commit: r35748 - in trunk: . build/generator
subversion/libsvn_fs_fs
Posted by Arfrever Frehtes Taifersar Arahesis <Ar...@GMail.Com>.
2009-02-09 16:22:36 Hyrum K. Wright napisał(a):
> Hyrum K. Wright wrote:
> > Arfrever Frehtes Taifersar Arahesis wrote:
> >> 2009-02-09 03:38:18 Hyrum K. Wright napisał(a):
> >>> Arfrever Frehtes Taifersar Arahesis wrote:
> >>>> Author: arfrever
> >>>> Date: Sun Feb 8 18:36:08 2009
> >>>> New Revision: 35748
> >>>>
> >>>> Log:
> >>>> Use '.sql_h' filename extension for headers generated from '.sql' files.
> >>> Yes, but Why?
> >> This filename extension (or .sql.h) allows to easier distinguish headers generated from .sql files.
> >
> > Does the text "This file is automatically generated from foo.sql" not accomplish
> > the same goal? Why not encode this redundancy in the source file, or even the
> > source file name (e.g., rep-cache-db.sql) instead of in *two* different
> > locations in the build system? It seems a bit redundant and cryptic.
> >
> > Btw, I had this conversation with somebody in IRC (and maybe should have
> > recorded it here) when the change was made from .sql.h to .h. I originally felt
> > that we should munge the output filename somehow, but further consideration has
> > led me to be against such.
>
> One more problem: we lose automatic syntax highlighting with the munged
> extension.
:set filetype=c
> Can you please further justify this change, or revert it?
This change allows to genericize the 'fast-clean' target in Makefile.in.
--
Arfrever Frehtes Taifersar Arahesis
Re: svn commit: r35748 - in trunk: . build/generator
subversion/libsvn_fs_fs
Posted by "Hyrum K. Wright" <hy...@mail.utexas.edu>.
Hyrum K. Wright wrote:
> Arfrever Frehtes Taifersar Arahesis wrote:
>> 2009-02-09 03:38:18 Hyrum K. Wright napisał(a):
>>> Arfrever Frehtes Taifersar Arahesis wrote:
>>>> Author: arfrever
>>>> Date: Sun Feb 8 18:36:08 2009
>>>> New Revision: 35748
>>>>
>>>> Log:
>>>> Use '.sql_h' filename extension for headers generated from '.sql' files.
>>> Yes, but Why?
>> This filename extension (or .sql.h) allows to easier distinguish headers generated from .sql files.
>
> Does the text "This file is automatically generated from foo.sql" not accomplish
> the same goal? Why not encode this redundancy in the source file, or even the
> source file name (e.g., rep-cache-db.sql) instead of in *two* different
> locations in the build system? It seems a bit redundant and cryptic.
>
> Btw, I had this conversation with somebody in IRC (and maybe should have
> recorded it here) when the change was made from .sql.h to .h. I originally felt
> that we should munge the output filename somehow, but further consideration has
> led me to be against such.
One more problem: we lose automatic syntax highlighting with the munged
extension. Can you please further justify this change, or revert it?
Thanks,
-Hyrum
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1129436
Re: svn commit: r35748 - in trunk: . build/generator
subversion/libsvn_fs_fs
Posted by "Hyrum K. Wright" <hy...@mail.utexas.edu>.
Arfrever Frehtes Taifersar Arahesis wrote:
> 2009-02-09 03:38:18 Hyrum K. Wright napisał(a):
>> Arfrever Frehtes Taifersar Arahesis wrote:
>>> Author: arfrever
>>> Date: Sun Feb 8 18:36:08 2009
>>> New Revision: 35748
>>>
>>> Log:
>>> Use '.sql_h' filename extension for headers generated from '.sql' files.
>> Yes, but Why?
>
> This filename extension (or .sql.h) allows to easier distinguish headers generated from .sql files.
Does the text "This file is automatically generated from foo.sql" not accomplish
the same goal? Why not encode this redundancy in the source file, or even the
source file name (e.g., rep-cache-db.sql) instead of in *two* different
locations in the build system? It seems a bit redundant and cryptic.
Btw, I had this conversation with somebody in IRC (and maybe should have
recorded it here) when the change was made from .sql.h to .h. I originally felt
that we should munge the output filename somehow, but further consideration has
led me to be against such.
>>> * Makefile.in
>>> (fast-clean, .SUFFIXES): Update.
>>> (.sql.h): Rename to ...
>>> (.sql.sql_h): ... this.
>>>
>>> * build.conf
>>> (private-built-includes): Update.
>>>
>>> * build/generator/gen_win.py
>>> (WinGeneratorBase._create_sqlite_headers): Update.
>>>
>>> * subversion/libsvn_fs_fs/rep-cache.c: Include "rep-cache-db.sql_h" instead of
>>> "rep-cache-db.h".
>>>
>>> Modified:
>>> trunk/Makefile.in
>>> trunk/build.conf
>>> trunk/build/generator/gen_win.py
>>> trunk/subversion/libsvn_fs_fs/rep-cache.c
>>>
>>> Modified: trunk/Makefile.in
>>> URL: http://svn.collab.net/viewvc/svn/trunk/Makefile.in?pathrev=35748&r1=35747&r2=35748
>>> ==============================================================================
>>> --- trunk/Makefile.in Sun Feb 8 16:37:38 2009 (r35747)
>>> +++ trunk/Makefile.in Sun Feb 8 18:36:08 2009 (r35748)
>>> @@ -327,10 +327,10 @@ locale-gnu-po-update:
>>> fast-clean: doc-clean
>>> @list='$(BUILD_DIRS)'; for i in $$list; do \
>>> echo "Cleaning $$i ..." ; \
>>> - (cd $$i && rm -f *.o *.lo *.la *.la-a *.spo *.mo && \
>>> + (cd $$i && rm -f *.sql_h *.o *.lo *.la *.la-a *.spo *.mo && \
>>> rm -rf .libs) ; \
>>> done
>>> - rm -f $(CLEAN_FILES) $(abs_srcdir)/subversion/libsvn_fs_fs/rep-cache-db.h
>>> + rm -f $(CLEAN_FILES)
>>> find $(abs_srcdir) -name "*.pyc" -exec rm {} ';'
>>>
>>> # clean all but bulky test output, returning to before './configure' was run.
>>> @@ -593,10 +593,10 @@ schema-clean:
>>> # Implicit rules for creating outputs from input files
>>> #
>>> .SUFFIXES:
>>> -.SUFFIXES: .c .cpp .lo .o .la-a .la \
>>> - .po .spo .mo .rnc .rng .dtd .xsd .sql .h
>>> +.SUFFIXES: .sql .sql_h .c .cpp .lo .o .la-a .la \
>>> + .po .spo .mo .rnc .rng .dtd .xsd
>>>
>>> -.sql.h:
>>> +.sql.sql_h:
>>> $(top_srcdir)/build/transform_sql.sh $< < $< > $(top_srcdir)/$@
>>>
>>> .c.o:
>>>
>>> Modified: trunk/build.conf
>>> URL: http://svn.collab.net/viewvc/svn/trunk/build.conf?pathrev=35748&r1=35747&r2=35748
>>> ==============================================================================
>>> --- trunk/build.conf Sun Feb 8 16:37:38 2009 (r35747)
>>> +++ trunk/build.conf Sun Feb 8 18:36:08 2009 (r35748)
>>> @@ -3,7 +3,7 @@
>>> #
>>> ######################################################################
>>> #
>>> -# Copyright (c) 2000-2008 CollabNet. All rights reserved.
>>> +# Copyright (c) 2000-2009 CollabNet. All rights reserved.
>>> #
>>> # This software is licensed as described in the file COPYING, which
>>> # you should have received as part of this distribution. The terms
>>> @@ -33,7 +33,7 @@ private-includes =
>>> subversion/libsvn_delta/compose_delta.c
>>> private-built-includes =
>>> subversion/svn_private_config.h
>>> - subversion/libsvn_fs_fs/rep-cache-db.h
>>> + subversion/libsvn_fs_fs/rep-cache-db.sql_h
>>> subversion/bindings/swig/proxy/swig_python_external_runtime.swg
>>> subversion/bindings/swig/proxy/swig_perl_external_runtime.swg
>>> subversion/bindings/swig/proxy/swig_ruby_external_runtime.swg
>>>
>>> Modified: trunk/build/generator/gen_win.py
>>> URL: http://svn.collab.net/viewvc/svn/trunk/build/generator/gen_win.py?pathrev=35748&r1=35747&r2=35748
>>> ==============================================================================
>>> --- trunk/build/generator/gen_win.py Sun Feb 8 16:37:38 2009 (r35747)
>>> +++ trunk/build/generator/gen_win.py Sun Feb 8 18:36:08 2009 (r35748)
>>> @@ -1387,7 +1387,7 @@ class WinGeneratorBase(GeneratorBase):
>>> os.path.join('subversion', 'libsvn_fs_fs', 'rep-cache-db'),
>>> ]
>>> for sql in sql_sources:
>>> - transform_sql.main(sql + '.sql', sql + '.h')
>>> + transform_sql.main(sql + '.sql', sql + '.sql_h')
>>>
>>> class ProjectItem:
>>> "A generic item class for holding sources info, config info, etc for a project"
>>>
>>> Modified: trunk/subversion/libsvn_fs_fs/rep-cache.c
>>> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_fs_fs/rep-cache.c?pathrev=35748&r1=35747&r2=35748
>>> ==============================================================================
>>> --- trunk/subversion/libsvn_fs_fs/rep-cache.c Sun Feb 8 16:37:38 2009 (r35747)
>>> +++ trunk/subversion/libsvn_fs_fs/rep-cache.c Sun Feb 8 18:36:08 2009 (r35748)
>>> @@ -25,7 +25,7 @@
>>>
>>> #include "private/svn_sqlite.h"
>>>
>>> -#include "rep-cache-db.h"
>>> +#include "rep-cache-db.sql_h"
>>>
>>> /* A few magic values */
>>> #define REP_CACHE_SCHEMA_FORMAT 1
>
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1127194
Re: svn commit: r35748 - in trunk: . build/generator
subversion/libsvn_fs_fs
Posted by Julian Foad <ju...@btopenworld.com>.
Arfrever Frehtes Taifersar Arahesis wrote:
> 2009-02-09 03:38:18 Hyrum K. Wright napisał(a):
> > Arfrever Frehtes Taifersar Arahesis wrote:
> > > Author: arfrever
> > > Date: Sun Feb 8 18:36:08 2009
> > > New Revision: 35748
> > >
> > > Log:
> > > Use '.sql_h' filename extension for headers generated from '.sql' files.
> >
> > Yes, but Why?
>
> This filename extension (or .sql.h) allows to easier distinguish headers generated from .sql files.
I added this to the log message because all log messages should indicate
the reason for the change. I have no comment on the change itself.
- Julian
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1128674
Re: svn commit: r35748 - in trunk: . build/generator
subversion/libsvn_fs_fs
Posted by Arfrever Frehtes Taifersar Arahesis <Ar...@GMail.Com>.
2009-02-09 03:38:18 Hyrum K. Wright napisał(a):
> Arfrever Frehtes Taifersar Arahesis wrote:
> > Author: arfrever
> > Date: Sun Feb 8 18:36:08 2009
> > New Revision: 35748
> >
> > Log:
> > Use '.sql_h' filename extension for headers generated from '.sql' files.
>
> Yes, but Why?
This filename extension (or .sql.h) allows to easier distinguish headers generated from .sql files.
> > * Makefile.in
> > (fast-clean, .SUFFIXES): Update.
> > (.sql.h): Rename to ...
> > (.sql.sql_h): ... this.
> >
> > * build.conf
> > (private-built-includes): Update.
> >
> > * build/generator/gen_win.py
> > (WinGeneratorBase._create_sqlite_headers): Update.
> >
> > * subversion/libsvn_fs_fs/rep-cache.c: Include "rep-cache-db.sql_h" instead of
> > "rep-cache-db.h".
> >
> > Modified:
> > trunk/Makefile.in
> > trunk/build.conf
> > trunk/build/generator/gen_win.py
> > trunk/subversion/libsvn_fs_fs/rep-cache.c
> >
> > Modified: trunk/Makefile.in
> > URL: http://svn.collab.net/viewvc/svn/trunk/Makefile.in?pathrev=35748&r1=35747&r2=35748
> > ==============================================================================
> > --- trunk/Makefile.in Sun Feb 8 16:37:38 2009 (r35747)
> > +++ trunk/Makefile.in Sun Feb 8 18:36:08 2009 (r35748)
> > @@ -327,10 +327,10 @@ locale-gnu-po-update:
> > fast-clean: doc-clean
> > @list='$(BUILD_DIRS)'; for i in $$list; do \
> > echo "Cleaning $$i ..." ; \
> > - (cd $$i && rm -f *.o *.lo *.la *.la-a *.spo *.mo && \
> > + (cd $$i && rm -f *.sql_h *.o *.lo *.la *.la-a *.spo *.mo && \
> > rm -rf .libs) ; \
> > done
> > - rm -f $(CLEAN_FILES) $(abs_srcdir)/subversion/libsvn_fs_fs/rep-cache-db.h
> > + rm -f $(CLEAN_FILES)
> > find $(abs_srcdir) -name "*.pyc" -exec rm {} ';'
> >
> > # clean all but bulky test output, returning to before './configure' was run.
> > @@ -593,10 +593,10 @@ schema-clean:
> > # Implicit rules for creating outputs from input files
> > #
> > .SUFFIXES:
> > -.SUFFIXES: .c .cpp .lo .o .la-a .la \
> > - .po .spo .mo .rnc .rng .dtd .xsd .sql .h
> > +.SUFFIXES: .sql .sql_h .c .cpp .lo .o .la-a .la \
> > + .po .spo .mo .rnc .rng .dtd .xsd
> >
> > -.sql.h:
> > +.sql.sql_h:
> > $(top_srcdir)/build/transform_sql.sh $< < $< > $(top_srcdir)/$@
> >
> > .c.o:
> >
> > Modified: trunk/build.conf
> > URL: http://svn.collab.net/viewvc/svn/trunk/build.conf?pathrev=35748&r1=35747&r2=35748
> > ==============================================================================
> > --- trunk/build.conf Sun Feb 8 16:37:38 2009 (r35747)
> > +++ trunk/build.conf Sun Feb 8 18:36:08 2009 (r35748)
> > @@ -3,7 +3,7 @@
> > #
> > ######################################################################
> > #
> > -# Copyright (c) 2000-2008 CollabNet. All rights reserved.
> > +# Copyright (c) 2000-2009 CollabNet. All rights reserved.
> > #
> > # This software is licensed as described in the file COPYING, which
> > # you should have received as part of this distribution. The terms
> > @@ -33,7 +33,7 @@ private-includes =
> > subversion/libsvn_delta/compose_delta.c
> > private-built-includes =
> > subversion/svn_private_config.h
> > - subversion/libsvn_fs_fs/rep-cache-db.h
> > + subversion/libsvn_fs_fs/rep-cache-db.sql_h
> > subversion/bindings/swig/proxy/swig_python_external_runtime.swg
> > subversion/bindings/swig/proxy/swig_perl_external_runtime.swg
> > subversion/bindings/swig/proxy/swig_ruby_external_runtime.swg
> >
> > Modified: trunk/build/generator/gen_win.py
> > URL: http://svn.collab.net/viewvc/svn/trunk/build/generator/gen_win.py?pathrev=35748&r1=35747&r2=35748
> > ==============================================================================
> > --- trunk/build/generator/gen_win.py Sun Feb 8 16:37:38 2009 (r35747)
> > +++ trunk/build/generator/gen_win.py Sun Feb 8 18:36:08 2009 (r35748)
> > @@ -1387,7 +1387,7 @@ class WinGeneratorBase(GeneratorBase):
> > os.path.join('subversion', 'libsvn_fs_fs', 'rep-cache-db'),
> > ]
> > for sql in sql_sources:
> > - transform_sql.main(sql + '.sql', sql + '.h')
> > + transform_sql.main(sql + '.sql', sql + '.sql_h')
> >
> > class ProjectItem:
> > "A generic item class for holding sources info, config info, etc for a project"
> >
> > Modified: trunk/subversion/libsvn_fs_fs/rep-cache.c
> > URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_fs_fs/rep-cache.c?pathrev=35748&r1=35747&r2=35748
> > ==============================================================================
> > --- trunk/subversion/libsvn_fs_fs/rep-cache.c Sun Feb 8 16:37:38 2009 (r35747)
> > +++ trunk/subversion/libsvn_fs_fs/rep-cache.c Sun Feb 8 18:36:08 2009 (r35748)
> > @@ -25,7 +25,7 @@
> >
> > #include "private/svn_sqlite.h"
> >
> > -#include "rep-cache-db.h"
> > +#include "rep-cache-db.sql_h"
> >
> > /* A few magic values */
> > #define REP_CACHE_SCHEMA_FORMAT 1
--
Arfrever Frehtes Taifersar Arahesis