Skip to content

Commit

Permalink
Moving prepopulated search engines to a JSON file.
Browse files Browse the repository at this point in the history
This CL also includes the python script required to convert the JSON file to a .cc/.h pair. The generated .cc/.h are not generated by the build process and must be committed to the repository.

BUG=159990


Review URL: https://chromiumcodereview.appspot.com/11377049

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167793 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
beaudoin@chromium.org committed Nov 15, 2012
1 parent 63931bd commit e02d8e2
Show file tree
Hide file tree
Showing 13 changed files with 2,505 additions and 2,429 deletions.
48 changes: 48 additions & 0 deletions build/json_to_struct.gypi
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
# Copyright 2012 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

{
'variables': {
# When including this gypi, the following variables must be set:
# schema_file: a json file that comprise the structure model.
# namespace: the C++ namespace that all generated files go under
# cc_dir: path to generated files
# Functions and namespaces can be excluded by setting "nocompile" to true.
'struct_gen_dir': '<(DEPTH)/tools/json_to_struct',
'struct_gen': '<(struct_gen_dir)/json_to_struct.py',
},
'rules': [
{
'rule_name': 'genstaticinit',
'extension': 'json',
'inputs': [
'<(struct_gen_dir)/element_generator.py',
'<(struct_gen_dir)/json_to_struct.py',
'<(struct_gen_dir)/struct_generator.py',
'<(schema_file)',
],
'outputs': [
'<(SHARED_INTERMEDIATE_DIR)/<(cc_dir)/<(RULE_INPUT_ROOT).cc',
'<(SHARED_INTERMEDIATE_DIR)/<(cc_dir)/<(RULE_INPUT_ROOT).h',
],
'action': [
'python',
'<(struct_gen)',
'<(RULE_INPUT_PATH)',
'--destdir=<(SHARED_INTERMEDIATE_DIR)/<(cc_dir)',
'--namespace=<(namespace)',
'--schema=<(schema_file)',
],
'message': 'Generating C++ static initializers from <(RULE_INPUT_PATH)',
'process_outputs_as_sources': 1,
},
],
'include_dirs': [
'<(SHARED_INTERMEDIATE_DIR)',
'<(DEPTH)',
],
# This target exports a hard dependency because it generates header
# files.
'hard_dependency': 1,
}
24 changes: 24 additions & 0 deletions chrome/browser/search_engines/prepopulated_engines.gyp
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Copyright 2012 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

{
'targets': [
{
'target_name': 'prepopulated_engines',
'type': 'static_library',
'sources': [
'prepopulated_engines.json',
],
'includes': [
'../../../build/json_to_struct.gypi',
],
'variables': {
'chromium_code': 1,
'schema_file': 'prepopulated_engines_schema.json',
'namespace': 'TemplateURLPrepopulateData',
'cc_dir': 'chrome/browser/search_engines',
},
},
],
}
Loading

0 comments on commit e02d8e2

Please sign in to comment.