You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Chris Foote <ca...@yahoo.com> on 2009/02/16 14:32:13 UTC
RE: svn commit: r35866 - in trunk/build: . generator
Hi, this broke the windows build.
The filename parameter passed to transform_sql.main in gen_win.py needs to
also include the input files extension, so that the generated file defines the sql
as REP_CACHE_DB_SQL and not REP_CACHE_DB.
Index: build/generator/gen_win.py
===================================================================
--- build/generator/gen_win.py (revision 35878)
+++ build/generator/gen_win.py (working copy)
@@ -1391,7 +1391,7 @@
for sql in sql_sources:
transform_sql.main(open(sql + '.sql', 'r'),
open(sql + '.h', 'w'),
- os.path.basename(sql))
+ os.path.basename(sql + '.sql'))
class ProjectItem:
Regards,
Chris
> Author: gstein
> Date: Fri Feb 13 17:43:02 2009
> New Revision: 35866
>
> Log:
> Clean up the Python used in transform_sql.py, and make it even easier to
> use than r35853 (ie. not forced to provide an output file).
>
-- snip --
> Modified: trunk/build/generator/gen_win.py
> URL: http://svn.collab.net/viewvc/svn/trunk/build/generator/gen_win.py?pathrev=35866&r1=35865&r2=35866
> ==============================================================================
> --- trunk/build/generator/gen_win.py Fri Feb 13 12:37:02 2009 (r35865)
> +++ trunk/build/generator/gen_win.py Fri Feb 13 17:43:02 2009 (r35866)
> @@ -1389,8 +1389,11 @@ 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(open(sql + '.sql', 'r'),
> + open(sql + '.h', 'w'),
> + os.path.basename(sql))
> +
> +
> class ProjectItem:
> "A generic item class for holding sources info, config info, etc for a project"
> def __init__(self, **kw):
>
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1171035
Re: svn commit: r35866 - in trunk/build: . generator
Posted by Greg Stein <gs...@gmail.com>.
Dang. So close...
Fixed in r35881
On Mon, Feb 16, 2009 at 15:32, Chris Foote <ca...@yahoo.com> wrote:
> Hi, this broke the windows build.
>
> The filename parameter passed to transform_sql.main in gen_win.py needs to
> also include the input files extension, so that the generated file defines the sql
> as REP_CACHE_DB_SQL and not REP_CACHE_DB.
>
> Index: build/generator/gen_win.py
> ===================================================================
> --- build/generator/gen_win.py (revision 35878)
> +++ build/generator/gen_win.py (working copy)
> @@ -1391,7 +1391,7 @@
> for sql in sql_sources:
> transform_sql.main(open(sql + '.sql', 'r'),
> open(sql + '.h', 'w'),
> - os.path.basename(sql))
> + os.path.basename(sql + '.sql'))
>
>
> class ProjectItem:
>
> Regards,
> Chris
>
>> Author: gstein
>> Date: Fri Feb 13 17:43:02 2009
>> New Revision: 35866
>>
>> Log:
>> Clean up the Python used in transform_sql.py, and make it even easier to
>> use than r35853 (ie. not forced to provide an output file).
>>
> -- snip --
>
>> Modified: trunk/build/generator/gen_win.py
>> URL: http://svn.collab.net/viewvc/svn/trunk/build/generator/gen_win.py?pathrev=35866&r1=35865&r2=35866
>> ==============================================================================
>> --- trunk/build/generator/gen_win.py Fri Feb 13 12:37:02 2009 (r35865)
>> +++ trunk/build/generator/gen_win.py Fri Feb 13 17:43:02 2009 (r35866)
>> @@ -1389,8 +1389,11 @@ 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(open(sql + '.sql', 'r'),
>> + open(sql + '.h', 'w'),
>> + os.path.basename(sql))
>> +
>> +
>> class ProjectItem:
>> "A generic item class for holding sources info, config info, etc for a project"
>> def __init__(self, **kw):
>>
>
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1172319