summaryrefslogtreecommitdiffstats
path: root/tools/json_schema_compiler
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-03 03:35:56 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-03 03:35:56 +0000
commit2c60cf708189d0377604ab8b80f3d1fc1604f920 (patch)
tree2b38e3f00270b7918b4d06ddae9e2eb93e2daf96 /tools/json_schema_compiler
parentfef2237caf9a2ee5a5c3d770fab882db2c97451d (diff)
downloadchromium_src-2c60cf708189d0377604ab8b80f3d1fc1604f920.zip
chromium_src-2c60cf708189d0377604ab8b80f3d1fc1604f920.tar.gz
chromium_src-2c60cf708189d0377604ab8b80f3d1fc1604f920.tar.bz2
Revert 135077 - 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" BUG=125669 TEST=All previous tests for the renamed files This broke Linux and Linux64: g++: out/Release/obj/gen/chrome/common/extensions/api/experimental.fontSettings.cc: No such file or directory g++: no input files make: *** [out/Release/obj.target/api/gen/chrome/common/extensions/api/experimental.fontSettings.o] Error 1 Review URL: http://codereview.chromium.org/10272021 TBR=cduvall@chromium.org Review URL: https://chromiumcodereview.appspot.com/10348005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135081 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/json_schema_compiler')
-rwxr-xr-xtools/json_schema_compiler/compiler.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/json_schema_compiler/compiler.py b/tools/json_schema_compiler/compiler.py
index 9d1a312..1d08841 100755
--- a/tools/json_schema_compiler/compiler.py
+++ b/tools/json_schema_compiler/compiler.py
@@ -70,7 +70,7 @@ def handle_single_schema(filename, dest_dir, root, root_namespace):
# The output filename must match the input filename for gyp to deal with it
# properly.
- out_file = namespace.unix_name
+ out_file = namespace.name
type_generator = cpp_type_generator.CppTypeGenerator(
root_namespace, namespace, namespace.unix_name)
for referenced_namespace in api_model.namespaces.values():
@@ -78,7 +78,7 @@ def handle_single_schema(filename, dest_dir, root, root_namespace):
continue
type_generator.AddNamespace(
referenced_namespace,
- referenced_namespace.unix_name)
+ referenced_namespace.name)
h_code = (h_generator.HGenerator(namespace, type_generator)
.Generate().Render())
@@ -120,7 +120,7 @@ def handle_bundle_schema(filenames, dest_dir, root, root_namespace):
for referenced_namespace in api_model.namespaces.values():
type_generator.AddNamespace(
referenced_namespace,
- referenced_namespace.unix_name)
+ referenced_namespace.name)
generator = schema_bundle_generator.SchemaBundleGenerator(
api_model, api_defs, type_generator)