summaryrefslogtreecommitdiffstats
path: root/base/base_lib.scons
diff options
context:
space:
mode:
authorsgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-17 02:25:22 +0000
committersgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-17 02:25:22 +0000
commitcaeb7a0ca33ec99cd3dc68e95ca23ca4aa7e8068 (patch)
tree26d23c79d97efa44f69d1b447ae4618bf34fc609 /base/base_lib.scons
parent75ddd63be217e7fed76f90578a8918ab75b3ead8 (diff)
downloadchromium_src-caeb7a0ca33ec99cd3dc68e95ca23ca4aa7e8068.zip
chromium_src-caeb7a0ca33ec99cd3dc68e95ca23ca4aa7e8068.tar.gz
chromium_src-caeb7a0ca33ec99cd3dc68e95ca23ca4aa7e8068.tar.bz2
Generate all chrome .vcproj files:
* Path name translation (/ to \) of various MSVSTool attributes. * Explicit keyword= arguments to MSVSProject. This will likely go away eventually in favor of uniform behavior. * Add a relative_path_substitutions array that can be used to substitute in Visual Studio variable like $(OutDir). * Add a local_directory_prefix that can be set to './' to only affect files in the current directory. * Additional Keyword ordering in Tool attributes to continue to match the default order Visual Studio generates. * Add a Derived() proxy class that can wrap a File node to tell the .vcproj generation that we want the derived file, not its source(s), in the file list. * In the individual *.scons files, add the necessary files (mostly .h files) to file lists, and update MSVSProject() calls with the additional necessary information. Result is identical .vcproj files modulo the following differences: * Four locales .vcproj files (da, en-US, he and zh-TW) with source file orders that don't match the other locale .vcproj files have re-ordered file lists to match the rest. * Cosmetic XML changes (white space, ending tags) in: chrome/app/chrome_dll.vcproj chrome/app/generated_resources.vcproj net/build/net_resources.vcproj * Removal or addition of ./ prefixes from various files that don't match the other file specifications within their individual .vcproj files: chrome/installer/util/util.vcproj net/build/net.vcproj net/build/net_unittests.vcproj * Add missing empty sections (<ToolFiles>, <References>, <Globals>) for consistency with other .vcproj files: chrome/tools/test/image_diff/image_diff.vcproj third_party/libpng/libpng.vcproj third_party/zlib/zlib.vcproj * Add missing RootNameSpace attribute: chrome/test/automation/automation.vcproj testing/gtest.vcproj * Use && instead of \r\n as a command separator, to sidestep XML-generation problems: chrome/app/chrome_exe.vcproj * Remove unnecessary (?) duplicate files in the file list: chrome/browser/views/browser_views.vcproj (event_utils.cc and event_utils.h were duplicated) Review URL: http://codereview.chromium.org/17603 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8253 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/base_lib.scons')
-rw-r--r--base/base_lib.scons6
1 files changed, 4 insertions, 2 deletions
diff --git a/base/base_lib.scons b/base/base_lib.scons
index b1b965e..7965c5e 100644
--- a/base/base_lib.scons
+++ b/base/base_lib.scons
@@ -219,8 +219,8 @@ input_files = ChromeFileList([
'system_monitor.h',
'system_monitor_win.cc',
'task.h',
- 'test_file_util_win.cc',
'test_file_util.h',
+ 'test_file_util_win.cc',
'thread.cc',
'thread.h',
'thread_collision_warner.cc',
@@ -246,8 +246,9 @@ input_files = ChromeFileList([
'values.cc',
'values.h',
'waitable_event.h',
- 'waitable_event_win.cc',
+ 'waitable_event_watcher.h',
'waitable_event_watcher_win.cc',
+ 'waitable_event_win.cc',
'watchdog.cc',
'watchdog.h',
'win_util.cc',
@@ -388,6 +389,7 @@ env.ChromeLibrary('base', input_files)
p = env.ChromeMSVSProject('build/base.vcproj',
dest='$CHROME_SRC_DIR/base/build/base.vcproj',
guid='{1832A374-8A74-4F9E-B536-69A699B3E165}',
+ keyword='Win32Proj',
dependencies=[
'build/debug_message.vcproj',
# Necessary for chrome.sln.