Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 { | 5 { |
| 6 'variables': { | 6 'variables': { |
| 7 'chromium_code': 1, | 7 'chromium_code': 1, |
| 8 'policy_out_dir': '<(SHARED_INTERMEDIATE_DIR)/policy', | 8 'policy_out_dir': '<(SHARED_INTERMEDIATE_DIR)/policy', |
| 9 'protoc_out_dir': '<(SHARED_INTERMEDIATE_DIR)/protoc_out', | 9 'protoc_out_dir': '<(SHARED_INTERMEDIATE_DIR)/protoc_out', |
| 10 'generate_policy_source_script_path': | 10 'generate_policy_source_script_path': |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 57 'direct_dependent_settings': { | 57 'direct_dependent_settings': { |
| 58 'include_dirs': [ | 58 'include_dirs': [ |
| 59 '<(policy_out_dir)', | 59 '<(policy_out_dir)', |
| 60 '<(protoc_out_dir)', | 60 '<(protoc_out_dir)', |
| 61 ], | 61 ], |
| 62 }, | 62 }, |
| 63 }, | 63 }, |
| 64 { | 64 { |
| 65 'target_name': 'cloud_policy_proto_compile', | 65 'target_name': 'cloud_policy_proto_compile', |
| 66 'type': 'none', | 66 'type': 'none', |
| 67 'actions': [ | 67 'sources': [ |
| 68 { | 68 '<(policy_out_dir)/policy/cloud_policy.proto', |
| 69 'action_name': 'compile_generated_proto', | |
| 70 'inputs': [ | |
| 71 '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)protoc<(EXECUTABLE_SUFFIX)', | |
| 72 '<(policy_out_dir)/policy/cloud_policy.proto', | |
| 73 ], | |
| 74 'outputs': [ | |
| 75 '<(PRODUCT_DIR)/pyproto/device_management_pb/cloud_policy_pb2.py', | |
| 76 '<(protoc_out_dir)/<(proto_path_substr)/cloud_policy.pb.h', | |
| 77 '<(protoc_out_dir)/<(proto_path_substr)/cloud_policy.pb.cc', | |
| 78 ], | |
| 79 'action': [ | |
| 80 '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)protoc<(EXECUTABLE_SUFFIX)', | |
| 81 '--proto_path=<(policy_out_dir)/policy', | |
| 82 '<(policy_out_dir)/policy/cloud_policy.proto', | |
| 83 '--cpp_out=<(protoc_out_dir)/<(proto_path_substr)', | |
| 84 '--python_out=<(PRODUCT_DIR)/pyproto/device_management_pb', | |
| 85 ], | |
| 86 'message': 'Compiling generated cloud policy protobuf', | |
| 87 }, | |
| 88 ], | 69 ], |
| 70 'variables': { | |
| 71 'proto_in_dir': '<(policy_out_dir)/policy', | |
| 72 'proto_out_dir': 'chrome/browser/policy/proto', | |
|
Ryan Sleevi
2012/01/22 01:04:03
You should be using <(policy_path_substr) here (be
| |
| 73 }, | |
| 89 'dependencies': [ | 74 'dependencies': [ |
| 90 '<(DEPTH)/third_party/protobuf/protobuf.gyp:protoc#host', | |
| 91 'cloud_policy_code_generate', | 75 'cloud_policy_code_generate', |
| 92 ], | 76 ], |
| 93 'direct_dependent_settings': { | 77 'includes': [ '../../../build/protoc.gypi' ], |
|
Ryan Sleevi
2012/01/22 01:04:03
You may want to double check the GYP syntax rules,
| |
| 94 'include_dirs': [ | |
| 95 '<(protoc_out_dir)', | |
| 96 ] | |
| 97 }, | |
| 98 }, | 78 }, |
| 99 { | 79 { |
| 100 'target_name': 'cloud_policy_backend_header_compile', | 80 'target_name': 'cloud_policy_backend_header_compile', |
| 101 'type': 'none', | 81 'type': 'none', |
| 102 'sources': [ | 82 'sources': [ |
| 103 '<(proto_rel_path)/chrome_device_policy.proto', | 83 '../../browser/policy/proto/chrome_device_policy.proto', |
|
Ryan Sleevi
2012/01/22 01:04:03
Why did you stop using <(proto_rel_path) here?
| |
| 104 '<(proto_rel_path)/device_management_backend.proto', | 84 '../../browser/policy/proto/device_management_backend.proto', |
| 105 '<(proto_rel_path)/device_management_local.proto', | 85 '../../browser/policy/proto/device_management_local.proto', |
| 106 '<(proto_rel_path)/old_generic_format.proto', | 86 '../../browser/policy/proto/old_generic_format.proto', |
| 107 ], | 87 ], |
| 108 'rules': [ | 88 'variables': { |
| 109 { | 89 'proto_in_dir': '../../browser/policy/proto', |
| 110 'rule_name': 'gen_proto', | 90 'proto_out_dir': 'chrome/browser/policy/proto', |
| 111 'extension': 'proto', | 91 }, |
| 112 'inputs': [ | 92 'dependencies': [ |
| 113 '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)protoc<(EXECUTABLE_SUFFIX)', | 93 'cloud_policy_code_generate', |
| 114 ], | |
| 115 'outputs': [ | |
| 116 '<(PRODUCT_DIR)/pyproto/device_management_pb/<(RULE_INPUT_ROOT)_pb2. py', | |
| 117 '<(protoc_out_dir)/<(proto_path_substr)/<(RULE_INPUT_ROOT).pb.h', | |
| 118 '<(protoc_out_dir)/<(proto_path_substr)/<(RULE_INPUT_ROOT).pb.cc', | |
| 119 ], | |
| 120 'action': [ | |
| 121 '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)protoc<(EXECUTABLE_SUFFIX)', | |
| 122 '--proto_path=<(proto_rel_path)', | |
| 123 '<(proto_rel_path)/<(RULE_INPUT_NAME)', | |
| 124 '--cpp_out=<(protoc_out_dir)/<(proto_path_substr)', | |
| 125 '--python_out=<(PRODUCT_DIR)/pyproto/device_management_pb', | |
| 126 ], | |
| 127 'message': 'Generating C++ and Python code from <(RULE_INPUT_PATH)', | |
| 128 }, | |
| 129 ], | 94 ], |
| 130 'dependencies': [ | 95 'includes': [ '../../../build/protoc.gypi' ], |
| 131 '<(DEPTH)/third_party/protobuf/protobuf.gyp:protoc#host', | |
| 132 ], | |
| 133 'direct_dependent_settings': { | |
| 134 'include_dirs': [ | |
| 135 '<(protoc_out_dir)', | |
| 136 ] | |
| 137 }, | |
| 138 }, | 96 }, |
| 139 { | 97 { |
| 140 'target_name': 'policy', | 98 'target_name': 'policy', |
| 141 'type': 'static_library', | 99 'type': 'static_library', |
| 142 'hard_dependency': 1, | 100 'hard_dependency': 1, |
| 143 'direct_dependent_settings': { | 101 'direct_dependent_settings': { |
| 144 'include_dirs': [ | 102 'include_dirs': [ |
| 145 '<(policy_out_dir)', | 103 '<(policy_out_dir)', |
| 146 '<(protoc_out_dir)', | 104 '<(protoc_out_dir)', |
| 147 ], | 105 ], |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 196 'configurations': { | 154 'configurations': { |
| 197 'Common_Base': { | 155 'Common_Base': { |
| 198 'msvs_target_platform': 'x64', | 156 'msvs_target_platform': 'x64', |
| 199 }, | 157 }, |
| 200 }, | 158 }, |
| 201 }, | 159 }, |
| 202 ], | 160 ], |
| 203 }], | 161 }], |
| 204 ], # 'conditions' | 162 ], # 'conditions' |
| 205 } | 163 } |
| OLD | NEW |