Files generated by the JSON schema compiler are named incorrectly

Files generated by the JSON schema compiler are named incorrectly

Files are now named like "file_name.h" instead of "fileName.h" or
"file.name.h", and all the JSON files have been renamed.

BUG=125669
TEST=All previous tests for the renamed files


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=135077

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=136747

[cduvall, 2012-05-01 01:12:29]

Thanks for the review!

[not at google - send to devlin, 2012-05-01 01:18:27]

I don't understand, this is the right change to the compiler but it should still
be generating "experimental_dns.h" not "experimental.dns.h". Looking at
model.py, it's replacing '.' with '_' so... ugh... what?

[cduvall, 2012-05-01 01:34:31]

On 2012/05/01 01:18:27, kalman wrote:
> I don't understand, this is the right change to the compiler but it should
still
> be generating "experimental_dns.h" not "experimental.dns.h". Looking at
> model.py, it's replacing '.' with '_' so... ugh... what?

It's generating the right names for me. Try removing all the old gen files and
then rebuilding.

[not at google - send to devlin, 2012-05-01 01:41:28]

Oh my bad, I totally read the reverse diff for some reason :) lgtm

[cduvall, 2012-05-01 01:44:03]

On 2012/05/01 01:41:28, kalman wrote:
> Oh my bad, I totally read the reverse diff for some reason :) lgtm

Haha np :)

I'm going to commit right after http://codereview.chromium.org/10206034 goes
through because I'll have to change lines 81 and 123 in compiler.py back to how
they were.

[commit-bot: I haz the power, 2012-05-03 00:06:30]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/cduvall@chromium.org/10272021/7001

[commit-bot: I haz the power, 2012-05-03 03:14:17]

Change committed as 135077

[cduvall, 2012-05-10 02:31:30]

JSON files have been renamed. Thanks for your help!

[not at google - send to devlin, 2012-05-10 02:35:50]

On 2012/05/10 02:31:30, cduvall wrote:
> JSON files have been renamed. Thanks for your help!

Awesome!

Just looked at the json schema py files, looks like everything else is renames
and if all the tests still pass then yay!

[not at google - send to devlin, 2012-05-10 02:36:02]

https://chromiumcodereview.appspot.com/10272021/diff/19001/tools/json_schema_...
File tools/json_schema_compiler/compiler.py (right):

https://chromiumcodereview.appspot.com/10272021/diff/19001/tools/json_schema_...
tools/json_schema_compiler/compiler.py:39: (schema_filename, schema_extension))
Instead of doing this can we load the Namespace then assert that name ==
unix_name?

https://chromiumcodereview.appspot.com/10272021/diff/19001/tools/json_schema_...
tools/json_schema_compiler/compiler.py:181: # TODO(cduvall) error on bad
filename
might as well do it now. sys.exit(...) (somewhere above there's an error)

[cduvall, 2012-05-10 03:09:01]

https://chromiumcodereview.appspot.com/10272021/diff/19001/tools/json_schema_...
File tools/json_schema_compiler/compiler.py (right):

https://chromiumcodereview.appspot.com/10272021/diff/19001/tools/json_schema_...
tools/json_schema_compiler/compiler.py:39: (schema_filename, schema_extension))
On 2012/05/10 02:36:02, kalman wrote:
> Instead of doing this can we load the Namespace then assert that name ==
> unix_name?

I did it for single schemas, but I'm not quite sure what the best way is for
bundle schemas.

https://chromiumcodereview.appspot.com/10272021/diff/19001/tools/json_schema_...
tools/json_schema_compiler/compiler.py:181: # TODO(cduvall) error on bad
filename
On 2012/05/10 02:36:02, kalman wrote:
> might as well do it now. sys.exit(...) (somewhere above there's an error)

Oops forgot to delete this.

https://chromiumcodereview.appspot.com/10272021/diff/25001/tools/json_schema_...
File tools/json_schema_compiler/compiler.py (right):

https://chromiumcodereview.appspot.com/10272021/diff/25001/tools/json_schema_...
tools/json_schema_compiler/compiler.py:122:
api_model.AddNamespace(target_namespace, relpath)
Not quite sure the best way to check the filenames here. Any suggestions?

[not at google - send to devlin, 2012-05-10 03:26:51]

https://chromiumcodereview.appspot.com/10272021/diff/19001/tools/json_schema_...
File tools/json_schema_compiler/compiler.py (right):

https://chromiumcodereview.appspot.com/10272021/diff/19001/tools/json_schema_...
tools/json_schema_compiler/compiler.py:39: (schema_filename, schema_extension))
On 2012/05/10 03:09:01, cduvall wrote:
> On 2012/05/10 02:36:02, kalman wrote:
> > Instead of doing this can we load the Namespace then assert that name ==
> > unix_name?
> 
> I did it for single schemas, but I'm not quite sure what the best way is for
> bundle schemas.

Oh, that is a really good point. In fact none of this will even work if there's
more than one schema; that's an existing bug with json_schema_compiler.

I think we'll need to add another check that a file only contains a single
schema :\ and only return that one schema from here.

(trivia: once upon a time I tried to make it so that schema files only contain a
single schema rather than a list, but it turned into too much of a yak shave and
I gave up).

And do that ==namespace.unix_name after namespace is created below, perhaps.

[cduvall, 2012-05-11 21:04:14]

Now it makes sure the files only have a single schema and checks them all
against unix_name.

[not at google - send to devlin, 2012-05-12 00:19:37]

nice, lgtm. just those couple of tiny things

https://chromiumcodereview.appspot.com/10272021/diff/27001/tools/json_schema_...
File tools/json_schema_compiler/compiler.py (right):

https://chromiumcodereview.appspot.com/10272021/diff/27001/tools/json_schema_...
tools/json_schema_compiler/compiler.py:74: path, schema_filename =
os.path.split(schema_filename)
Rather than doing this every loop, just do it at the top; and call it simplename
or shortname or something (rather than overriding schema_filename)

https://chromiumcodereview.appspot.com/10272021/diff/27001/tools/json_schema_...
tools/json_schema_compiler/compiler.py:127: if namespace.unix_name != filename:
could you add a comment here explaining why (just the gyp stuff)?

[cduvall, 2012-05-12 00:59:36]

https://chromiumcodereview.appspot.com/10272021/diff/27001/tools/json_schema_...
File tools/json_schema_compiler/compiler.py (right):

https://chromiumcodereview.appspot.com/10272021/diff/27001/tools/json_schema_...
tools/json_schema_compiler/compiler.py:74: path, schema_filename =
os.path.split(schema_filename)
On 2012/05/12 00:19:37, kalman wrote:
> Rather than doing this every loop, just do it at the top; and call it
simplename
> or shortname or something (rather than overriding schema_filename)

Done.

https://chromiumcodereview.appspot.com/10272021/diff/27001/tools/json_schema_...
tools/json_schema_compiler/compiler.py:127: if namespace.unix_name != filename:
On 2012/05/12 00:19:37, kalman wrote:
> could you add a comment here explaining why (just the gyp stuff)?

Done.

[commit-bot: I haz the power, 2012-05-12 00:59:50]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/cduvall@chromium.org/10272021/24124

[commit-bot: I haz the power, 2012-05-12 02:22:41]

Change committed as 136747