diff options
Diffstat (limited to 'chrome')
39 files changed, 1390 insertions, 81 deletions
diff --git a/chrome/SConscript b/chrome/SConscript index b9bbb33..944e1fd 100644 --- a/chrome/SConscript +++ b/chrome/SConscript @@ -258,6 +258,46 @@ if env_dll.Bit('windows'): install_targets.extend(chrome_dll_version_rc) install_targets.extend(chrome_dll_version_res) +env.ChromeMSVSProject('$CHROME_DIR/app/chrome_dll.vcproj', + dependencies = [ + '$BASE_DIR/build/base.vcproj', + '$WEBKIT_DIR/build/WebCore/WebCore.vcproj', + '$CHROME_DIR/plugin/plugin.vcproj', + '$LIBJPEG_DIR/libjpeg.vcproj', + '$BZIP2_DIR/bzip2.vcproj', + '$NET_DIR/build/net.vcproj', + ('$WEBKIT_DIR/build/JavaScriptCore/' + + 'JavaScriptCore_pcre.vcproj'), + '$WEBKIT_DIR/build/port/port.vcproj', + '$CHROME_DIR/browser/debugger/debugger.vcproj', + '$WEBKIT_DIR/default_plugin/default_plugin.vcproj', + '$CHROME_DIR/browser/browser.vcproj', + '$WEBKIT_DIR/build/V8Bindings/V8Bindings.vcproj', + '$SQLITE_DIR/sqlite.vcproj', + '$CHROME_DIR/views/views.vcproj', + '$MODP_B64_DIR/modp_b64.vcproj', + '$ZLIB_DIR/zlib.vcproj', + '$CHROME_DIR/common/common.vcproj', + '$ICU38_DIR/build/icu.vcproj', + '$CHROME_DIR/renderer/renderer.vcproj', + '$BASE_DIR/build/base_gfx.vcproj', + '$WEBKIT_DIR/build/JavaScriptCore/WTF.vcproj', + '$CHROME_DIR/browser/resources/browser_resources.vcproj', + '$V8_DIR/tools/visual_studio/v8_snapshot.vcproj', + '$LIBPNG_DIR/libpng.vcproj', + '$WEBKIT_DIR/build/glue/glue.vcproj', + '$SKIA_DIR/skia.vcproj', + '$CHROME_DIR/third_party/hunspell/hunspell.vcproj', + '$GEARS_DIR/gears.vcproj', + '$GOOGLEURL_DIR/build/googleurl.vcproj', + '$CHROME_DIR/installer/util/util.vcproj', + '$WEBKIT_DIR/activex_shim/activex_shim.vcproj', + '$SDCH_DIR/sdch.vcproj', + '$CHROME_DIR/browser/views/browser_views.vcproj', + '$LIBXSLT_DIR/build/libxslt.vcproj', + ], + guid='{C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9}') + env_exe = env.Clone() @@ -328,8 +368,21 @@ if env.Bit('windows'): # For release we want to run dependencies.py, may look something like: #env.AddPostAction('$TARGET_ROOT/chrome.exe', - # '$PYTHON tools/build/win/dependencies.py $(TargetPath) chrome.exe.deps') - + # ('$PYTHON tools/build/win/dependencies.py ' + + # '$(TargetPath) chrome.exe.deps')) + +env.ChromeMSVSProject('$CHROME_DIR/app/chrome_exe.vcproj', + dependencies = [ + '$BASE_DIR/build/base.vcproj', + '$SANDBOX_DIR/src/sandbox.vcproj', + '$CHROME_DIR/tools/crash_service/crash_service.vcproj', + '$BREAKPAD_DIR/breakpad_handler.vcproj', + '$CHROME_DIR/app/chrome_dll.vcproj', + '$CHROME_DIR/app/locales/en-US.vcproj', + '$CHROME_DIR/installer/util/util.vcproj', + '$CHROME_DIR/app/theme/theme_dll.vcproj', + ], + guid='{7B219FAA-E360-43C8-B341-804A94EEFFAC}') env_flat = env.Clone( diff --git a/chrome/app/locales/locales.scons b/chrome/app/locales/locales.scons new file mode 100644 index 0000000..d36d05c --- /dev/null +++ b/chrome/app/locales/locales.scons @@ -0,0 +1,118 @@ +# 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. + +__doc__ = """ +locale resource configuration. +""" + +Import('env') + +def ChromiumLocaleProject(name, guid): + return env.ChromeMSVSProject(name, + dependencies = [ + '$WEBKIT_DIR/build/localized_strings/localized_strings.vcproj', + '$CHROME_DIR/app/generated_resources.vcproj', + ], + guid=guid) + +ChromiumLocaleProject('$CHROME_DIR/app/locales/ar.vcproj', + guid='{3AB90E6A-56FF-4C9D-B918-AB76DDBF8BE8}') +ChromiumLocaleProject('$CHROME_DIR/app/locales/bg.vcproj', + guid='{5BDB7EE1-A1FD-410C-9598-21519A1B7952}') +ChromiumLocaleProject('$CHROME_DIR/app/locales/bn.vcproj', + guid='{4B60E8B8-416F-40B2-8A54-F75970A21992}') +ChromiumLocaleProject('$CHROME_DIR/app/locales/ca.vcproj', + guid='{F7790A54-4078-4E4A-8231-818BE9FB1F94}') +ChromiumLocaleProject('$CHROME_DIR/app/locales/cs.vcproj', + guid='{7EA8C4AB-F9C6-4FA1-8B0A-74F5650430B2}') +ChromiumLocaleProject('$CHROME_DIR/app/locales/da.vcproj', + guid='{A493331B-3180-49FE-8D0E-D121645E63AD}') +ChromiumLocaleProject('$CHROME_DIR/app/locales/de.vcproj', + guid='{BA62FF5E-08A6-4102-9675-C12E8C9D4CC0}') +ChromiumLocaleProject('$CHROME_DIR/app/locales/el.vcproj', + guid='{D314F1B3-9299-4866-8362-08BF811B0FA3}') +ChromiumLocaleProject('$CHROME_DIR/app/locales/en-GB.vcproj', + guid='{34231B28-C51C-4C1C-AF07-C763668B1404}') +ChromiumLocaleProject('$CHROME_DIR/app/locales/en-US.vcproj', + guid='{CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3}') +ChromiumLocaleProject('$CHROME_DIR/app/locales/es.vcproj', + guid='{5AEA4BF6-27CD-47FC-9370-D87771CFA196}') +ChromiumLocaleProject('$CHROME_DIR/app/locales/es-419.vcproj', + guid='{FA660037-EB40-4A43-AA9D-9653C57F2789}') +ChromiumLocaleProject('$CHROME_DIR/app/locales/et.vcproj', + guid='{0557BC3C-DE87-4127-BDAA-9BD9BDB13FB4}') +ChromiumLocaleProject('$CHROME_DIR/app/locales/fi.vcproj', + guid='{64D81334-DE73-457D-8FC1-9492508A2663}') +ChromiumLocaleProject('$CHROME_DIR/app/locales/fil.vcproj', + guid='{3A932C39-AFA9-4BDC-B775-F71A426D04BF}') +ChromiumLocaleProject('$CHROME_DIR/app/locales/fr.vcproj', + guid='{0D54A5C4-B78B-41A2-BF8A-5DA48AC90495}') +ChromiumLocaleProject('$CHROME_DIR/app/locales/gu.vcproj', + guid='{256DECCE-9886-4C21-96A5-EE47DF5E07E9}') +ChromiumLocaleProject('$CHROME_DIR/app/locales/he.vcproj', + guid='{A28310B8-7BD0-4CDF-A7D8-59CAB42AA1C4}') +ChromiumLocaleProject('$CHROME_DIR/app/locales/hi.vcproj', + guid='{228DD844-9926-420E-B193-6973BF2A4D0B}') +ChromiumLocaleProject('$CHROME_DIR/app/locales/hr.vcproj', + guid='{CE1426F6-7D2B-4574-9929-58387BF7B05F}') +ChromiumLocaleProject('$CHROME_DIR/app/locales/hu.vcproj', + guid='{AFF332BF-AF3D-4D35-86FC-42A727F01D36}') +ChromiumLocaleProject('$CHROME_DIR/app/locales/id.vcproj', + guid='{E3DF045F-2174-4685-9CF7-0630A79F324B}') +ChromiumLocaleProject('$CHROME_DIR/app/locales/it.vcproj', + guid='{275F2993-EE9B-4E00-9C85-10A182FD423A}') +ChromiumLocaleProject('$CHROME_DIR/app/locales/ja.vcproj', + guid='{B2D715CE-4CBB-415A-A032-E700C90ADF91}') +ChromiumLocaleProject('$CHROME_DIR/app/locales/kn.vcproj', + guid='{3E6B24F6-9FA9-4066-859E-BF747FA3080A}') +ChromiumLocaleProject('$CHROME_DIR/app/locales/ko.vcproj', + guid='{32167995-4014-4E4C-983B-F7E17C24EB25}') +ChromiumLocaleProject('$CHROME_DIR/app/locales/lt.vcproj', + guid='{80E37CB5-059D-4F4B-AEF6-08265468D368}') +ChromiumLocaleProject('$CHROME_DIR/app/locales/lv.vcproj', + guid='{A5C5D801-4026-49F2-BBF1-250941855306}') +ChromiumLocaleProject('$CHROME_DIR/app/locales/ml.vcproj', + guid='{CAB69303-0F02-4C68-A12E-FFE55DB52526}') +ChromiumLocaleProject('$CHROME_DIR/app/locales/mr.vcproj', + guid='{A464166F-8507-49B4-9B02-5CB77C498B25}') +ChromiumLocaleProject('$CHROME_DIR/app/locales/nb.vcproj', + guid='{B30B0E1F-1CE9-4DEF-A752-7498FD709C1F}') +ChromiumLocaleProject('$CHROME_DIR/app/locales/nl.vcproj', + guid='{63011A7B-CE4D-4DF1-B5DA-1B133C14A2E8}') +ChromiumLocaleProject('$CHROME_DIR/app/locales/or.vcproj', + guid='{E07D267C-34C3-4DDB-8B41-94697808714A}') +ChromiumLocaleProject('$CHROME_DIR/app/locales/pl.vcproj', + guid='{9F53807E-9382-47BD-8371-E5D04F517E9C}') +ChromiumLocaleProject('$CHROME_DIR/app/locales/pt-BR.vcproj', + guid='{2F914112-2657-49EC-8EA6-3BA63340DE27}') +ChromiumLocaleProject('$CHROME_DIR/app/locales/pt-PT.vcproj', + guid='{0A13F602-B497-4BC1-ABD8-03CA8E95B2AF}') +ChromiumLocaleProject('$CHROME_DIR/app/locales/ro.vcproj', + guid='{C70D3509-57C4-4326-90C1-2EC0AE34848D}') +ChromiumLocaleProject('$CHROME_DIR/app/locales/ru.vcproj', + guid='{7D456640-3619-4D23-A56D-E0084400CCBF}') +ChromiumLocaleProject('$CHROME_DIR/app/locales/sk.vcproj', + guid='{82F5BFE5-FDCE-47D4-8B38-BEEBED561681}') +ChromiumLocaleProject('$CHROME_DIR/app/locales/sl.vcproj', + guid='{C2A444C2-9D74-4AD7-AE7C-04F5EDA17060}') +ChromiumLocaleProject('$CHROME_DIR/app/locales/sr.vcproj', + guid='{300C6A09-663E-48B6-8E07-A0D50CAF8F25}') +ChromiumLocaleProject('$CHROME_DIR/app/locales/sv.vcproj', + guid='{B0D5BD91-6153-4CA6-BC2F-4E3BD43E5DB7}') +ChromiumLocaleProject('$CHROME_DIR/app/locales/ta.vcproj', + guid='{7A0BA0C5-0D90-49AE-919A-4BE096F69E4F}') +ChromiumLocaleProject('$CHROME_DIR/app/locales/te.vcproj', + guid='{9D13D9B8-6C28-42A7-935C-B769EBC55BAA}') +ChromiumLocaleProject('$CHROME_DIR/app/locales/th.vcproj', + guid='{226B3533-1FF3-42F6-A8E3-C4DDBC955290}') +ChromiumLocaleProject('$CHROME_DIR/app/locales/tr.vcproj', + guid='{65C78BBB-8FCB-48E4-94C8-1F0F981929AF}') +ChromiumLocaleProject('$CHROME_DIR/app/locales/uk.vcproj', + guid='{182D578D-2DAC-4BB7-AFEC-9A2855E56F94}') +ChromiumLocaleProject('$CHROME_DIR/app/locales/vi.vcproj', + guid='{DA5C6FCB-FCFD-49B8-8DDA-8351638096DB}') +ChromiumLocaleProject('$CHROME_DIR/app/locales/zh-CN.vcproj', + guid='{C0C7DA58-C90D-4BDE-AE44-588997339F5D}') +ChromiumLocaleProject('$CHROME_DIR/app/locales/zh-TW.vcproj', + guid='{E7B11CF0-FE40-4A69-AE20-1B882F4D7585}') diff --git a/chrome/browser/browser.scons b/chrome/browser/browser.scons index feee5e8..8b6105b 100644 --- a/chrome/browser/browser.scons +++ b/chrome/browser/browser.scons @@ -308,3 +308,11 @@ if env.Bit('posix'): if not env.Bit('mac'): # TODO: This should work for all platforms. env.ChromeStaticLibrary('browser', input_files) + +env.ChromeMSVSProject('$CHROME_DIR/browser/browser.vcproj', + dependencies = [ + '$LIBXML_DIR/build/libxml_config.vcproj', + '$GOOGLE_UPDATE_DIR/ondemand_updates.vcproj', + '$CHROME_DIR/app/generated_resources.vcproj', + ], + guid='{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}') diff --git a/chrome/browser/debugger/debugger.scons b/chrome/browser/debugger/debugger.scons index 2846f89..0045c62 100644 --- a/chrome/browser/debugger/debugger.scons +++ b/chrome/browser/debugger/debugger.scons @@ -66,3 +66,8 @@ if not env.Bit('mac'): # TODO(port): Enable for Mac. env.ChromeStaticLibrary('debugger', input_files) +env.ChromeMSVSProject('$CHROME_DIR/browser/debugger/debugger.vcproj', + dependencies = [ + '$CHROME_DIR/app/generated_resources.vcproj', + ], + guid='{57823D8C-A317-4713-9125-2C91FDFD12D6}') diff --git a/chrome/browser/views/SConscript b/chrome/browser/views/SConscript index 4c0e9c4..8cdcfee 100644 --- a/chrome/browser/views/SConscript +++ b/chrome/browser/views/SConscript @@ -138,3 +138,11 @@ if env.Bit('windows'): ]) env.ChromeStaticLibrary('browser_views', input_files) + +env.ChromeMSVSProject('$CHROME_DIR/browser/views/browser_views.vcproj', + dependencies = [ + '$LIBXML_DIR/build/libxml_config.vcproj', + '$GOOGLE_UPDATE_DIR/ondemand_updates.vcproj', + '$CHROME_DIR/app/generated_resources.vcproj', + ], + guid='{FA537565-7B03-4FFC-AF15-F7A979B72E22}') diff --git a/chrome/chrome.scons b/chrome/chrome.scons index 1081fc2..0a029ff 100644 --- a/chrome/chrome.scons +++ b/chrome/chrome.scons @@ -43,6 +43,8 @@ sconscript_files = env.ChromiumLoadComponentSConscripts( LOAD_NAMES = ['chrome'], + chrome_sln = 'chrome_sln.scons', + locales = 'app/locales/locales.scons', browser = 'browser/browser.scons', debugger = 'browser/debugger/debugger.scons', common = 'common/common.scons', @@ -78,31 +80,4 @@ sconscript_files = env.ChromiumLoadComponentSConscripts( image_diff = 'tools/test/image_diff/image_diff.scons', ) -# TODO(port) -if env.AnyBits('linux', 'mac'): - remove_files = [ - 'installer/mini_installer/installer_unittests.scons', - 'installer/mini_installer/mini_installer.scons', - 'installer/setup/setup.scons', - 'installer/util/util.scons', - 'test/activex_test_control/activex_test_control.scons', - 'test/automated_ui_tests/automated_ui_tests.scons', - 'test/automation/automation.scons', - 'test/interactive_ui/interactive_ui_tests.scons', - 'test/memory_test/memory_test.scons', - 'test/mini_installer_test/mini_installer_test.scons', - 'test/page_cycler/page_cycler_tests.scons', - 'test/plugin/plugin_tests.scons', - 'test/reliability/reliability_tests.scons', - 'test/security_tests/security_tests.scons', - 'test/selenium/selenium_tests.scons', - 'test/startup/startup_tests.scons', - 'test/tab_switching/tab_switching_test.scons', - 'test/ui/ui_tests.scons', - 'tools/convert_dict/convert_dict.scons', - 'tools/crash_service/crash_service.scons', - 'tools/profiles/generate_profile.scons', - ] - sconscript_files = list(set(sconscript_files) - set(remove_files)) - SConscript(sconscript_files, exports=['env']) diff --git a/chrome/chrome_sln.scons b/chrome/chrome_sln.scons new file mode 100644 index 0000000..b95d6cd --- /dev/null +++ b/chrome/chrome_sln.scons @@ -0,0 +1,544 @@ +# 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. + +__doc__ = """ +Configuration for building base.sln. +""" + +Import('env') + +env = env.Clone() + +env.Tool('MSVSNew') + +# TODO(sgk): migrate these MSVSProject() definitions to other +# .scons files as we continue to rename SConscript files. +env.ChromeMSVSProject('$GEARS_DIR/gears.vcproj', + guid='{D703D7A0-EDC1-4FE6-9E22-56154155B24E}') + +env.ChromeMSVSProject('../tools/memory_watcher/memory_watcher.vcproj', + dependencies = [ + '$BASE_DIR/build/base.vcproj', + '$ICU38_DIR/build/icu.vcproj', + ], + guid='{3BD81303-4E14-4559-AA69-B30C3BAB08DD}') + +# Not until/unless we want to support C# projects. +#env.ChromeMSVSProject('$CHROME_SRC_DIR/tools/stats_viewer/stats_viewer.csproj', +# guid='{41735CD9-3E35-47F7-9FD1-4A9950B6B131}') + +env.ChromeMSVSProject('$CHROME_DIR/app/generated_resources.vcproj', + guid='{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}') + +env.ChromeMSVSProject('$CHROME_DIR/app/theme/theme_dll.vcproj', + guid='{FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D}') + +env.ChromeMSVSProject('$CHROME_DIR/browser/resources/browser_resources.vcproj', + guid='{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}') + +env.ChromeMSVSProject('$CHROME_DIR/installer/gcapi/gcapi_dll.vcproj', + guid='{B802A2FE-E4E2-4F5A-905A-D5128875C954}') + +env.ChromeMSVSProject('$CHROME_DIR/installer/gcapi/gcapi_lib.vcproj', + guid='{CD2FD73A-6AAB-4886-B887-760D18E8B635}') + +env.ChromeMSVSProject('$CHROME_DIR/installer/gcapi/gcapi_test.vcproj', + dependencies = [ + '$CHROME_DIR/installer/gcapi/gcapi_dll.vcproj', + '$CHROME_DIR/installer/gcapi/gcapi_lib.vcproj', + ], + guid='{B64B396B-8EF1-4B6B-A07E-48D40EB961AB}') + +env.ChromeMSVSProject('$CHROME_DIR/installer/util/installer_unittests.vcproj', + dependencies = [ + '$BASE_DIR/build/base.vcproj', + '$CHROME_DIR/common/common.vcproj', + '$ICU38_DIR/build/icu.vcproj', + '$TESTING_DIR/gtest.vcproj', + '$CHROME_DIR/installer/util/util.vcproj', + ], + guid='{903F8C1E-537A-4C9E-97BE-075147CBE769}') + +env.ChromeMSVSProject('$CHROME_DIR/installer/util/prebuild/util_prebuild.vcproj', + guid='{0026A376-C4F1-4575-A1BA-578C69F07013}') + + +env.ChromeMSVSFolder('terms', + items = [ + # No $CHROME_DIR prefix because these go straight into + # the .sln file without substitution. + 'app/resources/terms/terms_ar.html', + 'app/resources/terms/terms_bg.html', + 'app/resources/terms/terms_bn.html', + 'app/resources/terms/terms_ca.html', + 'app/resources/terms/terms_chromium.html', + 'app/resources/terms/terms_cs.html', + 'app/resources/terms/terms_da.html', + 'app/resources/terms/terms_de.html', + 'app/resources/terms/terms_el.html', + 'app/resources/terms/terms_en-GB.html', + 'app/resources/terms/terms_en.html', + 'app/resources/terms/terms_es-419.html', + 'app/resources/terms/terms_es.html', + 'app/resources/terms/terms_et.html', + 'app/resources/terms/terms_fi.html', + 'app/resources/terms/terms_fil.html', + 'app/resources/terms/terms_fr.html', + 'app/resources/terms/terms_gu.html', + 'app/resources/terms/terms_he.html', + 'app/resources/terms/terms_hi.html', + 'app/resources/terms/terms_hr.html', + 'app/resources/terms/terms_hu.html', + 'app/resources/terms/terms_id.html', + 'app/resources/terms/terms_it.html', + 'app/resources/terms/terms_ja.html', + 'app/resources/terms/terms_kn.html', + 'app/resources/terms/terms_ko.html', + 'app/resources/terms/terms_lt.html', + 'app/resources/terms/terms_lv.html', + 'app/resources/terms/terms_ml.html', + 'app/resources/terms/terms_mr.html', + 'app/resources/terms/terms_nb.html', + 'app/resources/terms/terms_nl.html', + 'app/resources/terms/terms_or.html', + 'app/resources/terms/terms_pl.html', + 'app/resources/terms/terms_pt-BR.html', + 'app/resources/terms/terms_pt-PT.html', + 'app/resources/terms/terms_ro.html', + 'app/resources/terms/terms_ru.html', + 'app/resources/terms/terms_sk.html', + 'app/resources/terms/terms_sl.html', + 'app/resources/terms/terms_sr.html', + 'app/resources/terms/terms_sv.html', + 'app/resources/terms/terms_ta.html', + 'app/resources/terms/terms_te.html', + 'app/resources/terms/terms_th.html', + 'app/resources/terms/terms_tr.html', + 'app/resources/terms/terms_uk.html', + 'app/resources/terms/terms_vi.html', + 'app/resources/terms/terms_zh-CN.html', + 'app/resources/terms/terms_zh-TW.html', + ], + guid='{D13F055D-4428-48F4-ABF6-18359C76EDB0}') + +env.ChromeMSVSFolder('locales', + entries = [ + env.ChromeMSVSFolder('terms'), + + '$CHROME_DIR/app/locales/ar.vcproj', + '$CHROME_DIR/app/locales/bg.vcproj', + '$CHROME_DIR/app/locales/bn.vcproj', + '$CHROME_DIR/app/locales/ca.vcproj', + '$CHROME_DIR/app/locales/cs.vcproj', + '$CHROME_DIR/app/locales/da.vcproj', + '$CHROME_DIR/app/locales/de.vcproj', + '$CHROME_DIR/app/locales/el.vcproj', + '$CHROME_DIR/app/locales/en-GB.vcproj', + '$CHROME_DIR/app/locales/en-US.vcproj', + '$CHROME_DIR/app/locales/es.vcproj', + '$CHROME_DIR/app/locales/es-419.vcproj', + '$CHROME_DIR/app/locales/et.vcproj', + '$CHROME_DIR/app/locales/fi.vcproj', + '$CHROME_DIR/app/locales/fil.vcproj', + '$CHROME_DIR/app/locales/fr.vcproj', + '$CHROME_DIR/app/locales/gu.vcproj', + '$CHROME_DIR/app/locales/he.vcproj', + '$CHROME_DIR/app/locales/hi.vcproj', + '$CHROME_DIR/app/locales/hr.vcproj', + '$CHROME_DIR/app/locales/hu.vcproj', + '$CHROME_DIR/app/locales/id.vcproj', + '$CHROME_DIR/app/locales/it.vcproj', + '$CHROME_DIR/app/locales/ja.vcproj', + '$CHROME_DIR/app/locales/kn.vcproj', + '$CHROME_DIR/app/locales/ko.vcproj', + '$CHROME_DIR/app/locales/lt.vcproj', + '$CHROME_DIR/app/locales/lv.vcproj', + '$CHROME_DIR/app/locales/ml.vcproj', + '$CHROME_DIR/app/locales/mr.vcproj', + '$CHROME_DIR/app/locales/nb.vcproj', + '$CHROME_DIR/app/locales/nl.vcproj', + '$CHROME_DIR/app/locales/or.vcproj', + '$CHROME_DIR/app/locales/pl.vcproj', + '$CHROME_DIR/app/locales/pt-BR.vcproj', + '$CHROME_DIR/app/locales/pt-PT.vcproj', + '$CHROME_DIR/app/locales/ro.vcproj', + '$CHROME_DIR/app/locales/ru.vcproj', + '$CHROME_DIR/app/locales/sk.vcproj', + '$CHROME_DIR/app/locales/sl.vcproj', + '$CHROME_DIR/app/locales/sr.vcproj', + '$CHROME_DIR/app/locales/sv.vcproj', + '$CHROME_DIR/app/locales/ta.vcproj', + '$CHROME_DIR/app/locales/te.vcproj', + '$CHROME_DIR/app/locales/th.vcproj', + '$CHROME_DIR/app/locales/tr.vcproj', + '$CHROME_DIR/app/locales/uk.vcproj', + '$CHROME_DIR/app/locales/vi.vcproj', + '$CHROME_DIR/app/locales/zh-CN.vcproj', + '$CHROME_DIR/app/locales/zh-TW.vcproj', + ], + items = [ + # No $CHROME_DIR because this goes straight into + # the .sln file with no substitution. + 'app/locales/locale_settings.h', + ], + guid='{2325D8C4-8EF5-42AC-8900-492225750DE4}') + +env.ChromeMSVSFolder('App', + entries = [ + env.ChromeMSVSFolder('locales'), + '$CHROME_DIR/app/chrome_dll.vcproj', + '$CHROME_DIR/app/chrome_exe.vcproj', + '$CHROME_DIR/app/generated_resources.vcproj', + '$CHROME_DIR/app/theme/theme_dll.vcproj', + ], + guid='{B6867423-23BD-4588-9321-2D500F128A3D}') + +env.ChromeMSVSFolder('Browser', + entries = [ + '$CHROME_DIR/browser/browser.vcproj', + '$CHROME_DIR/browser/resources/browser_resources.vcproj', + '$CHROME_DIR/browser/views/browser_views.vcproj', + '$CHROME_DIR/common/common.vcproj', + '$CHROME_DIR/browser/debugger/debugger.vcproj', + '$GEARS_DIR/gears.vcproj', + '$CHROME_DIR/plugin/plugin.vcproj', + '$CHROME_DIR/renderer/renderer.vcproj', + '$RLZ_DIR/rlz.vcproj', + '$CHROME_DIR/views/views.vcproj', + ], + guid='{97555540-8163-4D0F-BCAC-EFA0FFED3453}') + +env.ChromeMSVSFolder('Installer', + entries = [ + '$CHROME_DIR/installer/gcapi/gcapi_dll.vcproj', + '$CHROME_DIR/installer/gcapi/gcapi_lib.vcproj', + '$CHROME_DIR/installer/mini_installer/mini_installer.vcproj', + '$GOOGLE_UPDATE_DIR/ondemand_updates.vcproj', + '$CHROME_DIR/installer/setup/setup.vcproj', + '$CHROME_DIR/installer/util/util.vcproj', + '$CHROME_DIR/installer/util/prebuild/util_prebuild.vcproj', + ], + guid='{EB684A4B-98F7-4E68-8EA7-EA74ACF7060B}') + +env.ChromeMSVSFolder('Breakpad', + entries = [ + '$BREAKPAD_DIR/breakpad_handler.vcproj', + '$BREAKPAD_DIR/breakpad_sender.vcproj', + ], + guid='{873D095E-150E-4262-8C41-2D8ED02F0F57}') + +env.ChromeMSVSFolder('icu', + entries = [ + '$ICU38_DIR/build/icu.vcproj', + '$ICU38_DIR/build/icudt.vcproj', + ], + guid='{1AFC1EC3-24FA-4260-B099-76319EC9977A}') + +env.ChromeMSVSFolder('chrome libxml projects', + name='libxml projects', + entries = [ + '$LIBXML_DIR/build/libxml_config.vcproj', + '$LIBXML_DIR/build/libxml.vcproj', + ], + guid='{032541FB-1E7C-4423-B657-4A71FE180C8A}') + +env.ChromeMSVSFolder('chrome libxslt projects', + name='libxslt projects', + entries = [ + '$LIBXSLT_DIR/build/libxslt_config.vcproj', + '$LIBXSLT_DIR/build/libxslt.vcproj', + ], + guid='{BC732CFC-DE0A-4CF5-B8AA-3269C2F6D399}') + +env.ChromeMSVSFolder('Libraries', + entries = [ + env.ChromeMSVSFolder('Breakpad'), + env.ChromeMSVSFolder('icu'), + env.ChromeMSVSFolder('chrome libxml projects'), + env.ChromeMSVSFolder('chrome libxslt projects'), + '$BASE_DIR/build/base.vcproj', + '$BASE_DIR/build/base_gfx.vcproj', + '$BSPATCH_DIR/bspatch.vcproj', + '$BZIP2_DIR/bzip2.vcproj', + '$BASE_DIR/build/debug_message.vcproj', + '$GOOGLEURL_DIR/build/googleurl.vcproj', + '$CHROME_DIR/third_party/hunspell/hunspell.vcproj', + '$LIBJPEG_DIR/libjpeg.vcproj', + '$LIBPNG_DIR/libpng.vcproj', + '$LZMA_SDK_DIR/7z_C.vcproj', + '$MEDIA_DIR/build/media.vcproj', + '../tools/memory_watcher/memory_watcher.vcproj', + '$MODP_B64_DIR/modp_b64.vcproj', + '$NET_DIR/build/net.vcproj', + '$SANDBOX_DIR/src/sandbox.vcproj', + '$SDCH_DIR/sdch.vcproj', + '$SKIA_DIR/skia.vcproj', + '$SQLITE_DIR/sqlite.vcproj', + '$ZLIB_DIR/zlib.vcproj', + ], + guid='{EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}') + +env.ChromeMSVSFolder('V8', + entries = [ + '$V8_DIR/tools/visual_studio/v8.vcproj', + '$V8_DIR/tools/visual_studio/v8_base.vcproj', + '$V8_DIR/tools/visual_studio/v8_mksnapshot.vcproj', + '$V8_DIR/tools/visual_studio/v8_shell_sample.vcproj', + '$V8_DIR/tools/visual_studio/v8_snapshot.vcproj', + ], + guid='{B353A6A5-9551-4B76-908E-0F0A9B31E4CE}') + +env.ChromeMSVSFolder('Test', + entries = [ + '$CHROME_DIR/test/activex_test_control/activex_test_control.vcproj', + '$CHROME_DIR/test/automated_ui_tests/automated_ui_tests.vcproj', + '$CHROME_DIR/test/automation/automation.vcproj', + '$BASE_DIR/build/base_unittests.vcproj', + '$CHROME_DIR/installer/gcapi/gcapi_test.vcproj', + '$TESTING_DIR/gtest.vcproj', + '$CHROME_DIR/tools/test/image_diff/image_diff.vcproj', + '$CHROME_DIR/installer/util/installer_unittests.vcproj', + '$CHROME_DIR/test/interactive_ui/interactive_ui.vcproj', + '$CHROME_DIR/common/ipc_tests.vcproj', + '$MEDIA_DIR/build/media_unittests.vcproj', + '$CHROME_DIR/test/memory_test/memory_test.vcproj', + '$CHROME_DIR/test/mini_installer_test/mini_installer_test.vcproj', + '$NET_DIR/build/net_perftests.vcproj', + '$NET_DIR/build/net_unittests.vcproj', + '$WEBKIT_DIR/tools/npapi_layout_test_plugin/npapi_layout_test_plugin.vcproj', + '$WEBKIT_DIR/glue/plugins/test/npapi_test_plugin.vcproj', + '$CHROME_DIR/test/page_cycler/page_cycler_tests.vcproj', + '$CHROME_DIR/test/perf/perftests.vcproj', + '$CHROME_DIR/test/plugin/plugin_tests.vcproj', + '$CHROME_DIR/test/reliability/reliability_tests.vcproj', + '$CHROME_DIR/test/security_tests/security_tests.vcproj', + '$CHROME_DIR/test/selenium/selenium_tests.vcproj', + '$CHROME_DIR/test/startup/startup_tests.vcproj', + '$CHROME_DIR/test/tab_switching/tab_switching.vcproj', + '$CHROME_DIR/test/chrome_plugin/test_chrome_plugin.vcproj', + '$WEBKIT_DIR/tools/test_shell/test_shell.vcproj', + '$WEBKIT_DIR/tools/test_shell/test_shell_tests.vcproj', + '$CHROME_DIR/test/ui/ui_tests.vcproj', + '$CHROME_DIR/test/unit/unittests.vcproj', + ], + guid='{1174D37F-6ABB-45DA-81B3-C631281273B7}') + +env.ChromeMSVSFolder('Tools', + entries = [ + '$BSDIFF_DIR/bsdiff.vcproj', + '$CHROME_DIR/tools/convert_dict/convert_dict.vcproj', + '$CHROME_DIR/tools/crash_service/crash_service.vcproj', + '$CHROME_DIR/tools/perf/flush_cache/flush_cache.vcproj', + '$CHROME_DIR/tools/profiles/generate_profile.vcproj', + # Not until we actually want to support C# projects. + #'$CHROME_SRC_DIR/tools/stats_viewer/stats_viewer.csproj', + '$NET_DIR/build/tld_cleanup.vcproj', + ], + guid='{846901FD-A619-4BD5-A303-38174730CDD6}') + +env.ChromeMSVSFolder('WebKit (readonly)', + entries = [ + '$WEBKIT_DIR/build/WebCore/WebCore.vcproj', + '$WEBKIT_DIR/build/JSConfig/V8Config.vcproj', + '$WEBKIT_DIR/build/JavaScriptCore/JavaScriptCore_pcre.vcproj', + '$WEBKIT_DIR/build/JavaScriptCore/WTF.vcproj', + + ], + guid='{1088577A-0C49-4DE0-85CD-B68AD0BE55AA}') + +env.ChromeMSVSFolder('WebKit (ours)', + entries = [ + '$WEBKIT_DIR/build/V8Bindings/V8Bindings_prebuild.vcproj', + '$WEBKIT_DIR/activex_shim_dll/activex_shim_dll.vcproj', + '$WEBKIT_DIR/build/port/port.vcproj', + '$WEBKIT_DIR/default_plugin/default_plugin.vcproj', + '$WEBKIT_DIR/build/localized_strings/localized_strings.vcproj', + '$WEBKIT_DIR/build/V8Bindings/V8Bindings.vcproj', + '$WEBKIT_DIR/build/glue/glue.vcproj', + '$WEBKIT_DIR/activex_shim/activex_shim.vcproj', + ], + guid='{CB43561E-A6F8-49E2-96A2-3F2BA1FFF21E}') + + +solution = env.ChromeMSVSSolution('chrome.sln', + entries = [ + env.ChromeMSVSFolder('App'), + env.ChromeMSVSFolder('Browser'), + '$CHROME_DIR/browser/browser.vcproj', + '$CHROME_DIR/renderer/renderer.vcproj', + '$CHROME_DIR/common/ipc_tests.vcproj', + '$CHROME_DIR/common/common.vcproj', + env.ChromeMSVSFolder('WebKit (readonly)'), + '$WEBKIT_DIR/build/WebCore/WebCore.vcproj', + '$WEBKIT_DIR/build/port/port.vcproj', + '$WEBKIT_DIR/build/glue/glue.vcproj', + '$SKIA_DIR/skia.vcproj', + '$WEBKIT_DIR/build/JavaScriptCore/WTF.vcproj', + '$CHROME_DIR/views/views.vcproj', + '$SQLITE_DIR/sqlite.vcproj', + env.ChromeMSVSFolder('Libraries'), + env.ChromeMSVSFolder('WebKit (ours)'), + '$CHROME_DIR/test/automation/automation.vcproj', + '$ICU38_DIR/build/icu.vcproj', + '$ICU38_DIR/build/icudt.vcproj', + env.ChromeMSVSFolder('icu'), + '$LIBPNG_DIR/libpng.vcproj', + '$ZLIB_DIR/zlib.vcproj', + '$LIBJPEG_DIR/libjpeg.vcproj', + '$CHROME_DIR/tools/test/image_diff/image_diff.vcproj', + env.ChromeMSVSFolder('Breakpad'), + '$BREAKPAD_DIR/breakpad_handler.vcproj', + '$BREAKPAD_DIR/breakpad_sender.vcproj', + '$LIBXML_DIR/build/libxml.vcproj', + '$CHROME_DIR/third_party/hunspell/hunspell.vcproj', + '$LIBXSLT_DIR/build/libxslt.vcproj', + '$LZMA_SDK_DIR/7z_C.vcproj', + '$CHROME_DIR/app/generated_resources.vcproj', + '$WEBKIT_DIR/build/V8Bindings/V8Bindings.vcproj', + '$CHROME_DIR/app/chrome_dll.vcproj', + '$BZIP2_DIR/bzip2.vcproj', + '$WEBKIT_DIR/tools/npapi_layout_test_plugin/npapi_layout_test_plugin.vcproj', + '$WEBKIT_DIR/tools/test_shell/test_shell.vcproj', + '$CHROME_DIR/plugin/plugin.vcproj', + env.ChromeMSVSFolder('V8'), + '$CHROME_DIR/app/chrome_exe.vcproj', + '$CHROME_DIR/test/perf/perftests.vcproj', + '$CHROME_DIR/test/unit/unittests.vcproj', + env.ChromeMSVSFolder('Test'), + '$CHROME_DIR/test/page_cycler/page_cycler_tests.vcproj', + '$CHROME_DIR/test/reliability/reliability_tests.vcproj', + '$CHROME_DIR/test/selenium/selenium_tests.vcproj', + '$CHROME_DIR/test/startup/startup_tests.vcproj', + '$CHROME_DIR/test/ui/ui_tests.vcproj', + '$SANDBOX_DIR/src/sandbox.vcproj', + env.ChromeMSVSFolder('Tools'), + '$CHROME_DIR/tools/profiles/generate_profile.vcproj', + '$WEBKIT_DIR/tools/test_shell/test_shell_tests.vcproj', + '$WEBKIT_DIR/build/JSConfig/V8Config.vcproj', + # Not until we actually want to support C# projects. + #'$CHROME_SRC_DIR/tools/stats_viewer/stats_viewer.csproj', + '$CHROME_DIR/app/locales/en-US.vcproj', + env.ChromeMSVSFolder('locales'), + '$CHROME_DIR/browser/resources/browser_resources.vcproj', + '$WEBKIT_DIR/build/localized_strings/localized_strings.vcproj', + '$CHROME_DIR/app/theme/theme_dll.vcproj', + '$CHROME_DIR/test/security_tests/security_tests.vcproj', + '$GOOGLEURL_DIR/build/googleurl.vcproj', + '$WEBKIT_DIR/glue/plugins/test/npapi_test_plugin.vcproj', + '$CHROME_DIR/tools/perf/flush_cache/flush_cache.vcproj', + '$MODP_B64_DIR/modp_b64.vcproj', + '$WEBKIT_DIR/activex_shim/activex_shim.vcproj', + '$NET_DIR/build/net.vcproj', + '$NET_DIR/build/tld_cleanup.vcproj', + '$NET_DIR/build/net_unittests.vcproj', + '$NET_DIR/build/net_perftests.vcproj', + '$MEDIA_DIR/build/media.vcproj', + '$MEDIA_DIR/build/media_unittests.vcproj', + '$BASE_DIR/build/base.vcproj', + '$BASE_DIR/build/base_gfx.vcproj', + '$BASE_DIR/build/debug_message.vcproj', + '$BASE_DIR/build/base_unittests.vcproj', + '$CHROME_DIR/test/plugin/plugin_tests.vcproj', + '$CHROME_DIR/test/interactive_ui/interactive_ui.vcproj', + env.ChromeMSVSFolder('Installer'), + '$CHROME_DIR/installer/setup/setup.vcproj', + '$CHROME_DIR/installer/util/util.vcproj', + '$CHROME_DIR/installer/mini_installer/mini_installer.vcproj', + '$BSDIFF_DIR/bsdiff.vcproj', + '$BSPATCH_DIR/bspatch.vcproj', + '$CHROME_DIR/installer/util/installer_unittests.vcproj', + '$WEBKIT_DIR/activex_shim_dll/activex_shim_dll.vcproj', + '$CHROME_DIR/app/locales/da.vcproj', + '$CHROME_DIR/test/activex_test_control/activex_test_control.vcproj', + env.ChromeMSVSFolder('chrome libxml projects'), + '$LIBXML_DIR/build/libxml_config.vcproj', + env.ChromeMSVSFolder('chrome libxslt projects'), + '$LIBXSLT_DIR/build/libxslt_config.vcproj', + '$WEBKIT_DIR/default_plugin/default_plugin.vcproj', + '$CHROME_DIR/app/locales/zh-TW.vcproj', + '$CHROME_DIR/app/locales/he.vcproj', + '$CHROME_DIR/test/chrome_plugin/test_chrome_plugin.vcproj', + '$CHROME_DIR/test/automated_ui_tests/automated_ui_tests.vcproj', + '$CHROME_DIR/test/mini_installer_test/mini_installer_test.vcproj', + '$WEBKIT_DIR/build/JavaScriptCore/JavaScriptCore_pcre.vcproj', + '$WEBKIT_DIR/build/V8Bindings/V8Bindings_prebuild.vcproj', + '$GEARS_DIR/gears.vcproj', + '$GOOGLE_UPDATE_DIR/ondemand_updates.vcproj', + env.ChromeMSVSFolder('terms'), + '$CHROME_DIR/app/locales/ar.vcproj', + '$CHROME_DIR/app/locales/bg.vcproj', + '$CHROME_DIR/app/locales/ca.vcproj', + '$CHROME_DIR/app/locales/cs.vcproj', + '$CHROME_DIR/app/locales/de.vcproj', + '$CHROME_DIR/app/locales/el.vcproj', + '$CHROME_DIR/app/locales/en-GB.vcproj', + '$CHROME_DIR/app/locales/es.vcproj', + '$CHROME_DIR/app/locales/et.vcproj', + '$CHROME_DIR/app/locales/fi.vcproj', + '$CHROME_DIR/app/locales/fil.vcproj', + '$CHROME_DIR/app/locales/fr.vcproj', + '$CHROME_DIR/app/locales/hi.vcproj', + '$CHROME_DIR/app/locales/hr.vcproj', + '$CHROME_DIR/app/locales/hu.vcproj', + '$CHROME_DIR/app/locales/id.vcproj', + '$CHROME_DIR/app/locales/it.vcproj', + '$CHROME_DIR/app/locales/ja.vcproj', + '$CHROME_DIR/app/locales/ko.vcproj', + '$CHROME_DIR/app/locales/lt.vcproj', + '$CHROME_DIR/app/locales/lv.vcproj', + '$CHROME_DIR/app/locales/nl.vcproj', + '$CHROME_DIR/app/locales/nb.vcproj', + '$CHROME_DIR/app/locales/pl.vcproj', + '$CHROME_DIR/app/locales/pt-BR.vcproj', + '$CHROME_DIR/app/locales/pt-PT.vcproj', + '$CHROME_DIR/app/locales/ro.vcproj', + '$CHROME_DIR/app/locales/ru.vcproj', + '$CHROME_DIR/app/locales/sk.vcproj', + '$CHROME_DIR/app/locales/sl.vcproj', + '$CHROME_DIR/app/locales/sr.vcproj', + '$CHROME_DIR/app/locales/th.vcproj', + '$CHROME_DIR/app/locales/sv.vcproj', + '$CHROME_DIR/app/locales/tr.vcproj', + '$CHROME_DIR/app/locales/uk.vcproj', + '$CHROME_DIR/app/locales/vi.vcproj', + '$CHROME_DIR/app/locales/zh-CN.vcproj', + '$CHROME_DIR/tools/crash_service/crash_service.vcproj', + '../tools/memory_watcher/memory_watcher.vcproj', + '$RLZ_DIR/rlz.vcproj', + '$CHROME_DIR/app/locales/es-419.vcproj', + '$CHROME_DIR/test/tab_switching/tab_switching.vcproj', + '$CHROME_DIR/installer/util/prebuild/util_prebuild.vcproj', + '$CHROME_DIR/tools/convert_dict/convert_dict.vcproj', + '$TESTING_DIR/gtest.vcproj', + '$CHROME_DIR/browser/debugger/debugger.vcproj', + '$CHROME_DIR/test/memory_test/memory_test.vcproj', + '$V8_DIR/tools/visual_studio/v8_base.vcproj', + '$V8_DIR/tools/visual_studio/v8.vcproj', + '$V8_DIR/tools/visual_studio/v8_mksnapshot.vcproj', + '$V8_DIR/tools/visual_studio/v8_snapshot.vcproj', + '$CHROME_DIR/browser/views/browser_views.vcproj', + '$V8_DIR/tools/visual_studio/v8_shell_sample.vcproj', + '$SDCH_DIR/sdch.vcproj', + '$CHROME_DIR/app/locales/kn.vcproj', + '$CHROME_DIR/app/locales/bn.vcproj', + '$CHROME_DIR/app/locales/gu.vcproj', + '$CHROME_DIR/app/locales/ml.vcproj', + '$CHROME_DIR/app/locales/mr.vcproj', + '$CHROME_DIR/app/locales/or.vcproj', + '$CHROME_DIR/app/locales/ta.vcproj', + '$CHROME_DIR/app/locales/te.vcproj', + '$CHROME_DIR/installer/gcapi/gcapi_lib.vcproj', + '$CHROME_DIR/installer/gcapi/gcapi_dll.vcproj', + '$CHROME_DIR/installer/gcapi/gcapi_test.vcproj', + ], + variants = [ + 'Debug|Win32', + 'Release|Win32', + ]) + +env.AlwaysBuild(solution) + +i = env.Command('$CHROME_SRC_DIR/chrome/chrome.sln', solution, + Copy('$TARGET', '$SOURCE')) +Alias('solutions', i) diff --git a/chrome/common/common.scons b/chrome/common/common.scons index 5b82155..4ef1cef 100644 --- a/chrome/common/common.scons +++ b/chrome/common/common.scons @@ -132,3 +132,10 @@ if env.Bit('posix'): if not env.Bit('mac'): # TODO(port): This should be enabled for all platforms. env.ChromeStaticLibrary('common', input_files) + +env.ChromeMSVSProject('$CHROME_DIR/common/common.vcproj', + dependencies = [ + '$LIBXML_DIR/build/libxml_config.vcproj', + '$CHROME_DIR/app/generated_resources.vcproj', + ], + guid='{899F1280-3441-4D1F-BA04-CCD6208D9146}') diff --git a/chrome/common/ipc_tests.scons b/chrome/common/ipc_tests.scons index 27d8f8e..5b64fd3 100644 --- a/chrome/common/ipc_tests.scons +++ b/chrome/common/ipc_tests.scons @@ -84,3 +84,12 @@ input_files = [ ipc_tests = env.ChromeTestProgram('ipc_tests', input_files) i = env.Install('$TARGET_ROOT', ipc_tests) Alias('chrome', i) + +env.ChromeMSVSProject('$CHROME_DIR/common/ipc_tests.vcproj', + dependencies = [ + '$BASE_DIR/build/base.vcproj', + '$CHROME_DIR/common/common.vcproj', + '$ICU38_DIR/build/icu.vcproj', + '$TESTING_DIR/gtest.vcproj', + ], + guid='{B92AE829-E1CD-4781-824A-DCB1603A1672}') diff --git a/chrome/installer/mini_installer/installer_unittests.scons b/chrome/installer/mini_installer/installer_unittests.scons index 9dd31f2..288cda2 100644 --- a/chrome/installer/mini_installer/installer_unittests.scons +++ b/chrome/installer/mini_installer/installer_unittests.scons @@ -65,4 +65,6 @@ input_files = [ '../util/work_item_list_unittest.cc', ] -env.ChromeTestProgram('installer_unittests', input_files) +# TODO(port): +if env.Bit('windows'): + env.ChromeTestProgram('installer_unittests', input_files) diff --git a/chrome/installer/mini_installer/mini_installer.scons b/chrome/installer/mini_installer/mini_installer.scons index 89c0d62..0fefbe1 100644 --- a/chrome/installer/mini_installer/mini_installer.scons +++ b/chrome/installer/mini_installer/mini_installer.scons @@ -87,28 +87,97 @@ if env.Bit('windows'): ]) input_files.extend(resources) -env.ChromeProgram('mini_installer', input_files) +# TODO(port): +if env.Bit('windows'): + env.ChromeProgram('mini_installer', input_files) env.AppendENVPath('PATH', r'C:\WINDOWS\system32') -packed = env.Command('$DESTINATION_ROOT/packed_files.txt', - ['$CHROME_DIR/tools/build/win/create_installer_archive.py', - '$CHROME_DIR/installer/mini_installer/chrome.release'], - ('$PYTHON ${SOURCES[0]}' - ' --output_dir=${TARGET.dir}' - ' --input_file=${SOURCES[1]}')) -env.Depends(packed, '$DESTINATION_ROOT/setup.exe') - -# mini_installer.rc depends on the generated packed_files.txt -# TODO(sgk): implicit dependency should be picked up automatically -env.Depends(resources, packed) - +# TODO(port): +if env.Bit('windows'): + packed = env.Command('$DESTINATION_ROOT/packed_files.txt', + ['$CHROME_DIR/tools/build/win/create_installer_archive.py', + '$CHROME_DIR/installer/mini_installer/chrome.release'], + ('$PYTHON ${SOURCES[0]}' + ' --output_dir=${TARGET.dir}' + ' --input_file=${SOURCES[1]}')) + env.Depends(packed, '$DESTINATION_ROOT/setup.exe') + + # mini_installer.rc depends on the generated packed_files.txt + # TODO(sgk): implicit dependency should be picked up automatically + env.Depends(resources, packed) -exe_version_rc = env.ChromeVersionRC('mini_installer_exe_version.rc', - 'mini_installer_exe_version.rc.version', - PWD=Dir('.')) +# TODO(port): if env.Bit('windows'): + exe_version_rc = env.ChromeVersionRC('mini_installer_exe_version.rc', + 'mini_installer_exe_version.rc.version', + PWD=Dir('.')) + # TODO(sgk): implicit dependency should be picked up automatically env_res.Depends(resources, exe_version_rc) + +env.ChromeMSVSProject('$CHROME_DIR/installer/mini_installer/mini_installer.vcproj', + dependencies = [ + '$CHROME_DIR/app/locales/et.vcproj', + '$CHROME_DIR/app/locales/pt-PT.vcproj', + '$CHROME_DIR/app/locales/fr.vcproj', + '$CHROME_DIR/app/locales/uk.vcproj', + '$CHROME_DIR/installer/setup/setup.vcproj', + '$CHROME_DIR/app/locales/th.vcproj', + '$CHROME_DIR/app/locales/hi.vcproj', + '$CHROME_DIR/app/locales/gu.vcproj', + '$CHROME_DIR/app/locales/it.vcproj', + '$CHROME_DIR/app/locales/pt-BR.vcproj', + '$CHROME_DIR/app/locales/sr.vcproj', + '$CHROME_DIR/app/locales/ko.vcproj', + '$CHROME_DIR/app/locales/en-GB.vcproj', + '$CHROME_DIR/app/locales/fil.vcproj', + '$CHROME_DIR/app/locales/ar.vcproj', + '$CHROME_DIR/app/locales/kn.vcproj', + '$CHROME_DIR/app/locales/bn.vcproj', + '$CHROME_DIR/app/locales/es.vcproj', + '$CHROME_DIR/app/locales/bg.vcproj', + '$CHROME_DIR/app/locales/nl.vcproj', + '$CHROME_DIR/app/locales/fi.vcproj', + '$CHROME_DIR/app/locales/tr.vcproj', + '$CHROME_DIR/app/locales/ta.vcproj', + '$CHROME_DIR/app/chrome_exe.vcproj', + '$CHROME_DIR/app/locales/ru.vcproj', + '$CHROME_DIR/app/locales/cs.vcproj', + '$CHROME_DIR/app/locales/lt.vcproj', + '$CHROME_DIR/app/locales/sk.vcproj', + ('$CHROME_DIR/tools/crash_service/' + + 'crash_service.vcproj'), + '$CHROME_DIR/app/locales/te.vcproj', + '$CHROME_DIR/app/locales/pl.vcproj', + '$ICU38_DIR/build/icudt.vcproj', + '$CHROME_DIR/app/locales/he.vcproj', + '$CHROME_DIR/app/locales/mr.vcproj', + '$CHROME_DIR/app/locales/da.vcproj', + '$CHROME_DIR/app/locales/lv.vcproj', + '$CHROME_DIR/app/locales/hu.vcproj', + '$CHROME_DIR/app/locales/sv.vcproj', + '$CHROME_DIR/app/locales/ja.vcproj', + '$CHROME_DIR/app/locales/nb.vcproj', + '$CHROME_DIR/app/locales/de.vcproj', + '$RLZ_DIR/rlz.vcproj', + '$CHROME_DIR/app/chrome_dll.vcproj', + '$CHROME_DIR/app/locales/zh-CN.vcproj', + '$CHROME_DIR/app/locales/sl.vcproj', + '$CHROME_DIR/app/locales/ro.vcproj', + '$CHROME_DIR/app/locales/ml.vcproj', + '$CHROME_DIR/app/locales/en-US.vcproj', + '$CHROME_DIR/app/locales/hr.vcproj', + '$CHROME_DIR/app/locales/el.vcproj', + '$CHROME_DIR/app/locales/vi.vcproj', + '$CHROME_DIR/app/locales/or.vcproj', + '$BSDIFF_DIR/bsdiff.vcproj', + '$CHROME_DIR/app/locales/id.vcproj', + '$CHROME_DIR/app/locales/zh-TW.vcproj', + '$CHROME_DIR/app/locales/ca.vcproj', + '$CHROME_DIR/app/locales/es-419.vcproj', + '$CHROME_DIR/app/theme/theme_dll.vcproj', + ], + guid='{24A5AC7C-280B-4899-9153-6BA570A081E7}') diff --git a/chrome/installer/setup/setup.scons b/chrome/installer/setup/setup.scons index b0ef23b..aa500eb 100644 --- a/chrome/installer/setup/setup.scons +++ b/chrome/installer/setup/setup.scons @@ -81,12 +81,26 @@ input_files = [ 'uninstall.cc', ] -env.ChromeProgram('setup', resources + input_files) - -exe_version_rc = env.ChromeVersionRC('setup_exe_version.rc', +# TODO(port): +if env.Bit('windows'): + env.ChromeProgram('setup', resources + input_files) + +env.ChromeMSVSProject('$CHROME_DIR/installer/setup/setup.vcproj', + dependencies = [ + '$BASE_DIR/build/base.vcproj', + '$CHROME_DIR/common/common.vcproj', + '$ICU38_DIR/build/icu.vcproj', + '$LZMA_SDK_DIR/7z_C.vcproj', + '$BSPATCH_DIR/bspatch.vcproj', + '$CHROME_DIR/installer/util/util.vcproj', + ], + guid='{21C76E6E-8B38-44D6-8148-B589C13B9554}') + +# TODO(port): +if env.Bit('windows'): + exe_version_rc = env.ChromeVersionRC('setup_exe_version.rc', 'setup_exe_version.rc.version', PWD = env.Dir('.')) -if env.Bit('windows'): # TODO(sgk): implicit dependency should be picked up automatically env_res.Depends(resources, exe_version_rc) diff --git a/chrome/installer/util/util.scons b/chrome/installer/util/util.scons index e1e4957..5d43185 100644 --- a/chrome/installer/util/util.scons +++ b/chrome/installer/util/util.scons @@ -50,17 +50,28 @@ input_files = [ 'work_item_list.cc', ] -env.ChromeStaticLibrary('util', input_files) +# TODO(port): +if env.Bit('windows'): + env.ChromeStaticLibrary('util', input_files) +env.ChromeMSVSProject('$CHROME_DIR/installer/util/util.vcproj', + dependencies = [ + ('$CHROME_DIR/installer/util/prebuild/' + + 'util_prebuild.vcproj'), + ], + guid='{EFBB1436-A63F-4CD8-9E99-B89226E782EC}') -# create_string_rc.py imports FP.py from the tools/grit/grit/extern -# directory, so add that to PYTHONPATH for this command execution. -env_x = env.Clone() -env_x.AppendENVPath('PYTHONPATH', - [env_x.Dir('$CHROME_SRC_DIR/tools/grit/grit/extern').abspath]) -env_x.Command(['$CHROME_DIR/installer/util/installer_util_strings.rc', - '$CHROME_DIR/installer/util/installer_util_strings.h'], - ['$CHROME_DIR/installer/util/prebuild/create_string_rc.py', - '$CHROME_DIR/app/generated_resources.grd'] + - env.Glob('$CHROME_DIR/app/resources/*.xtb'), - "$PYTHON ${SOURCES[0]} ${TARGET.dir}") + +# TODO(port): +if env.Bit('windows'): + # create_string_rc.py imports FP.py from the tools/grit/grit/extern + # directory, so add that to PYTHONPATH for this command execution. + env_x = env.Clone() + env_x.AppendENVPath('PYTHONPATH', + [env_x.Dir('$CHROME_SRC_DIR/tools/grit/grit/extern').abspath]) + env_x.Command(['$CHROME_DIR/installer/util/installer_util_strings.rc', + '$CHROME_DIR/installer/util/installer_util_strings.h'], + ['$CHROME_DIR/installer/util/prebuild/create_string_rc.py', + '$CHROME_DIR/app/generated_resources.grd'] + + env.Glob('$CHROME_DIR/app/resources/*.xtb'), + "$PYTHON ${SOURCES[0]} ${TARGET.dir}") diff --git a/chrome/plugin/plugin.scons b/chrome/plugin/plugin.scons index c26768a..3a100652 100644 --- a/chrome/plugin/plugin.scons +++ b/chrome/plugin/plugin.scons @@ -58,3 +58,5 @@ if env.Bit('posix'): env.ChromeStaticLibrary('plugin', input_files) +env.ChromeMSVSProject('$CHROME_DIR/plugin/plugin.vcproj', + guid='{20A560A0-2CD0-4D9E-A58B-1F24B99C087A}') diff --git a/chrome/renderer/renderer.scons b/chrome/renderer/renderer.scons index 279b143..b8eda9f 100644 --- a/chrome/renderer/renderer.scons +++ b/chrome/renderer/renderer.scons @@ -102,3 +102,9 @@ if env.Bit('mac'): # TODO(port): Enable for Mac. if not env.Bit('mac'): env.ChromeStaticLibrary('renderer', input_files) + +env.ChromeMSVSProject('$CHROME_DIR/renderer/renderer.vcproj', + dependencies = [ + '$CHROME_DIR/app/generated_resources.vcproj', + ], + guid='{9301A569-5D2B-4D11-9332-B1E30AEACB8D}') diff --git a/chrome/test/activex_test_control/activex_test_control.scons b/chrome/test/activex_test_control/activex_test_control.scons index a971b48..bfbbbcf 100644 --- a/chrome/test/activex_test_control/activex_test_control.scons +++ b/chrome/test/activex_test_control/activex_test_control.scons @@ -36,7 +36,9 @@ if env.Bit('windows'): ], ) -env.TypeLibrary('activex_test_control.idl') +# TODO(port): +if env.Bit('windows'): + env.TypeLibrary('activex_test_control.idl') input_files = [ 'activex_test_control.cc', @@ -44,4 +46,10 @@ input_files = [ 'chrome_test_control.cc', ] -env.ChromeSharedLibrary('activex_test_control', input_files) +# TODO(port): +if env.Bit('windows'): + env.ChromeSharedLibrary('activex_test_control', input_files) + +env.ChromeMSVSProject(('$CHROME_DIR/test/activex_test_control/' + + 'activex_test_control.vcproj'), + guid='{414D4D24-5D65-498B-A33F-3A29AD3CDEDC}') diff --git a/chrome/test/automated_ui_tests/automated_ui_tests.scons b/chrome/test/automated_ui_tests/automated_ui_tests.scons index a483ab9..269d02a 100644 --- a/chrome/test/automated_ui_tests/automated_ui_tests.scons +++ b/chrome/test/automated_ui_tests/automated_ui_tests.scons @@ -72,4 +72,28 @@ input_files = [ '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX', ] -env.ChromeTestProgram('automated_ui_tests', input_files) +# TODO(port): +if env.Bit('windows'): + env.ChromeTestProgram('automated_ui_tests', input_files) + +env.ChromeMSVSProject('$CHROME_DIR/test/automated_ui_tests/automated_ui_tests.vcproj', + dependencies = [ + '$CHROME_DIR/test/automation/automation.vcproj', + '$BASE_DIR/build/base.vcproj', + '$LIBXML_DIR/build/libxml_config.vcproj', + '$NET_DIR/build/net.vcproj', + '$CHROME_DIR/browser/browser.vcproj', + '$MODP_B64_DIR/modp_b64.vcproj', + '$CHROME_DIR/app/chrome_exe.vcproj', + '$ZLIB_DIR/zlib.vcproj', + '$CHROME_DIR/common/common.vcproj', + '$ICU38_DIR/build/icu.vcproj', + '$BASE_DIR/build/base_gfx.vcproj', + '$TESTING_DIR/gtest.vcproj', + '$LIBPNG_DIR/libpng.vcproj', + '$SKIA_DIR/skia.vcproj', + '$GOOGLEURL_DIR/build/googleurl.vcproj', + '$LIBXML_DIR/build/libxml.vcproj', + '$CHROME_DIR/browser/views/browser_views.vcproj', + ], + guid='{D2250C20-3A94-4FB9-AF73-11BC5B73884B}') diff --git a/chrome/test/automation/automation.scons b/chrome/test/automation/automation.scons index c1ef519..f894f72 100644 --- a/chrome/test/automation/automation.scons +++ b/chrome/test/automation/automation.scons @@ -27,4 +27,9 @@ input_files = [ 'window_proxy.cc', ] -env.ChromeStaticLibrary('automation', input_files) +# TODO(port): +if env.Bit('windows'): + env.ChromeStaticLibrary('automation', input_files) + +env.ChromeMSVSProject('$CHROME_DIR/test/automation/automation.vcproj', + guid='{1556EF78-C7E6-43C8-951F-F6B43AC0DD12}') diff --git a/chrome/test/chrome_plugin/test_chrome_plugin.scons b/chrome/test/chrome_plugin/test_chrome_plugin.scons index e7d3661..ca6ad83 100644 --- a/chrome/test/chrome_plugin/test_chrome_plugin.scons +++ b/chrome/test/chrome_plugin/test_chrome_plugin.scons @@ -51,3 +51,12 @@ if env.Bit('windows'): ]) env.ChromeSharedLibrary('test_chrome_plugin', input_files) + +env.ChromeMSVSProject('$CHROME_DIR/test/chrome_plugin/test_chrome_plugin.vcproj', + dependencies = [ + '$BASE_DIR/build/base.vcproj', + '$ICU38_DIR/build/icu.vcproj', + '$ICU38_DIR/build/icudt.vcproj', + '$GOOGLEURL_DIR/build/googleurl.vcproj', + ], + guid='{7F0A70F6-BE3F-4C19-B435-956AB8F30BA4}') diff --git a/chrome/test/interactive_ui/interactive_ui_tests.scons b/chrome/test/interactive_ui/interactive_ui_tests.scons index fe92cf0..769405d 100644 --- a/chrome/test/interactive_ui/interactive_ui_tests.scons +++ b/chrome/test/interactive_ui/interactive_ui_tests.scons @@ -104,4 +104,55 @@ input_files = [ 'view_event_test_base.cc', ] -env.ChromeTestProgram('interactive_ui_tests', input_files) +# TODO(port): +if env.Bit('windows'): + env.ChromeTestProgram('interactive_ui_tests', input_files) + +env.ChromeMSVSProject('$CHROME_DIR/test/interactive_ui/interactive_ui.vcproj', + name='interactive_ui_tests', + dependencies = [ + '$CHROME_DIR/test/automation/automation.vcproj', + '$BASE_DIR/build/base.vcproj', + '$WEBKIT_DIR/build/WebCore/WebCore.vcproj', + '$CHROME_DIR/plugin/plugin.vcproj', + '$LIBJPEG_DIR/libjpeg.vcproj', + '$BZIP2_DIR/bzip2.vcproj', + '$NET_DIR/build/net.vcproj', + ('$WEBKIT_DIR/build/JavaScriptCore/' + + 'JavaScriptCore_pcre.vcproj'), + '$WEBKIT_DIR/build/port/port.vcproj', + '$CHROME_DIR/browser/debugger/debugger.vcproj', + '$WEBKIT_DIR/default_plugin/default_plugin.vcproj', + '$CHROME_DIR/browser/browser.vcproj', + '$WEBKIT_DIR/build/V8Bindings/V8Bindings.vcproj', + '$SQLITE_DIR/sqlite.vcproj', + '$CHROME_DIR/views/views.vcproj', + '$MODP_B64_DIR/modp_b64.vcproj', + '$CHROME_DIR/app/chrome_exe.vcproj', + ('$CHROME_DIR/test/chrome_plugin/' + + 'test_chrome_plugin.vcproj'), + '$ZLIB_DIR/zlib.vcproj', + '$CHROME_DIR/common/common.vcproj', + '$ICU38_DIR/build/icu.vcproj', + '$CHROME_DIR/renderer/renderer.vcproj', + '$BASE_DIR/build/base_gfx.vcproj', + '$WEBKIT_DIR/build/JavaScriptCore/WTF.vcproj', + ('$CHROME_DIR/browser/resources/' + + 'browser_resources.vcproj'), + '$RLZ_DIR/rlz.vcproj', + '$TESTING_DIR/gtest.vcproj', + '$V8_DIR/tools/visual_studio/v8_snapshot.vcproj', + '$LIBPNG_DIR/libpng.vcproj', + '$WEBKIT_DIR/build/glue/glue.vcproj', + '$CHROME_DIR/app/locales/en-US.vcproj', + '$SKIA_DIR/skia.vcproj', + '$CHROME_DIR/third_party/hunspell/hunspell.vcproj', + '$GOOGLEURL_DIR/build/googleurl.vcproj', + '$CHROME_DIR/installer/util/util.vcproj', + '$WEBKIT_DIR/activex_shim/activex_shim.vcproj', + '$SDCH_DIR/sdch.vcproj', + '$CHROME_DIR/browser/views/browser_views.vcproj', + '$LIBXSLT_DIR/build/libxslt.vcproj', + '$CHROME_DIR/app/theme/theme_dll.vcproj', + ], + guid='{018D4F38-6272-448F-A864-976DA09F05D0}') diff --git a/chrome/test/memory_test/memory_test.scons b/chrome/test/memory_test/memory_test.scons index 84871c9..a7b094c 100644 --- a/chrome/test/memory_test/memory_test.scons +++ b/chrome/test/memory_test/memory_test.scons @@ -62,4 +62,24 @@ input_files = [ 'memory_test.cc', ] -env.ChromeTestProgram('memory_test', input_files) +# TODO(port): +if env.Bit('windows'): + env.ChromeTestProgram('memory_test', input_files) + +env.ChromeMSVSProject('$CHROME_DIR/test/memory_test/memory_test.vcproj', + dependencies = [ + '$CHROME_DIR/test/automation/automation.vcproj', + '$BASE_DIR/build/base.vcproj', + '$NET_DIR/build/net.vcproj', + '$CHROME_DIR/browser/browser.vcproj', + '$MODP_B64_DIR/modp_b64.vcproj', + '$ZLIB_DIR/zlib.vcproj', + '$CHROME_DIR/common/common.vcproj', + '$BASE_DIR/build/base_gfx.vcproj', + '$TESTING_DIR/gtest.vcproj', + '$LIBPNG_DIR/libpng.vcproj', + '$SKIA_DIR/skia.vcproj', + '$GOOGLEURL_DIR/build/googleurl.vcproj', + '$CHROME_DIR/browser/views/browser_views.vcproj', + ], + guid='{A5F831FD-9B9C-4FEF-9FBA-554817B734CE}') diff --git a/chrome/test/mini_installer_test/mini_installer_test.scons b/chrome/test/mini_installer_test/mini_installer_test.scons index 7014079..c54cbdd 100644 --- a/chrome/test/mini_installer_test/mini_installer_test.scons +++ b/chrome/test/mini_installer_test/mini_installer_test.scons @@ -65,4 +65,15 @@ input_files = [ 'test.cc', ] -env.ChromeTestProgram('mini_installer_test', input_files) +# TODO(port): +if env.Bit('windows'): + env.ChromeTestProgram('mini_installer_test', input_files) + +env.ChromeMSVSProject('$CHROME_DIR/test/mini_installer_test/mini_installer_test.vcproj', + dependencies = [ + '$BASE_DIR/build/base.vcproj', + '$ICU38_DIR/build/icu.vcproj', + '$TESTING_DIR/gtest.vcproj', + '$CHROME_DIR/installer/util/util.vcproj', + ], + guid='{4B6E199A-034A-49BD-AB93-458DD37E45B1}') diff --git a/chrome/test/page_cycler/page_cycler_tests.scons b/chrome/test/page_cycler/page_cycler_tests.scons index 46e35fc..f04bba7 100644 --- a/chrome/test/page_cycler/page_cycler_tests.scons +++ b/chrome/test/page_cycler/page_cycler_tests.scons @@ -68,4 +68,26 @@ input_files = [ 'page_cycler_test.cc', ] -env.ChromeTestProgram('page_cycler_tests', input_files) +# TODO(port): +if env.Bit('windows'): + env.ChromeTestProgram('page_cycler_tests', input_files) + +env.ChromeMSVSProject('$CHROME_DIR/test/page_cycler/page_cycler_tests.vcproj', + dependencies = [ + '$CHROME_DIR/test/automation/automation.vcproj', + '$BASE_DIR/build/base.vcproj', + '$NET_DIR/build/net.vcproj', + '$CHROME_DIR/browser/browser.vcproj', + '$MODP_B64_DIR/modp_b64.vcproj', + '$CHROME_DIR/app/chrome_exe.vcproj', + '$ZLIB_DIR/zlib.vcproj', + '$CHROME_DIR/common/common.vcproj', + '$ICU38_DIR/build/icu.vcproj', + '$BASE_DIR/build/base_gfx.vcproj', + '$TESTING_DIR/gtest.vcproj', + '$LIBPNG_DIR/libpng.vcproj', + '$SKIA_DIR/skia.vcproj', + '$GOOGLEURL_DIR/build/googleurl.vcproj', + '$CHROME_DIR/browser/views/browser_views.vcproj', + ], + guid='{C9E0BD1D-B175-4A91-8380-3FDC81FAB9D7}') diff --git a/chrome/test/perf/perftests.scons b/chrome/test/perf/perftests.scons index 97e57d3..2767199 100644 --- a/chrome/test/perf/perftests.scons +++ b/chrome/test/perf/perftests.scons @@ -76,3 +76,42 @@ if env.Bit('mac'): if not env.Bit('mac'): env.ChromeTestProgram('perf_tests', input_files) + +env.ChromeMSVSProject('$CHROME_DIR/test/perf/perftests.vcproj', + name='perf_tests', + dependencies = [ + '$BASE_DIR/build/base.vcproj', + '$WEBKIT_DIR/build/WebCore/WebCore.vcproj', + '$CHROME_DIR/plugin/plugin.vcproj', + '$LIBJPEG_DIR/libjpeg.vcproj', + '$BZIP2_DIR/bzip2.vcproj', + '$NET_DIR/build/net.vcproj', + '$WEBKIT_DIR/build/JavaScriptCore/JavaScriptCore_pcre.vcproj', + '$WEBKIT_DIR/build/port/port.vcproj', + '$CHROME_DIR/browser/debugger/debugger.vcproj', + '$WEBKIT_DIR/default_plugin/default_plugin.vcproj', + '$CHROME_DIR/browser/browser.vcproj', + '$WEBKIT_DIR/build/V8Bindings/V8Bindings.vcproj', + '$SQLITE_DIR/sqlite.vcproj', + '$CHROME_DIR/views/views.vcproj', + '$MODP_B64_DIR/modp_b64.vcproj', + '$ZLIB_DIR/zlib.vcproj', + '$CHROME_DIR/common/common.vcproj', + '$ICU38_DIR/build/icu.vcproj', + '$CHROME_DIR/renderer/renderer.vcproj', + '$BASE_DIR/build/base_gfx.vcproj', + '$WEBKIT_DIR/build/JavaScriptCore/WTF.vcproj', + '$TESTING_DIR/gtest.vcproj', + '$V8_DIR/tools/visual_studio/v8_snapshot.vcproj', + '$LIBPNG_DIR/libpng.vcproj', + '$WEBKIT_DIR/build/glue/glue.vcproj', + '$SKIA_DIR/skia.vcproj', + '$CHROME_DIR/third_party/hunspell/hunspell.vcproj', + '$GOOGLEURL_DIR/build/googleurl.vcproj', + '$CHROME_DIR/installer/util/util.vcproj', + '$WEBKIT_DIR/activex_shim/activex_shim.vcproj', + '$SDCH_DIR/sdch.vcproj', + '$CHROME_DIR/browser/views/browser_views.vcproj', + '$LIBXSLT_DIR/build/libxslt.vcproj', + ], + guid='{9055E088-25C6-47FD-87D5-D9DD9FD75C9F}') diff --git a/chrome/test/plugin/plugin_tests.scons b/chrome/test/plugin/plugin_tests.scons index fb0508b..d748a64 100644 --- a/chrome/test/plugin/plugin_tests.scons +++ b/chrome/test/plugin/plugin_tests.scons @@ -71,4 +71,30 @@ input_files = [ ] -env.ChromeTestProgram('plugin_tests', input_files) +# TODO(port): +if env.Bit('windows'): + env.ChromeTestProgram('plugin_tests', input_files) + +env.ChromeMSVSProject('$CHROME_DIR/test/plugin/plugin_tests.vcproj', + dependencies = [ + '$CHROME_DIR/test/automation/automation.vcproj', + '$BASE_DIR/build/base.vcproj', + '$NET_DIR/build/net.vcproj', + ('$CHROME_DIR/test/activex_test_control/' + + 'activex_test_control.vcproj'), + '$CHROME_DIR/browser/browser.vcproj', + '$MODP_B64_DIR/modp_b64.vcproj', + '$CHROME_DIR/app/chrome_exe.vcproj', + '$ZLIB_DIR/zlib.vcproj', + '$CHROME_DIR/common/common.vcproj', + '$ICU38_DIR/build/icu.vcproj', + '$BASE_DIR/build/base_gfx.vcproj', + '$TESTING_DIR/gtest.vcproj', + '$LIBPNG_DIR/libpng.vcproj', + '$SKIA_DIR/skia.vcproj', + ('$CHROME_DIR/test/security_tests/' + + 'security_tests.vcproj'), + '$GOOGLEURL_DIR/build/googleurl.vcproj', + '$CHROME_DIR/browser/views/browser_views.vcproj', + ], + guid='{A1CAA831-C507-4B2E-87F3-AEC63C9907F9}') diff --git a/chrome/test/reliability/reliability_tests.scons b/chrome/test/reliability/reliability_tests.scons index 8f6ad5f..1c65f04 100644 --- a/chrome/test/reliability/reliability_tests.scons +++ b/chrome/test/reliability/reliability_tests.scons @@ -70,4 +70,26 @@ input_files = [ 'run_all_unittests.cc', ] -env.ChromeTestProgram('reliability_tests', input_files) +# TODO(port): +if env.Bit('windows'): + env.ChromeTestProgram('reliability_tests', input_files) + +env.ChromeMSVSProject('$CHROME_DIR/test/reliability/reliability_tests.vcproj', + dependencies = [ + '$CHROME_DIR/test/automation/automation.vcproj', + '$BASE_DIR/build/base.vcproj', + '$NET_DIR/build/net.vcproj', + '$CHROME_DIR/browser/browser.vcproj', + '$MODP_B64_DIR/modp_b64.vcproj', + '$CHROME_DIR/app/chrome_exe.vcproj', + '$ZLIB_DIR/zlib.vcproj', + '$CHROME_DIR/common/common.vcproj', + '$ICU38_DIR/build/icu.vcproj', + '$BASE_DIR/build/base_gfx.vcproj', + '$TESTING_DIR/gtest.vcproj', + '$LIBPNG_DIR/libpng.vcproj', + '$SKIA_DIR/skia.vcproj', + '$GOOGLEURL_DIR/build/googleurl.vcproj', + '$CHROME_DIR/browser/views/browser_views.vcproj', + ], + guid='{8A3E1774-1DE9-445C-982D-3EE37C8A752A}') diff --git a/chrome/test/security_tests/security_tests.scons b/chrome/test/security_tests/security_tests.scons index 2fdf83f..1797f07 100644 --- a/chrome/test/security_tests/security_tests.scons +++ b/chrome/test/security_tests/security_tests.scons @@ -41,4 +41,9 @@ input_files = [ '$SANDBOX_DIR/tests/validation_tests/commands${OBJSUFFIX}', ] -env.ChromeSharedLibrary('security_tests', input_files) +# TODO(port): +if env.Bit('windows'): + env.ChromeSharedLibrary('security_tests', input_files) + +env.ChromeMSVSProject('$CHROME_DIR/test/security_tests/security_tests.vcproj', + guid='{E750512D-FC7C-4C98-BF04-0A0DAF882055}') diff --git a/chrome/test/selenium/selenium_tests.scons b/chrome/test/selenium/selenium_tests.scons index 8d98dd1..7e29c94 100644 --- a/chrome/test/selenium/selenium_tests.scons +++ b/chrome/test/selenium/selenium_tests.scons @@ -72,4 +72,26 @@ input_files = [ 'selenium_test.cc', ] -env.ChromeTestProgram('selenium_tests', input_files) +# TODO(port): +if env.Bit('windows'): + env.ChromeTestProgram('selenium_tests', input_files) + +env.ChromeMSVSProject('$CHROME_DIR/test/selenium/selenium_tests.vcproj', + dependencies = [ + '$CHROME_DIR/test/automation/automation.vcproj', + '$BASE_DIR/build/base.vcproj', + '$NET_DIR/build/net.vcproj', + '$CHROME_DIR/browser/browser.vcproj', + '$MODP_B64_DIR/modp_b64.vcproj', + '$CHROME_DIR/app/chrome_exe.vcproj', + '$ZLIB_DIR/zlib.vcproj', + '$CHROME_DIR/common/common.vcproj', + '$ICU38_DIR/build/icu.vcproj', + '$BASE_DIR/build/base_gfx.vcproj', + '$TESTING_DIR/gtest.vcproj', + '$LIBPNG_DIR/libpng.vcproj', + '$SKIA_DIR/skia.vcproj', + '$GOOGLEURL_DIR/build/googleurl.vcproj', + '$CHROME_DIR/browser/views/browser_views.vcproj', + ], + guid='{E3749617-BA3D-4230-B54C-B758E56D9FA5}') diff --git a/chrome/test/startup/startup_tests.scons b/chrome/test/startup/startup_tests.scons index 5ff685e..8f1faa0 100644 --- a/chrome/test/startup/startup_tests.scons +++ b/chrome/test/startup/startup_tests.scons @@ -67,4 +67,26 @@ input_files = [ 'startup_test.cc', ] -env.ChromeTestProgram('startup_tests', input_files) +# TODO(port): +if env.Bit('windows'): + env.ChromeTestProgram('startup_tests', input_files) + +env.ChromeMSVSProject('$CHROME_DIR/test/startup/startup_tests.vcproj', + dependencies = [ + '$CHROME_DIR/test/automation/automation.vcproj', + '$BASE_DIR/build/base.vcproj', + '$NET_DIR/build/net.vcproj', + '$CHROME_DIR/browser/browser.vcproj', + '$MODP_B64_DIR/modp_b64.vcproj', + '$CHROME_DIR/app/chrome_exe.vcproj', + '$ZLIB_DIR/zlib.vcproj', + '$CHROME_DIR/common/common.vcproj', + '$ICU38_DIR/build/icu.vcproj', + '$BASE_DIR/build/base_gfx.vcproj', + '$TESTING_DIR/gtest.vcproj', + '$LIBPNG_DIR/libpng.vcproj', + '$SKIA_DIR/skia.vcproj', + '$GOOGLEURL_DIR/build/googleurl.vcproj', + '$CHROME_DIR/browser/views/browser_views.vcproj', + ], + guid='{D3E6C0FD-54C7-4FF2-9AE1-72F2DAFD820C}') diff --git a/chrome/test/tab_switching/tab_switching_test.scons b/chrome/test/tab_switching/tab_switching_test.scons index f4e63e9..da0b296 100644 --- a/chrome/test/tab_switching/tab_switching_test.scons +++ b/chrome/test/tab_switching/tab_switching_test.scons @@ -69,5 +69,28 @@ input_files = [ #"..\..\Debug\obj\tab_switching_test\precompiled_wtl.obj" -env.ChromeTestProgram('tab_switching_test', input_files) +# TODO(port): +if env.Bit('windows'): + env.ChromeTestProgram('tab_switching_test', input_files) +env.ChromeMSVSProject('$CHROME_DIR/test/tab_switching/tab_switching.vcproj', + name='tab_switching_test', + dependencies = [ + '$CHROME_DIR/test/automation/automation.vcproj', + '$BASE_DIR/build/base.vcproj', + '$NET_DIR/build/net.vcproj', + '$CHROME_DIR/browser/browser.vcproj', + '$MODP_B64_DIR/modp_b64.vcproj', + '$CHROME_DIR/test/ui/ui_tests.vcproj', + '$CHROME_DIR/app/chrome_exe.vcproj', + '$ZLIB_DIR/zlib.vcproj', + '$CHROME_DIR/common/common.vcproj', + '$ICU38_DIR/build/icu.vcproj', + '$BASE_DIR/build/base_gfx.vcproj', + '$TESTING_DIR/gtest.vcproj', + '$LIBPNG_DIR/libpng.vcproj', + '$SKIA_DIR/skia.vcproj', + '$GOOGLEURL_DIR/build/googleurl.vcproj', + '$CHROME_DIR/browser/views/browser_views.vcproj', + ], + guid='{A34770EA-A574-43E8-9327-F79C04770E98}') diff --git a/chrome/test/ui/ui_tests.scons b/chrome/test/ui/ui_tests.scons index 53113482..0654579 100644 --- a/chrome/test/ui/ui_tests.scons +++ b/chrome/test/ui/ui_tests.scons @@ -129,4 +129,37 @@ if env.Bit('windows'): '$CHROME_DIR/browser/views/find_bar_win_uitest.cc', ]) -env.ChromeTestProgram('ui_tests', ui_test_files) + env.ChromeTestProgram('ui_tests', ui_test_files) + +env.ChromeMSVSProject('$CHROME_DIR/test/ui/ui_tests.vcproj', + dependencies = [ + ('$WEBKIT_DIR/glue/plugins/test/' + + 'npapi_test_plugin.vcproj'), + '$CHROME_DIR/test/automation/automation.vcproj', + '$BASE_DIR/build/base.vcproj', + '$BZIP2_DIR/bzip2.vcproj', + '$NET_DIR/build/net.vcproj', + '$CHROME_DIR/browser/browser.vcproj', + '$MODP_B64_DIR/modp_b64.vcproj', + '$CHROME_DIR/app/chrome_exe.vcproj', + '$ZLIB_DIR/zlib.vcproj', + '$CHROME_DIR/common/common.vcproj', + '$ICU38_DIR/build/icu.vcproj', + '$CHROME_DIR/app/locales/he.vcproj', + '$CHROME_DIR/app/locales/da.vcproj', + '$BASE_DIR/build/base_gfx.vcproj', + ('$WEBKIT_DIR/tools/npapi_layout_test_plugin/' + + 'npapi_layout_test_plugin.vcproj'), + '$TESTING_DIR/gtest.vcproj', + '$LIBPNG_DIR/libpng.vcproj', + '$CHROME_DIR/app/locales/en-US.vcproj', + '$SKIA_DIR/skia.vcproj', + ('$CHROME_DIR/test/security_tests/' + + 'security_tests.vcproj'), + '$CHROME_DIR/app/locales/zh-TW.vcproj', + '$GOOGLEURL_DIR/build/googleurl.vcproj', + '$SDCH_DIR/sdch.vcproj', + '$LIBXML_DIR/build/libxml.vcproj', + '$CHROME_DIR/browser/views/browser_views.vcproj', + ], + guid='{76235B67-1C27-4627-8A33-4B2E1EF93EDE}') diff --git a/chrome/test/unit/unit_tests.scons b/chrome/test/unit/unit_tests.scons index 3c25fb7..f198e5c 100644 --- a/chrome/test/unit/unit_tests.scons +++ b/chrome/test/unit/unit_tests.scons @@ -251,3 +251,49 @@ if not env.Bit('mac'): i = env.Install('$TARGET_ROOT', unit_tests) Alias('chrome', i) + +env.ChromeMSVSProject('$CHROME_DIR/test/unit/unittests.vcproj', + name='unit_tests', + dependencies = [ + '$BASE_DIR/build/base.vcproj', + '$WEBKIT_DIR/build/WebCore/WebCore.vcproj', + '$CHROME_DIR/plugin/plugin.vcproj', + '$LIBJPEG_DIR/libjpeg.vcproj', + '$BZIP2_DIR/bzip2.vcproj', + '$NET_DIR/build/net.vcproj', + ('$WEBKIT_DIR/build/JavaScriptCore/' + + 'JavaScriptCore_pcre.vcproj'), + '$WEBKIT_DIR/build/port/port.vcproj', + '$CHROME_DIR/browser/debugger/debugger.vcproj', + '$WEBKIT_DIR/default_plugin/default_plugin.vcproj', + '$CHROME_DIR/browser/browser.vcproj', + '$WEBKIT_DIR/build/V8Bindings/V8Bindings.vcproj', + '$SQLITE_DIR/sqlite.vcproj', + '$CHROME_DIR/views/views.vcproj', + '$MODP_B64_DIR/modp_b64.vcproj', + '$CHROME_DIR/test/chrome_plugin/test_chrome_plugin.vcproj', + '$ZLIB_DIR/zlib.vcproj', + '$CHROME_DIR/common/common.vcproj', + '$ICU38_DIR/build/icu.vcproj', + '$CHROME_DIR/renderer/renderer.vcproj', + '$BASE_DIR/build/base_gfx.vcproj', + '$WEBKIT_DIR/build/JavaScriptCore/WTF.vcproj', + '$CHROME_DIR/browser/resources/browser_resources.vcproj', + '$RLZ_DIR/rlz.vcproj', + '$TESTING_DIR/gtest.vcproj', + '$V8_DIR/tools/visual_studio/v8_snapshot.vcproj', + '$LIBPNG_DIR/libpng.vcproj', + '$WEBKIT_DIR/build/glue/glue.vcproj', + '$CHROME_DIR/app/locales/en-US.vcproj', + '$SKIA_DIR/skia.vcproj', + '$CHROME_DIR/third_party/hunspell/hunspell.vcproj', + '$CHROME_DIR/app/generated_resources.vcproj', + '$GOOGLEURL_DIR/build/googleurl.vcproj', + '$CHROME_DIR/installer/util/util.vcproj', + '$WEBKIT_DIR/activex_shim/activex_shim.vcproj', + '$SDCH_DIR/sdch.vcproj', + '$CHROME_DIR/browser/views/browser_views.vcproj', + '$LIBXSLT_DIR/build/libxslt.vcproj', + '$CHROME_DIR/app/theme/theme_dll.vcproj', + ], + guid='{ECFC2BEC-9FC0-4AD9-9649-5F26793F65FC}') diff --git a/chrome/third_party/hunspell/SConscript b/chrome/third_party/hunspell/SConscript index 8941451..7cc57e3 100644 --- a/chrome/third_party/hunspell/SConscript +++ b/chrome/third_party/hunspell/SConscript @@ -85,7 +85,6 @@ input_files = [ env.ChromeStaticLibrary('hunspell', input_files) - dictionaries = [ 'dictionaries/en-US-1-1.bdic', 'dictionaries/en-US.dic', @@ -94,3 +93,6 @@ dictionaries = [ i = env.Install('$DESTINATION_ROOT/Dictionaries', dictionaries) env.Alias('chrome_Dictionaries', i) + +env.ChromeMSVSProject('$CHROME_DIR/third_party/hunspell/hunspell.vcproj', + guid='{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E}') diff --git a/chrome/tools/convert_dict/convert_dict.scons b/chrome/tools/convert_dict/convert_dict.scons index bec1668..790a40f 100644 --- a/chrome/tools/convert_dict/convert_dict.scons +++ b/chrome/tools/convert_dict/convert_dict.scons @@ -33,5 +33,14 @@ input_files = [ '$CHROME_DIR/third_party/hunspell/google/bdict_writer.cc', ] -env.ChromeProgram('convert_dict', input_files) +# TODO(port): +if env.Bit('windows'): + env.ChromeProgram('convert_dict', input_files) +env.ChromeMSVSProject('$CHROME_DIR/tools/convert_dict/convert_dict.vcproj', + dependencies = [ + '$BASE_DIR/build/base.vcproj', + '$ICU38_DIR/build/icu.vcproj', + '$ICU38_DIR/build/icudt.vcproj', + ], + guid='{42ECD5EC-722F-41DE-B6B8-83764C8016DF}') diff --git a/chrome/tools/crash_service/crash_service.scons b/chrome/tools/crash_service/crash_service.scons index b106369..78bce69 100644 --- a/chrome/tools/crash_service/crash_service.scons +++ b/chrome/tools/crash_service/crash_service.scons @@ -47,5 +47,19 @@ input_files = [ 'crash_service.cc', ] -env.ChromeProgram('crash_service', input_files) +# TODO(port): +if env.Bit('windows'): + env.ChromeProgram('crash_service', input_files) +env.ChromeMSVSProject('$CHROME_DIR/tools/crash_service/crash_service.vcproj', + dependencies = [ + '$BASE_DIR/build/base.vcproj', + '$ZLIB_DIR/zlib.vcproj', + '$CHROME_DIR/common/common.vcproj', + '$ICU38_DIR/build/icu.vcproj', + '$BREAKPAD_DIR/breakpad_sender.vcproj', + '$BASE_DIR/build/base_gfx.vcproj', + '$BREAKPAD_DIR/breakpad_handler.vcproj', + '$SKIA_DIR/skia.vcproj', + ], + guid='{89C1C190-A5D1-4EC4-BD6A-67FF2195C7CC}') diff --git a/chrome/tools/perf/flush_cache/flush_cache.scons b/chrome/tools/perf/flush_cache/flush_cache.scons index 88c6ee6..9e90c34 100644 --- a/chrome/tools/perf/flush_cache/flush_cache.scons +++ b/chrome/tools/perf/flush_cache/flush_cache.scons @@ -41,3 +41,10 @@ input_files = [ ] env.ChromeTestProgram('flush_cache', input_files) + +env.ChromeMSVSProject('$CHROME_DIR/tools/perf/flush_cache/flush_cache.vcproj', + dependencies = [ + '$BASE_DIR/build/base.vcproj', + '$ICU38_DIR/build/icu.vcproj', + ], + guid='{4539AFB3-B8DC-47F3-A491-6DAC8FD26657}') diff --git a/chrome/tools/profiles/generate_profile.scons b/chrome/tools/profiles/generate_profile.scons index 533dc48..e6eee04 100644 --- a/chrome/tools/profiles/generate_profile.scons +++ b/chrome/tools/profiles/generate_profile.scons @@ -65,4 +65,45 @@ input_files = [ 'generate_profile.cc', ] -env.ChromeTestProgram('generate_profile', input_files) +# TODO(port): +if env.Bit('windows'): + env.ChromeTestProgram('generate_profile', input_files) + +env.ChromeMSVSProject('$CHROME_DIR/tools/profiles/generate_profile.vcproj', + dependencies = [ + '$BASE_DIR/build/base.vcproj', + '$WEBKIT_DIR/build/WebCore/WebCore.vcproj', + '$CHROME_DIR/plugin/plugin.vcproj', + '$LIBJPEG_DIR/libjpeg.vcproj', + '$BZIP2_DIR/bzip2.vcproj', + '$NET_DIR/build/net.vcproj', + ('$WEBKIT_DIR/build/JavaScriptCore/' + + 'JavaScriptCore_pcre.vcproj'), + '$WEBKIT_DIR/build/port/port.vcproj', + '$CHROME_DIR/browser/debugger/debugger.vcproj', + '$WEBKIT_DIR/default_plugin/default_plugin.vcproj', + '$CHROME_DIR/browser/browser.vcproj', + '$WEBKIT_DIR/build/V8Bindings/V8Bindings.vcproj', + '$SQLITE_DIR/sqlite.vcproj', + '$CHROME_DIR/views/views.vcproj', + '$MODP_B64_DIR/modp_b64.vcproj', + '$ZLIB_DIR/zlib.vcproj', + '$CHROME_DIR/common/common.vcproj', + '$ICU38_DIR/build/icu.vcproj', + '$CHROME_DIR/renderer/renderer.vcproj', + '$BASE_DIR/build/base_gfx.vcproj', + '$WEBKIT_DIR/build/JavaScriptCore/WTF.vcproj', + '$V8_DIR/tools/visual_studio/v8_snapshot.vcproj', + '$LIBPNG_DIR/libpng.vcproj', + '$WEBKIT_DIR/build/glue/glue.vcproj', + '$SKIA_DIR/skia.vcproj', + '$CHROME_DIR/third_party/hunspell/hunspell.vcproj', + '$GOOGLEURL_DIR/build/googleurl.vcproj', + '$CHROME_DIR/installer/util/util.vcproj', + '$WEBKIT_DIR/activex_shim/activex_shim.vcproj', + '$SDCH_DIR/sdch.vcproj', + '$CHROME_DIR/browser/views/browser_views.vcproj', + '$LIBXSLT_DIR/build/libxslt.vcproj', + + ], + guid='{2E969AE9-7B12-4EDB-8E8B-48C7AE7BE357}') diff --git a/chrome/tools/test/image_diff/image_diff.scons b/chrome/tools/test/image_diff/image_diff.scons index 7451bfe..69b691a 100644 --- a/chrome/tools/test/image_diff/image_diff.scons +++ b/chrome/tools/test/image_diff/image_diff.scons @@ -47,3 +47,14 @@ input_files = [ ] env.ChromeTestProgram('image_diff', input_files) + +env.ChromeMSVSProject('$CHROME_DIR/tools/test/image_diff/image_diff.vcproj', + dependencies = [ + '$BASE_DIR/build/base.vcproj', + '$ZLIB_DIR/zlib.vcproj', + '$ICU38_DIR/build/icu.vcproj', + '$BASE_DIR/build/base_gfx.vcproj', + '$LIBPNG_DIR/libpng.vcproj', + '$SKIA_DIR/skia.vcproj', + ], + guid='{50B079C7-CD01-42D3-B8C4-9F8D9322E822}') diff --git a/chrome/views/SConscript b/chrome/views/SConscript index 4221600..d415f0f 100644 --- a/chrome/views/SConscript +++ b/chrome/views/SConscript @@ -93,3 +93,9 @@ input_files = [ ] env.ChromeStaticLibrary('views', input_files) + +env.ChromeMSVSProject('$CHROME_DIR/views/views.vcproj', + dependencies = [ + '$CHROME_DIR/app/generated_resources.vcproj', + ], + guid='{6F9258E5-294F-47B2-919D-17FFE7A8B751}') |