From 4c75444536c32d6f57801ab73129e90b93db0605 Mon Sep 17 00:00:00 2001 From: "sgk@google.com" Date: Tue, 21 Oct 2008 20:24:56 +0000 Subject: SCons renaming updates for base, net and googleurl: * Rename SConscript files to {module}.scons or {moduel}_lib.scons, depending on the primary target involved. * Separate targets into individual *.scons files, with one construction environment (named "env") per *.scons file. * Add using_{module}.scons files (like .vsprops) that will be used by other modules to add CPPDEFINES, CPPPATH, LIBS and LIBPATH values. * Update other modules' *.scons files to use the new using_{module}.scons files (using a temporary one-liner idiom until we have the ApplySConscript() method from the Hammer modules). * Use the idiom of removing to-be-ported files from the master list, so they can be simply deleted from the to-be-ported list as they get ported in the future, instead of having to shuffle entries between lists. * Use $OBJ_ROOT instead of hard-coded '#/$BUILD_TYPE/' for the $*_DIR variables. * Add a addRepository() call mapping build/ to $TARGET_ROOT/googleurl, so its $OBJ_ROOT value can look like the others'. * Formatting changes, primarily modifying indentation to conform to style guidelines. * Fix copyright headers in some third_party/* modules previously overlooked. * Add rudimentary __doc__ strings, setting up for a future ability to generate meaningful documentation. Review URL: http://codereview.chromium.org/7807 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3675 0039d316-1c4b-4281-b951-d872f2087c98 --- build/SConscript.googleurl | 95 ---------------------------------------------- 1 file changed, 95 deletions(-) (limited to 'build/SConscript.googleurl') diff --git a/build/SConscript.googleurl b/build/SConscript.googleurl index 11ca7c7..e69de29 100644 --- a/build/SConscript.googleurl +++ b/build/SConscript.googleurl @@ -1,95 +0,0 @@ -# Copyright (c) 2006-2008 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. - -Import('env') - -env = env.Clone() - -env.Prepend( - CPPPATH = [ - '$ICU38_DIR/public/common', - '$ICU38_DIR/public/i18n', - '#/..', - ], -) - -env.Append( - CPPDEFINES = [ - 'U_STATIC_IMPLEMENTATION', - ], -) - -if env['PLATFORM'] == 'win32': - env.Append( - CCFLAGS = [ - '/TP', - ], - ) - -lib_input_files = [ - 'gurl.cc', - 'url_canon_etc.cc', - 'url_canon_fileurl.cc', - 'url_canon_host.cc', - 'url_canon_icu.cc', - 'url_canon_internal.cc', - 'url_canon_ip.cc', - 'url_canon_mailtourl.cc', - 'url_canon_path.cc', - 'url_canon_pathurl.cc', - 'url_canon_query.cc', - 'url_canon_relative.cc', - 'url_canon_stdurl.cc', - 'url_parse.cc', - 'url_parse_file.cc', - 'url_util.cc', -] - -def BuildObjectFiles(environ, input_files): - obj_files = [] - for input_file in input_files: - source = '../googleurl/src/' + input_file - target = '$TARGET_ROOT/googleurl/' + input_file[:input_file.find('.cc')] - obj_files.append(environ.StaticObject(source = source, target = target)) - return obj_files - -env.ChromeStaticLibrary('$TARGET_ROOT/googleurl/googleurl', - BuildObjectFiles(env, lib_input_files)) - -env_tests = env.Clone() - -env_tests.Append( - CPPPATH = [ - '$GTEST_DIR/include', - ], - CPPDEFINES = [ - 'UNIT_TEST', - ], - LIBS = [ - 'googleurl', - 'base', - env_tests['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed - 'gtest', - ] -) - -test_files = [ - 'gurl_unittest.cc', - 'url_canon_unittest.cc', - 'url_parse_unittest.cc', - 'url_util_unittest.cc', -] - -test_obj_files = BuildObjectFiles(env_tests, test_files) -# The version of gtest that googleurl uses provides a main() function; ours -# doesn't so include our own main function. -test_obj_files.append(env_tests.StaticObject(source = '../base/run_all_unittests.cc', - target = '$TARGET_ROOT/googleurl/run_all_unittests')) - -gurl_unittests = env_tests.ChromeTestProgram( - '$TARGET_ROOT/googleurl/googleurl_unittests', test_obj_files) - -installed_gurl_unittests = env.Install('$TARGET_ROOT', gurl_unittests) - -env.Alias('googleurl', installed_gurl_unittests) -- cgit v1.1