Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(255)

Side by Side Diff: SConstruct

Issue 6602095: libchromeos: revert add process control library, syslog logging capability, and run unit tests (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/common.git@master
Patch Set: Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chromeos/process.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 import sys 6 import sys
7 7
8 SOURCES=['chromeos/dbus/abstract_dbus_service.cc', 8 SOURCES=['chromeos/dbus/abstract_dbus_service.cc',
9 'chromeos/dbus/dbus.cc', 9 'chromeos/dbus/dbus.cc',
10 'chromeos/dbus/service_constants.cc', 10 'chromeos/dbus/service_constants.cc',
11 'chromeos/process.cc',
12 'chromeos/string.cc', 11 'chromeos/string.cc',
13 'chromeos/syslog_logging.cc',
14 'chromeos/utility.cc'] 12 'chromeos/utility.cc']
15 13
16 env = Environment( 14 env = Environment(
17 CPPPATH=[ '.', '../third_party/chrome/files' ], 15 CPPPATH=[ '.', '../third_party/chrome/files' ],
18 CCFLAGS=[ '-g' ], 16 CCFLAGS=[ '-g' ],
19 ) 17 )
20 for key in Split('CC CXX AR RANLIB LD NM CFLAGS CCFLAGS'): 18 for key in Split('CC CXX AR RANLIB LD NM CFLAGS CCFLAGS'):
21 value = os.environ.get(key) 19 value = os.environ.get(key)
22 if value != None: 20 if value != None:
23 env[key] = Split(value) 21 env[key] = Split(value)
(...skipping 11 matching lines...) Expand all
35 # Unit test 33 # Unit test
36 if ARGUMENTS.get('debug', 0): 34 if ARGUMENTS.get('debug', 0):
37 env.Append( 35 env.Append(
38 CCFLAGS = ['-fprofile-arcs', '-ftest-coverage', '-fno-inline'], 36 CCFLAGS = ['-fprofile-arcs', '-ftest-coverage', '-fno-inline'],
39 LIBS = ['gcov'], 37 LIBS = ['gcov'],
40 ) 38 )
41 39
42 env_test = env.Clone() 40 env_test = env.Clone()
43 41
44 env_test.Append( 42 env_test.Append(
45 LIBS = ['gtest', 'base', 'rt'], 43 LIBS = ['gtest', 'chromeos', 'base', 'rt'],
46 LIBPATH = ['.', '../third_party/chrome'], 44 LIBPATH = ['.', '../third_party/chrome'],
47 ) 45 )
48 for key in Split('CC CXX AR RANLIB LD NM CFLAGS CCFLAGS'): 46 for key in Split('CC CXX AR RANLIB LD NM CFLAGS CCFLAGS'):
49 value = os.environ.get(key) 47 value = os.environ.get(key)
50 if value: 48 if value:
51 env_test[key] = Split(value) 49 env_test[key] = Split(value)
52 50
53 # Use libchromeos instead of passing in LIBS in order to always 51 unittest_sources =['chromeos/glib/object_unittest.cc']
54 # get the version we just built, not what was previously installed.
55 unittest_sources =['chromeos/glib/object_unittest.cc',
56 'chromeos/process_test.cc',
57 'libchromeos.a']
58 unittest_main = ['testrunner.cc'] 52 unittest_main = ['testrunner.cc']
59 unittest_cmd = env_test.Program('unittests', 53 unittest_cmd = env_test.Program('unittests',
60 unittest_sources + unittest_main) 54 unittest_sources + unittest_main)
61 55
62 Clean(unittest_cmd, Glob('*.gcda') + Glob('*.gcno') + Glob('*.gcov') + 56 Clean(unittest_cmd, Glob('*.gcda') + Glob('*.gcno') + Glob('*.gcov') +
63 Split('html app.info')) 57 Split('html app.info'))
58
59
OLDNEW
« no previous file with comments | « no previous file | chromeos/process.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698