| OLD | NEW |
| 1 # Copyright (c) 2009 The Chromium OS Authors. All rights reserved. | 1 # Copyright (c) 2009 The Chromium OS 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 import os | 5 import os |
| 6 | 6 |
| 7 # Protobuffer compilation | 7 # Protobuffer compilation |
| 8 def ProtocolBufferEmitter(target, source, env): | 8 def ProtocolBufferEmitter(target, source, env): |
| 9 """ Inputs: | 9 """ Inputs: |
| 10 target: list of targets to compile to | 10 target: list of targets to compile to |
| (...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 161 gflags | 161 gflags |
| 162 glib-2.0 | 162 glib-2.0 |
| 163 gthread-2.0 | 163 gthread-2.0 |
| 164 libpcrecpp | 164 libpcrecpp |
| 165 metrics | 165 metrics |
| 166 protobuf | 166 protobuf |
| 167 pthread | 167 pthread |
| 168 ssl | 168 ssl |
| 169 xml2 | 169 xml2 |
| 170 z""") | 170 z""") |
| 171 env['CPPPATH'] = ['..', '../../third_party/chrome/files', '../../common'] | 171 env['CPPPATH'] = ['..'] |
| 172 env['LIBPATH'] = ['../../third_party/chrome'] | |
| 173 env['BUILDERS']['ProtocolBuffer'] = proto_builder | 172 env['BUILDERS']['ProtocolBuffer'] = proto_builder |
| 174 env['BUILDERS']['DbusBindings'] = dbus_bindings_builder | 173 env['BUILDERS']['DbusBindings'] = dbus_bindings_builder |
| 175 env['BUILDERS']['GlibMarshal'] = glib_marshal_builder | 174 env['BUILDERS']['GlibMarshal'] = glib_marshal_builder |
| 176 | 175 |
| 177 # Fix issue with scons not passing pkg-config vars through the environment. | 176 # Fix issue with scons not passing pkg-config vars through the environment. |
| 178 for key in Split('PKG_CONFIG_LIBDIR PKG_CONFIG_PATH'): | 177 for key in Split('PKG_CONFIG_LIBDIR PKG_CONFIG_PATH'): |
| 179 if os.environ.has_key(key): | 178 if os.environ.has_key(key): |
| 180 env['ENV'][key] = os.environ[key] | 179 env['ENV'][key] = os.environ[key] |
| 181 | 180 |
| 182 env.ParseConfig('pkg-config --cflags --libs ' | 181 env.ParseConfig('pkg-config --cflags --libs ' |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 292 delta_generator_main) | 291 delta_generator_main) |
| 293 | 292 |
| 294 http_server_cmd = env.Program('test_http_server', 'test_http_server.cc') | 293 http_server_cmd = env.Program('test_http_server', 'test_http_server.cc') |
| 295 | 294 |
| 296 unittest_env = env.Clone() | 295 unittest_env = env.Clone() |
| 297 unittest_env.Append(LIBS=['gmock', 'gtest']) | 296 unittest_env.Append(LIBS=['gmock', 'gtest']) |
| 298 unittest_cmd = unittest_env.Program('update_engine_unittests', | 297 unittest_cmd = unittest_env.Program('update_engine_unittests', |
| 299 unittest_sources + unittest_main) | 298 unittest_sources + unittest_main) |
| 300 Clean(unittest_cmd, Glob('*.gcda') + Glob('*.gcno') + Glob('*.gcov') + | 299 Clean(unittest_cmd, Glob('*.gcda') + Glob('*.gcno') + Glob('*.gcov') + |
| 301 Split('html app.info')) | 300 Split('html app.info')) |
| OLD | NEW |