diff options
Diffstat (limited to 'chrome')
46 files changed, 0 insertions, 9398 deletions
diff --git a/chrome/SConscript b/chrome/SConscript deleted file mode 100644 index 1e7c797..0000000 --- a/chrome/SConscript +++ /dev/null @@ -1,645 +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 os - -Import(['env']) - -env_res = env.Clone() -env_test = env.Clone() -env = env.Clone() - -install_targets = [] - -env.Prepend( - CPPPATH = [ - 'app', - '$CHROME_DIR/third_party/wtl/include', - ], -) - - -# TODO(port) -if env_res.Bit('windows'): - env_res.Append( - CPPPATH = [ - '.', - '$CHROME_SRC_DIR', - # For app/chrome_dll.res to #include installer_util_strings.rc. - '$CHROME_DIR/installer/util', - ], - RCFLAGS = [ - ['/l', '0x409'], - ], - ) - - browser_res = env_res.RES( - '$TARGET_ROOT/grit_derived_sources/browser_resources.rc') - chrome_exe_res = env_res.RES('app/chrome_exe.rc'), - chrome_dll_res = env_res.RES('app/chrome_dll.rc') - env_res.Depends(chrome_dll_res, 'installer/util/installer_util_strings.rc') - common_res = env_res.RES( - '$TARGET_ROOT/grit_derived_sources/common_resources.rc') - debugger_res = env_res.RES( - '$TARGET_ROOT/grit_derived_sources/debugger_resources.rc') - renderer_res = env_res.RES( - '$TARGET_ROOT/grit_derived_sources/renderer_resources.rc') - test_data_res = env_res.RES('test/data/resource.rc') - - net_res = '$TARGET_ROOT/grit_derived_sources/net_resources.res' - webkit_res = '$TARGET_ROOT/grit_derived_sources/webkit_resources.res' - - dll_resources = [ - browser_res, - chrome_dll_res, - common_res, - debugger_res, - net_res, - renderer_res, - webkit_res, - ] - -############################################################################## -# TODO(sgk): move to separate .scons file for chrome.dll #################### - -env_dll = env.Clone() - -env_dll.ApplySConscript([ - '$CHROME_SRC_DIR/build/using_v8.scons', - '$ICU38_DIR/using_icu38.scons', -]) - -env_dll.Prepend( - CPPPATH = [ - "..", - ], - CPPDEFINES = [ - 'U_STATIC_IMPLEMENTATION', - 'PNG_USER_CONFIG', - 'CHROME_PNG_WRITE_SUPPORT', - 'LIBXSLT_STATIC', - 'LIBXML_STATIC', - ], -) - -env_dll.Append( - CPPPATH = [ - '$CHROME_DIR/app', - '$LIBPNG_DIR', - '$SKIA_DIR/include', - '$SKIA_DIR/include/corecg', - '$SKIA_DIR/platform', - '$LIBXSL_DIR', - '$LIBXML_DIR/DerivedSources/include', - '$LIBXML_DIR/include', - '$BREAKPAD_DIR/src', - ], - LIBS = [ - 'base', - 'base_gfx', - #'breakpad_handler', - 'googleurl', - 'media', - 'printing', - 'net', - 'skia', - 'bzip2', - 'libjpeg', - 'libpng', - 'libxml', - 'libxslt', - 'modp_b64', - 'zlib', - - 'WTF', - 'V8Bindings', - 'WebCore', - 'WebKit', - 'default_plugin', - 'glue', - 'JavaScriptCore_pcre', - 'port', - - 'browser', - 'common', - 'debugger', - 'util', - 'renderer', - 'hunspell', - 'sdch', - 'sqlite', - 'v8_snapshot', - 'views', - - 'X11', - 'Xrender', - 'Xext', - ], -) - -if env.Bit('windows'): - # These libraries don't work on non-Windows yet. - env_dll.Append( - LIBS = [ - 'plugin', - 'worker', - ] - ) - -if env_dll.Bit('windows'): - env_dll.Append( - CCFLAGS = [ - '/TP', - '/Wp64', - ], - CPPDEFINES = [ - '_WINDLL', - 'CHROME_DLL', - 'BROWSER_DLL', - 'RENDERER_DLL', - 'PLUGIN_DLL', - ], - LIBS = [ - 'activex_shim', - 'browser_views', - - #'comctl32.lib', - #'dwmapi.lib', - #'rpcrt4.lib', - #'shlwapi.lib', - #'winmm.lib', - #'wsock32.lib', - - 'Urlmon', - ], - LINKFLAGS = [ - '/INCREMENTAL', - '/DEBUG', - - '/DELAYLOAD:"comdlg32.dll"', - '/DELAYLOAD:"crypt32.dll"', - '/DELAYLOAD:"cryptui.dll"', - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"imagehlp.dll"', - '/DELAYLOAD:"imm32.dll"', - '/DELAYLOAD:"oleacc.dll"', - '/DELAYLOAD:"oleaut32.dll"', - '/DELAYLOAD:"psapi.dll"', - '/DELAYLOAD:"urlmon.dll"', - '/DELAYLOAD:"uxtheme.dll"', - '/DELAYLOAD:"winhttp.dll"', - '/DELAYLOAD:"wininet.dll"', - '/DELAYLOAD:"winspool.drv"', - '/DELAYLOAD:"ws2_32.dll"', - '/DELAYLOAD:"wsock32.dll"', - - '/SUBSYSTEM:WINDOWS', - '/BASE:"0x01000000"', - '/MACHINE:X86', - '/FIXED:No', - - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/ignore:4221', - '/nxcompat', - - '/PDB:${TARGETS[1]}', - ], - ) - -input_files = ChromeFileList([ - # TODO(sgk): violate standard indentation so we don't have to - # reindent too much when we remove the explicit MSVSFilter() calls - # in favor of generating the hierarchy to reflect the file system. - MSVSFilter('resources', [ - '$WEBKIT_DIR/glue/resources/aliasb.cur', - Derived(env_dll.File('$TARGET_ROOT/' - + 'grit_derived_sources/browser_resources.rc')), - '$WEBKIT_DIR/glue/resources/cell.cur', - 'app/check_dependents.bat', - 'app/chrome.dll.deps', - 'app/chrome_dll.rc', - 'app/chrome_dll_resource.h', - 'app/chrome_dll_version.rc.version', - '$WEBKIT_DIR/glue/resources/col_resize.cur', - 'common/common_resources.rc', - '$WEBKIT_DIR/glue/resources/copy.cur', - 'browser/debugger/resources/debugger_resources.rc', - Derived(env_dll.File('$TARGET_ROOT/grit_derived_sources/net_resources.rc')), - 'renderer/renderer_resources.rc', - '$WEBKIT_DIR/glue/resources/row_resize.cur', - '$WEBKIT_DIR/glue/resources/vertical_text.cur', - Derived(env_dll.File('$TARGET_ROOT/' - + 'grit_derived_sources/webkit_resources.rc')), - '$WEBKIT_DIR/glue/resources/zoom_in.cur', - '$WEBKIT_DIR/glue/resources/zoom_out.cur', - ]), - 'app/chrome_dll_main.cc', -]) - -if env_dll.Bit('windows'): - additional = [ - '$V8_DIR/snapshot-empty$OBJSUFFIX' - ] - dll_targets = env_dll.ChromeSharedLibrary('app/chrome_dll/chrome', - #dll_resources + input_files, - input_files + additional, - PDB='chrome_dll.pdb') - install_targets.extend(dll_targets) - - chrome_exe_version_rc = env.ChromeVersionRC( - 'chrome_exe_version.rc', - 'app/chrome_exe_version.rc.version' - ) - - chrome_dll_version_rc = env.ChromeVersionRC( - 'chrome_dll_version.rc', - 'app/chrome_dll_version.rc.version', - ) - - # TODO(sgk): explicit dependencies => scanned implicit dependencies - Depends(chrome_exe_res, chrome_exe_version_rc) - Depends(chrome_dll_res, chrome_dll_version_rc) - - chrome_exe_version_res = env_res.RES(chrome_exe_version_rc) - chrome_dll_version_res = env_res.RES(chrome_dll_version_rc) - - install_targets.extend(chrome_exe_version_rc) - install_targets.extend(chrome_exe_version_res) - - install_targets.extend(chrome_dll_version_rc) - install_targets.extend(chrome_dll_version_res) - -if env_dll.Bit('linux'): - input_files = [ - 'app/chrome_dll_main.cc', - 'app/chrome_exe_main_gtk.cc', - ] - - env_dll.Append( - LIBS = [ - 'event', - ] - ) - chrome = env_dll.ChromeProgram('app/chrome', input_files) - - -p = env.ChromeMSVSProject('app/chrome_dll.vcproj', - dest='$CHROME_SRC_DIR/chrome/app/chrome_dll.vcproj', - guid='{C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9}', - keyword='Win32Proj', - dependencies = [ - '$BASE_DIR/build/base.vcproj', - '$WEBKIT_DIR/build/WebCore/WebCore.vcproj', - '$CHROME_DIR/plugin/plugin.vcproj', - '$CHROME_DIR/worker/worker.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', - ], - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - local_directory_prefix='./', - relative_path_substitutions = [ - ('../../..', '$(OutDir)'), - ], - ConfigurationType='2') - -p.AddToolFile('tools/build/win/version.rules') - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/debug.vsprops', - './chrome_dll.vsprops', - '../installer/util/using_util.vsprops', - ], - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'Version', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - MSVSTool('VCLinkerTool', - OutputFile='$(IntDir)/chrome.dll', - ImportLibrary='$(OutDir)/lib/$(ProjectName).lib'), - 'VCALinkTool', - MSVSTool('VCManifestTool', - AdditionalManifestFiles=('$(SolutionDir)/app/' - + 'chrome.dll.manifest')), - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCAppVerifierTool', - 'VCWebDeploymentTool', - MSVSTool('VCPostBuildEventTool', - CommandLine=('call ' - + '$(SolutionDir)/tools/build/' - + 'win/hardlink_failsafe.bat ' - + '"$(TargetPath)" ' - + '"$(OutDir)/$(TargetFileName)"')), - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/release.vsprops', - './chrome_dll.vsprops', - '../installer/util/using_util.vsprops', - ], - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'Version', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - MSVSTool('VCLinkerTool', - OutputFile='$(OutDir)/chrome.dll', - ImportLibrary='$(OutDir)/lib/$(ProjectName).lib'), - 'VCALinkTool', - MSVSTool('VCManifestTool', - AdditionalManifestFiles=('$(SolutionDir)/app/' - + 'chrome.dll.manifest')), - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCAppVerifierTool', - 'VCWebDeploymentTool', - MSVSTool('VCPostBuildEventTool', - CommandLine=('check_dependents.bat ' - + '$(TargetPath) chrome.dll.deps')), - ]) - - -############################################################################## -# TODO(sgk): move to separate .scons file for chrome.exe #################### - -env_exe = env.Clone() - -env_exe.Prepend( - CPPPATH = [ - '..', - '$BREAKPAD_DIR/src', - ], - LIBS = [ - 'base', - 'breakpad_handler', - 'chrome', - 'common', - 'icu', - 'sandbox', - 'util', - ], -) - -env_exe.Append( - LINKFLAGS = [ - '/INCREMENTAL', - - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"uxtheme.dll"', - - '/SUBSYSTEM:WINDOWS', - '/MACHINE:X86', - '/FIXED:No', - - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - - '/PDB:${TARGETS[1]}', - #'/IMPLIB:${TARGETS[2]}', - ], -) - -input_files = ChromeFileList([ - # TODO(sgk): violate standard indentation so we don't have to - # reindent too much when we remove the explicit MSVSFilter() calls - # in favor of generating the hierarchy to reflect the file system. - MSVSFilter('resources', [ - 'app/check_dependents.bat', - 'app/chrome.exe.deps', - 'app/chrome_exe.rc', - 'app/chrome_exe_resource.h', - 'app/chrome_exe_version.rc.version', - ]), - 'app/breakpad.cc', - 'app/breakpad.h', - 'app/chrome_exe_main.cc', - 'common/chrome_switches$OBJSUFFIX', - 'app/client_util.cc', - 'app/client_util.h', - 'common/env_vars$OBJSUFFIX', - 'common/env_vars.h', - 'app/google_update_client.cc', - 'app/google_update_client.h', - 'common/result_codes.h', -]) - -# We only use a separate exe/dll on Windows. -if env.Bit('windows'): - chrome_exe = env_exe.ChromeProgram('chrome_exe/chrome', input_files) - - install_targets.append(chrome_exe[0]) - - env.Requires('$DESTINATION_ROOT/chrome.exe', - ['$DESTINATION_ROOT/chrome.dll', - '$DESTINATION_ROOT/icudt38.dll', - '$DESTINATION_ROOT/rlz.dll', - '$DESTINATION_ROOT/First Run', - '$DESTINATION_ROOT/themes', - Alias('chrome_locales'), - ]) - - env.Install('$DESTINATION_ROOT', '$CHROME_DIR/app/FirstRun') - - # 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')) - -p = env.ChromeMSVSProject('app/chrome_exe.vcproj', - dest='$CHROME_SRC_DIR/chrome/app/chrome_exe.vcproj', - guid='{7B219FAA-E360-43C8-B341-804A94EEFFAC}', - keyword='Win32Proj', - 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', - ], - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - local_directory_prefix='./', - ConfigurationType='1') - -p.AddToolFile('tools/build/win/version.rules') - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - './chrome_exe.vsprops', - '$(SolutionDir)../build/debug.vsprops', - ], - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'Version', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - MSVSTool('VCCLCompilerTool', - BasicRuntimeChecks='0', - BufferSecurityCheck='false'), - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - MSVSTool('VCLinkerTool', - ImportLibrary='$(OutDir)/lib/$(ProjectName).lib'), - 'VCALinkTool', - MSVSTool('VCManifestTool', - AdditionalManifestFiles=('$(SolutionDir)/app/' - + 'chrome.exe.manifest')), - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCAppVerifierTool', - 'VCWebDeploymentTool', - MSVSTool('VCPostBuildEventTool', - CommandLine=('copy ' - + '$(ProjectDir)/FirstRun ' - + '$(OutDir)/"First Run"'), - Description='Copy first run complete sentinel file'), - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - './chrome_exe.vsprops', - '$(SolutionDir)../build/release.vsprops', - ], - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'Version', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - MSVSTool('VCLinkerTool', - ImportLibrary='$(OutDir)/lib/$(ProjectName).lib'), - 'VCALinkTool', - MSVSTool('VCManifestTool', - AdditionalManifestFiles=('$(SolutionDir)/app/' - + 'chrome.exe.manifest')), - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCAppVerifierTool', - 'VCWebDeploymentTool', - MSVSTool('VCPostBuildEventTool', - # TODO(sgk): figure out how to get \r\n through - # Python's XML generation? - #CommandLine=('copy ' - # + '$(ProjectDir)/FirstRun ' - # + '$(OutDir)/"First Run"\r\n' - # + 'check_dependents.bat ' - # + '$(TargetPath) ' - # + 'chrome.exe.deps\r\n'), - CommandLine=('copy ' - + '$(ProjectDir)/FirstRun ' - + '$(OutDir)/"First Run" ' - + '&& ' - + 'check_dependents.bat ' - + '$(TargetPath) ' - + 'chrome.exe.deps'), - Description='Copy first run complete sentinel file'), - ]) - - -############################################################################## -# TODO(sgk): Port these to browser_views.scons and views.scons. - -sconscript_files = [ - 'browser/views/SConscript', - 'views/SConscript', -] - -if not env.WantSystemLib('hunspell'): - sconscript_files.append('third_party/hunspell/SConscript') - -env.SConscript(sconscript_files, exports=['env', 'env_res', 'env_test']) - -# TODO(port) -if env.Bit('windows'): - env.InstallAs('$LIBS_DIR/${LIBPREFIX}jscre${LIBSUFFIX}', - '$WEBKIT_DIR/JavaScriptCore_pcre.lib') - - -env.Install('$DESTINATION_ROOT', install_targets) - - -gears_plugins = [ - '$GEARS_DIR/binaries/gears.dll', - '$GEARS_DIR/binaries/gears.pdb', -] - -# TODO(port) -if env.Bit('windows'): - env.Install('$DESTINATION_ROOT/plugins/gears', gears_plugins) - -env.Command('$DESTINATION_ROOT/resources/inspector', - '$CHROME_SRC_DIR/third_party/WebKit/WebCore/inspector/front-end', - Copy('$TARGET', '$SOURCE'), - source_scanner=DirScanner) diff --git a/chrome/SConstruct b/chrome/SConstruct deleted file mode 100644 index dd84b36..0000000 --- a/chrome/SConstruct +++ /dev/null @@ -1,8 +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. - -build_component = 'chrome' -SConscript('../build/SConscript.main', - exports=['build_component']) - diff --git a/chrome/app/chrome_resources.scons b/chrome/app/chrome_resources.scons deleted file mode 100644 index 309bf21..0000000 --- a/chrome/app/chrome_resources.scons +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright (c) 2009 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 os - -Import('env') - -env = env.Clone() - -grd_files = [ - '$CHROME_SRC_DIR/chrome/browser/browser_resources.grd', - '$CHROME_SRC_DIR/chrome/browser/debugger/resources/debugger_resources.grd', - '$CHROME_SRC_DIR/chrome/common/common_resources.grd', - '$CHROME_SRC_DIR/chrome/renderer/renderer_resources.grd', -] - -for grd_file in grd_files: - # The fake target gets replaced with real targets when the GRIT Builder - # runs. - generated = env.GRIT( - '$TARGET_ROOT/grit_derived_sources/fake_' + os.path.basename(grd_file), - grd_file) - -if env.Bit('linux'): - chrome_pak = env.Repack('$TARGET_ROOT/chrome.pak', - ['$TARGET_ROOT/grit_derived_sources/browser_resources.pak', - '$TARGET_ROOT/grit_derived_sources/debugger_resources.pak', - '$TARGET_ROOT/grit_derived_sources/common_resources.pak', - '$TARGET_ROOT/grit_derived_sources/net_resources.pak', - '$TARGET_ROOT/grit_derived_sources/renderer_resources.pak', - '$TARGET_ROOT/grit_derived_sources/webkit_resources.pak', - ] - ) - i = env.Install('$DESTINATION_ROOT', chrome_pak) - env.Requires('$DESTINATION_ROOT/chrome', i) - env.Requires('$DESTINATION_ROOT/unit_tests', i) diff --git a/chrome/app/chrome_strings.scons b/chrome/app/chrome_strings.scons deleted file mode 100644 index 605ee97..0000000 --- a/chrome/app/chrome_strings.scons +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright (c) 2009 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 os - -Import('env') - -env = env.Clone() - -grd_files = [ - '$CHROME_SRC_DIR/chrome/app/generated_resources.grd', - '$CHROME_SRC_DIR/chrome/app/chromium_strings.grd', - '$CHROME_SRC_DIR/chrome/app/google_chrome_strings.grd', - '$CHROME_SRC_DIR/chrome/app/resources/locale_settings.grd', -] - -for grd_file in grd_files: - # The fake target gets replaced with real targets when the GRIT Builder - # runs. - generated = env.GRIT( - '$TARGET_ROOT/grit_derived_sources/fake_' + os.path.basename(grd_file), - grd_file) - -languages = [ 'ar', 'bg', 'bn', 'ca', 'cs', 'da', 'de', 'el', 'en-GB', - 'en-US', 'es', 'es-419', 'et', 'fi', 'fil', 'fr', 'gu', 'he', 'hi', 'hr', - 'hu', 'id', 'it', 'ja', 'kn', 'ko', 'lt', 'lv', 'ml', 'mr', 'nl', 'nb', - 'or', 'pl', 'pt-BR', 'pt-PT', 'ro', 'ru', 'sk', 'sl', 'sr', 'sv', 'ta', - 'te', 'th', 'tr', 'uk', 'vi', 'zh-CN', 'zh-TW' ] - -# TODO(tc): Handle official build vs chromium build. Currently we assume -# chromium builds only. -for lang in languages: - lang_pak = env.Repack('$TARGET_ROOT/locales/%s.pak' % lang, - ['$TARGET_ROOT/grit_derived_sources/chromium_strings_%s.pak' % lang, - '$TARGET_ROOT/grit_derived_sources/generated_resources_%s.pak' % lang, - '$TARGET_ROOT/grit_derived_sources/locale_settings_%s.pak' % lang, - '$TARGET_ROOT/grit_derived_sources/webkit_strings_%s.pak' % lang, - ] - ) - i = env.Install('$DESTINATION_ROOT/locales', lang_pak) - -# Only require that en-US.pak is build when building chrome. -env.Requires('$DESTINATION_ROOT/chrome', '$DESTINATION_ROOT/locales/en-US.pak') -env.Requires('$DESTINATION_ROOT/unit_tests', - '$DESTINATION_ROOT/locales/en-US.pak') diff --git a/chrome/app/locales/locales.scons b/chrome/app/locales/locales.scons deleted file mode 100644 index 0ce5df3c..0000000 --- a/chrome/app/locales/locales.scons +++ /dev/null @@ -1,119 +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. - -__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, - keyword='Win32Proj') - -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/app/theme/theme_dll.scons b/chrome/app/theme/theme_dll.scons deleted file mode 100644 index 9264c12..0000000 --- a/chrome/app/theme/theme_dll.scons +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright (c) 2009 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() - -# The fake target gets replaced with real targets when the GRIT Builder runs. -generated = env.GRIT( - '$TARGET_ROOT/grit_derived_sources/fake_theme_resources.grd', - '$CHROME_SRC_DIR/chrome/app/theme/theme_resources.grd') - -if env.Bit('linux'): - theme_default_pak = env.Repack('$TARGET_ROOT/themes/default.pak', - ['$TARGET_ROOT/grit_derived_sources/theme_resources.pak'] - ) - i = env.Install('$DESTINATION_ROOT/themes/', theme_default_pak) - env.Requires('$DESTINATION_ROOT/chrome', i) - env.Requires('$DESTINATION_ROOT/unit_tests', i) diff --git a/chrome/browser/browser.scons b/chrome/browser/browser.scons deleted file mode 100644 index 21a35f3..0000000 --- a/chrome/browser/browser.scons +++ /dev/null @@ -1,908 +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.SConscript([ - '$CHROME_DIR/third_party/hunspell/using_hunspell.scons', - '$CHROME_DIR/third_party/wtl/using_wtl.scons', - '$GOOGLE_UPDATE_DIR/using_google_update.scons', - '$GRIT_DIR/build/using_generated_resources.scons', - '$GTEST_DIR/../using_gtest.scons', - '$ICU38_DIR/using_icu38.scons', - '$LIBPNG_DIR/using_libpng.scons', - '$LIBXML_DIR/using_libxml.scons', - '$MEDIA_DIR/using_media.scons', - '$NPAPI_DIR/using_npapi.scons', - '$SKIA_DIR/using_skia.scons', - '$ZLIB_DIR/using_zlib.scons', -], {'env':env}) - -env.Append( - LIBS = [ - 'debugger', - 'glue', - 'views', - ], -) - -env.Prepend( - CPPPATH = [ - '$CHROME_DIR/app', - '$CHROME_SRC_DIR', - # To get the #include of history_indexer.h, - # generated from history/history_indexer.idl. - 'history', - ], -) - -if env.Bit('windows'): - env.Prepend( - CPPPATH = [ - '$CHROME_DIR/tools/build/win', - ], - ) - -# input_files initialized to common files + Windows specific ones. -input_files = ChromeFileList([ - # TODO(sgk): violate standard indentation so we don't have to - # reindent too much when we remove the explicit MSVSFilter() calls - # in favor of generating the hierarchy to reflect the file system. - MSVSFilter('Autocomplete', [ - 'autocomplete/autocomplete.cc', - 'autocomplete/autocomplete.h', - 'autocomplete/autocomplete_accessibility.cc', - 'autocomplete/autocomplete_accessibility.h', - 'autocomplete/autocomplete_edit.cc', - 'autocomplete/autocomplete_edit.h', - 'autocomplete/autocomplete_popup_model.cc', - 'autocomplete/autocomplete_popup_model.h', - 'autocomplete/autocomplete_popup_view_win.cc', - 'autocomplete/autocomplete_popup_view.h', - 'autocomplete/edit_drop_target.cc', - 'autocomplete/edit_drop_target.h', - 'autocomplete/history_contents_provider.cc', - 'autocomplete/history_contents_provider.h', - 'autocomplete/history_url_provider.cc', - 'autocomplete/history_url_provider.h', - 'autocomplete/keyword_provider.cc', - 'autocomplete/keyword_provider.h', - 'autocomplete/search_provider.cc', - 'autocomplete/search_provider.h', - ]), - MSVSFilter('Base', [ - 'alternate_nav_url_fetcher.cc', - 'alternate_nav_url_fetcher.h', - 'browser_about_handler.cc', - 'browser_about_handler.h', - 'browser_init.cc', - 'browser_init.h', - 'browser_main.cc', - 'browser_main_win.cc', - 'browser_prefs.cc', - 'browser_prefs.h', - 'browser_process.cc', - 'browser_process.h', - 'browser_process_impl.cc', - 'browser_process_impl.h', - 'browser_shutdown.cc', - 'browser_shutdown.h', - 'browser_url_handler.cc', - 'browser_url_handler.h', - 'browsing_data_remover.cc', - 'browsing_data_remover.h', - 'browsing_instance.cc', - 'browsing_instance.h', - 'cache_manager_host.h', - 'cancelable_request.cc', - 'cancelable_request.h', - 'character_encoding.cc', - 'character_encoding.h', - 'chrome_thread.cc', - 'chrome_thread.h', - 'cross_site_request_manager.cc', - 'cross_site_request_manager.h', - 'fav_icon_helper.cc', - 'fav_icon_helper.h', - 'first_run.cc', - 'first_run.h', - 'google_url_tracker.cc', - 'google_url_tracker.h', - 'google_util.cc', - 'google_util.h', - 'icon_loader.cc', - 'icon_loader.h', - 'icon_manager.cc', - 'icon_manager.h', - 'ime_input.cc', - 'ime_input.h', - 'jankometer.cc', - 'jankometer.h', - 'memory_details.cc', - 'memory_details.h', - 'meta_table_helper.cc', - 'meta_table_helper.h', - 'plugin_process_host.cc', - 'plugin_process_host.h', - 'plugin_service.cc', - 'plugin_service.h', - '../tools/build/win/precompiled_wtl.cc', - '../tools/build/win/precompiled_wtl.h', - 'profile.cc', - 'profile.h', - 'profile_manager.cc', - 'profile_manager.h', - 'session_startup_pref.cc', - 'session_startup_pref.h', - 'shell_dialogs.h', - 'shell_integration.cc', - 'shell_integration.h', - 'spellcheck_worditerator.cc', - 'spellcheck_worditerator.h', - 'spellchecker.cc', - 'spellchecker.h', - 'user_data_manager.cc', - 'user_data_manager.h', - 'visitedlink_master.cc', - 'visitedlink_master.h', - ]), - MSVSFilter('Bookmarks', [ - 'bookmarks/bookmark_codec.cc', - 'bookmarks/bookmark_codec.h', - 'bookmarks/bookmark_context_menu.cc', - 'bookmarks/bookmark_context_menu.h', - 'bookmarks/bookmark_drag_data.cc', - 'bookmarks/bookmark_drag_data.h', - 'bookmarks/bookmark_drop_info.cc', - 'bookmarks/bookmark_drop_info.h', - 'bookmarks/bookmark_folder_tree_model.cc', - 'bookmarks/bookmark_folder_tree_model.h', - 'bookmarks/bookmark_html_writer.cc', - 'bookmarks/bookmark_html_writer.h', - 'bookmarks/bookmark_model.cc', - 'bookmarks/bookmark_model.h', - 'bookmarks/bookmark_service.h', - 'bookmarks/bookmark_storage.cc', - 'bookmarks/bookmark_storage.h', - 'bookmarks/bookmark_table_model.cc', - 'bookmarks/bookmark_table_model.h', - 'bookmarks/bookmark_utils.cc', - 'bookmarks/bookmark_utils.h', - ]), - MSVSFilter('Browser Window', [ - 'app_modal_dialog_queue.cc', - 'app_modal_dialog_queue.h', - 'back_forward_menu_model.cc', - 'back_forward_menu_model.h', - 'back_forward_menu_model_win.cc', - 'back_forward_menu_model_win.h', - 'browser.cc', - 'browser.h', - 'browser_list.cc', - 'browser_list.h', - 'browser_window.h', - 'command_updater.cc', - 'controller.h', - 'dock_info.cc', - 'dock_info.h', - 'find_bar.h', - 'find_bar_controller.cc', - 'find_bar_controller.h', - 'find_notification_details.h', - 'js_before_unload_handler.h', - 'js_before_unload_handler_win.cc', - 'js_before_unload_handler_win.h', - 'jsmessage_box_handler.h', - 'jsmessage_box_handler_win.cc', - 'jsmessage_box_handler_win.h', - 'load_from_memory_cache_details.h', - 'load_notification_details.h', - 'login_prompt.cc', - 'login_prompt.h', - 'options_window.h', - 'task_manager.cc', - 'task_manager.h', - 'task_manager_resource_providers.cc', - 'task_manager_resource_providers.h', - 'window_sizer.cc', - 'window_sizer.h', - ]), - MSVSFilter('Automation', [ - 'automation/automation_autocomplete_edit_tracker.h', - 'automation/automation_browser_tracker.h', - 'automation/automation_constrained_window_tracker.h', - 'automation/automation_provider.cc', - 'automation/automation_provider.h', - 'automation/automation_provider_list.cc', - 'automation/automation_provider_list_generic.cc', - 'automation/automation_provider_list_mac.mm', - 'automation/automation_provider_list.h', - 'automation/automation_resource_tracker.cc', - 'automation/automation_resource_tracker.h', - 'automation/automation_tab_tracker.h', - 'automation/automation_window_tracker.h', - 'automation/ui_controls.cc', - 'automation/ui_controls.h', - 'automation/url_request_failed_dns_job.cc', - 'automation/url_request_failed_dns_job.h', - 'automation/url_request_mock_http_job.cc', - 'automation/url_request_mock_http_job.h', - 'automation/url_request_mock_net_error_job.cc', - 'automation/url_request_mock_net_error_job.h', - 'automation/url_request_slow_download_job.cc', - 'automation/url_request_slow_download_job.h', - 'view_ids.h', - ]), - MSVSFilter('History', [ - 'history/archived_database.cc', - 'history/archived_database.h', - 'history/download_database.cc', - 'history/download_database.h', - 'history/download_types.h', - 'history/expire_history_backend.cc', - 'history/expire_history_backend.h', - 'history/history.cc', - 'history/history.h', - 'history/history_backend.cc', - 'history/history_backend.h', - 'history/history_database.cc', - 'history/history_database.h', - 'history/history_indexer.idl', - 'history/history_marshaling.h', - 'history/history_notifications.h', - 'history/history_publisher.cc', - 'history/history_publisher_none.cc', - 'history/history_publisher_win.cc', - 'history/history_publisher.h', - 'history/history_types.cc', - 'history/history_types.h', - 'history/in_memory_database.cc', - 'history/in_memory_database.h', - 'history/in_memory_history_backend.cc', - 'history/in_memory_history_backend.h', - 'history/page_usage_data.cc', - 'history/page_usage_data.h', - 'history/query_parser.cc', - 'history/query_parser.h', - 'history/snippet.cc', - 'history/snippet.h', - 'history/starred_url_database.cc', - 'history/starred_url_database.h', - 'history/text_database.cc', - 'history/text_database.h', - 'history/text_database_manager.cc', - 'history/text_database_manager.h', - 'history/thumbnail_database.cc', - 'history/thumbnail_database.h', - 'history/url_database.cc', - 'history/url_database.h', - 'history/visit_database.cc', - 'history/visit_database.h', - 'history/visit_tracker.cc', - 'history/visit_tracker.h', - 'history/visitsegment_database.cc', - 'history/visitsegment_database.h', - MSVSFilter('HangMonitor', [ - 'hang_monitor/hung_plugin_action.cc', - 'hang_monitor/hung_plugin_action.h', - 'hang_monitor/hung_window_detector.cc', - 'hang_monitor/hung_window_detector.h', - ]), - ]), - MSVSFilter('Sessions and Tab Restore', [ - 'sessions/base_session_service.cc', - 'sessions/base_session_service.h', - 'sessions/session_backend.cc', - 'sessions/session_backend.h', - 'sessions/session_command.cc', - 'sessions/session_command.h', - 'sessions/session_id.cc', - 'sessions/session_id.h', - 'sessions/session_restore.cc', - 'sessions/session_restore.h', - 'sessions/session_service.cc', - 'sessions/session_service.h', - 'sessions/session_types.cc', - 'sessions/session_types.h', - 'sessions/tab_restore_service.cc', - 'sessions/tab_restore_service.h', - ]), - MSVSFilter('WebData', [ - 'webdata/web_data_service.cc', - 'webdata/web_data_service.h', - 'webdata/web_database.cc', - 'webdata/web_database.h', - 'webdata/web_database_win.cc', - ]), - MSVSFilter('Importer', [ - 'importer/firefox2_importer.cc', - 'importer/firefox2_importer.h', - 'importer/firefox3_importer.cc', - 'importer/firefox3_importer.h', - 'importer/firefox_importer_utils.cc', - 'importer/firefox_importer_utils.h', - 'importer/firefox_profile_lock.cc', - 'importer/firefox_profile_lock.h', - 'importer/firefox_profile_lock_win.cc', - 'importer/ie_importer.cc', - 'importer/ie_importer.h', - 'importer/importer.cc', - 'importer/importer.h', - 'importer/mork_reader.cc', - 'importer/mork_reader.h', - ]), - MSVSFilter('Drag & Drop', [ - 'drag_utils.cc', - 'drag_utils.h', - ]), - MSVSFilter('Tabs', [ - 'tabs/tab_strip_model.cc', - 'tabs/tab_strip_model.h', - 'tabs/tab_strip_model_order_controller.cc', - 'tabs/tab_strip_model_order_controller.h', - ]), - MSVSFilter('Printing', [ - 'printing/page_number.cc', - 'printing/page_number.h', - 'printing/page_overlays.cc', - 'printing/page_overlays.h', - 'printing/page_range.cc', - 'printing/page_range.h', - 'printing/page_setup.cc', - 'printing/page_setup.h', - 'printing/print_job.cc', - 'printing/print_job.h', - 'printing/print_job_manager.cc', - 'printing/print_job_manager.h', - 'printing/print_job_worker.cc', - 'printing/print_job_worker.h', - 'printing/print_job_worker_owner.h', - 'printing/print_settings.cc', - 'printing/print_settings.h', - 'printing/print_view_manager.cc', - 'printing/print_view_manager.h', - 'printing/printed_document.cc', - 'printing/printed_document.h', - 'printing/printed_page.cc', - 'printing/printed_page.h', - 'printing/printed_pages_source.h', - 'printing/printer_query.cc', - 'printing/printer_query.h', - 'printing/win_printing_context.cc', - 'printing/win_printing_context.h', - ]), - MSVSFilter('Sandbox', [ - 'sandbox_policy.cc', - 'sandbox_policy.h', - ]), - MSVSFilter('Password Manager', [ - 'password_manager/encryptor.cc', - 'password_manager/encryptor.h', - 'password_manager/ie7_password.cc', - 'password_manager/ie7_password.h', - 'password_manager/password_form_manager.cc', - 'password_manager/password_form_manager.h', - 'password_manager/password_manager.cc', - 'password_manager/password_manager.h', - ]), - MSVSFilter('External Tab', [ - 'external_tab_container.cc', - 'external_tab_container.h', - ]), - MSVSFilter('DOM UI', [ - 'dom_ui/chrome_url_data_manager.cc', - 'dom_ui/chrome_url_data_manager.h', - 'dom_ui/debugger_ui.cc', - 'dom_ui/debugger_ui.h', - 'dom_ui/devtools_ui.cc', - 'dom_ui/devtools_ui.h', - 'dom_ui/dom_ui.cc', - 'dom_ui/dom_ui.h', - 'dom_ui/dom_ui_factory.cc', - 'dom_ui/dom_ui_factory.h', - 'dom_ui/dom_ui_favicon_source.cc', - 'dom_ui/dom_ui_favicon_source.h', - 'dom_ui/dom_ui_host.cc', - 'dom_ui/dom_ui_host.h', - 'dom_ui/dom_ui_thumbnail_source.cc', - 'dom_ui/dom_ui_thumbnail_source.h', - 'dom_ui/downloads_ui.cc', - 'dom_ui/downloads_ui.h', - 'dom_ui/fileicon_source.cc', - 'dom_ui/fileicon_source.h', - 'dom_ui/history_ui.cc', - 'dom_ui/history_ui.h', - 'dom_ui/html_dialog_contents.cc', - 'dom_ui/html_dialog_contents.h', - 'dom_ui/new_tab_ui.cc', - 'dom_ui/new_tab_ui.h', - ]), - MSVSFilter('Net', [ - 'net/chrome_url_request_context.cc', - 'net/chrome_url_request_context.h', - 'net/dns_global.cc', - 'net/dns_global.h', - 'net/dns_host_info.cc', - 'net/dns_host_info.h', - 'net/dns_master.cc', - 'net/dns_master.h', - 'net/referrer.cc', - 'net/referrer.h', - 'net/resolve_proxy_msg_helper.cc', - 'net/resolve_proxy_msg_helper.h', - 'net/sdch_dictionary_fetcher.cc', - 'net/sdch_dictionary_fetcher.h', - 'net/url_fetcher.cc', - 'net/url_fetcher.h', - 'net/url_fetcher_protect.cc', - 'net/url_fetcher_protect.h', - 'net/url_fixer_upper.cc', - 'net/url_fixer_upper.h', - ]), - MSVSFilter('RLZ', [ - 'rlz/rlz.cc', - 'rlz/rlz.h', - ]), - MSVSFilter('Safe Browsing', [ - 'safe_browsing/bloom_filter.cc', - 'safe_browsing/bloom_filter.h', - 'safe_browsing/chunk_range.cc', - 'safe_browsing/chunk_range.h', - 'safe_browsing/protocol_manager.cc', - 'safe_browsing/protocol_manager.h', - 'safe_browsing/protocol_parser.cc', - 'safe_browsing/protocol_parser.h', - 'safe_browsing/safe_browsing_blocking_page.cc', - 'safe_browsing/safe_browsing_blocking_page.h', - 'safe_browsing/safe_browsing_database.cc', - 'safe_browsing/safe_browsing_database.h', - 'safe_browsing/safe_browsing_database_bloom.cc', - 'safe_browsing/safe_browsing_database_bloom.h', - 'safe_browsing/safe_browsing_service.cc', - 'safe_browsing/safe_browsing_service.h', - 'safe_browsing/safe_browsing_util.cc', - 'safe_browsing/safe_browsing_util.h', - ]), - MSVSFilter('Accessibility', [ - 'browser_accessibility.cc', - 'browser_accessibility.h', - 'browser_accessibility_manager.cc', - 'browser_accessibility_manager.h', - ]), - MSVSFilter('Download', [ - 'download/download_exe.cc', - 'download/download_file.cc', - 'download/download_file.h', - 'download/download_item_model.cc', - 'download/download_item_model.h', - 'download/download_manager.cc', - 'download/download_manager.h', - 'download/download_request_dialog_delegate.h', - 'download/download_request_manager.cc', - 'download/download_request_manager.h', - 'download/download_shelf.cc', - 'download/download_shelf.h', - 'download/download_util.cc', - 'download/download_util.h', - ]), - MSVSFilter('Save Page', [ - 'download/save_file.cc', - 'download/save_file.h', - 'download/save_file_manager.cc', - 'download/save_file_manager.h', - 'download/save_item.cc', - 'download/save_item.h', - 'download/save_package.cc', - 'download/save_package.h', - 'download/save_types.h', - ]), - MSVSFilter('Autofill', [ - 'autofill_manager.cc', - 'autofill_manager.h', - ]), - MSVSFilter('Extensions', [ - 'extensions/extension.cc', - 'extensions/extension.h', - 'extensions/extension_function.cc', - 'extensions/extension_function.h', - 'extensions/extension_function_dispatcher.cc', - 'extensions/extension_function_dispatcher.h', - 'extensions/extension_error_reporter.cc', - 'extensions/extension_error_reporter.h', - 'extensions/extension_message_service.cc', - 'extensions/extension_message_service.h', - 'extensions/extension_protocols.h', - 'extensions/extension_tabs_module.cc', - 'extensions/extension_tabs_module.h', - 'extensions/extension_view.cc', - 'extensions/extension_view.h', - 'extensions/extensions_service.cc', - 'extensions/extensions_service.h', - 'extensions/extensions_ui.cc', - 'extensions/extensions_ui.h', - 'extensions/user_script_master.cc', - 'extensions/user_script_master.h', - ]), - MSVSFilter('Renderer Host', [ - 'renderer_host/async_resource_handler.cc', - 'renderer_host/async_resource_handler.h', - 'renderer_host/audio_renderer_host.cc', - 'renderer_host/audio_renderer_host.h', - 'renderer_host/backing_store.h', - 'renderer_host/backing_store.cc', - 'renderer_host/backing_store_win.cc', - 'renderer_host/browser_render_process_host.cc', - 'renderer_host/browser_render_process_host.h', - 'renderer_host/buffered_resource_handler.cc', - 'renderer_host/buffered_resource_handler.h', - 'renderer_host/cross_site_resource_handler.cc', - 'renderer_host/cross_site_resource_handler.h', - 'renderer_host/download_resource_handler.cc', - 'renderer_host/download_resource_handler.h', - 'renderer_host/download_throttling_resource_handler.cc', - 'renderer_host/download_throttling_resource_handler.h', - 'renderer_host/media_resource_handler.cc', - 'renderer_host/media_resource_handler.h', - 'renderer_host/render_process_host.cc', - 'renderer_host/render_process_host.h', - 'renderer_host/render_view_host.cc', - 'renderer_host/render_view_host.h', - 'renderer_host/render_view_host_delegate.h', - 'renderer_host/render_widget_helper.cc', - 'renderer_host/render_widget_helper.h', - 'renderer_host/render_widget_host.cc', - 'renderer_host/render_widget_host.h', - 'renderer_host/render_widget_host_view.h', - 'renderer_host/render_widget_host_view_win.cc', - 'renderer_host/render_widget_host_view_win.h', - 'renderer_host/renderer_security_policy.cc', - 'renderer_host/renderer_security_policy.h', - 'renderer_host/resource_dispatcher_host.cc', - 'renderer_host/resource_dispatcher_host.h', - 'renderer_host/resource_handler.h', - 'renderer_host/resource_message_filter.cc', - 'renderer_host/resource_message_filter.h', - 'renderer_host/resource_message_filter_gtk.cc', - 'renderer_host/resource_request_details.h', - 'renderer_host/safe_browsing_resource_handler.cc', - 'renderer_host/safe_browsing_resource_handler.h', - 'renderer_host/save_file_resource_handler.cc', - 'renderer_host/save_file_resource_handler.h', - 'renderer_host/sync_resource_handler.cc', - 'renderer_host/sync_resource_handler.h', - 'renderer_host/web_cache_manager.cc', - ]), - MSVSFilter('Tab Contents', [ - 'tab_contents/constrained_window.h', - 'tab_contents/infobar_delegate.cc', - 'tab_contents/infobar_delegate.h', - 'tab_contents/interstitial_page.cc', - 'tab_contents/interstitial_page.h', - 'tab_contents/navigation_controller.cc', - 'tab_contents/navigation_controller.h', - 'tab_contents/navigation_entry.cc', - 'tab_contents/navigation_entry.h', - 'tab_contents/page_navigator.h', - 'tab_contents/provisional_load_details.cc', - 'tab_contents/provisional_load_details.h', - 'tab_contents/render_view_context_menu.cc', - 'tab_contents/render_view_context_menu.h', - 'tab_contents/render_view_host_manager.cc', - 'tab_contents/render_view_host_manager.h', - 'tab_contents/repost_form_warning.h', - 'tab_contents/security_style.h', - 'tab_contents/site_instance.cc', - 'tab_contents/site_instance.h', - 'tab_contents/tab_contents.cc', - 'tab_contents/tab_contents.h', - 'tab_contents/tab_contents_delegate.h', - 'tab_contents/tab_contents_factory.cc', - 'tab_contents/tab_contents_factory.h', - 'tab_contents/tab_contents_type.h', - 'tab_contents/tab_util.cc', - 'tab_contents/tab_util.h', - 'tab_contents/web_contents.cc', - 'tab_contents/web_contents.h', - 'tab_contents/web_contents_view.cc', - 'tab_contents/web_contents_view.h', - 'tab_contents/web_contents_view_win.cc', - 'tab_contents/web_contents_view_win.h', - 'tab_contents/web_drag_source.cc', - 'tab_contents/web_drag_source.h', - 'tab_contents/web_drop_target.cc', - 'tab_contents/web_drop_target.h', - ]), - MSVSFilter('Search Engines', [ - 'search_engines/template_url.cc', - 'search_engines/template_url.h', - 'search_engines/template_url_fetcher.cc', - 'search_engines/template_url_fetcher.h', - 'search_engines/template_url_model.cc', - 'search_engines/template_url_model.h', - 'search_engines/template_url_parser.cc', - 'search_engines/template_url_parser.h', - 'search_engines/template_url_prepopulate_data.cc', - 'search_engines/template_url_prepopulate_data.h', - ]), - MSVSFilter('Metrics', [ - 'metrics/metrics_log.cc', - 'metrics/metrics_log.h', - 'metrics/metrics_response.cc', - 'metrics/metrics_response.h', - 'metrics/metrics_service.cc', - 'metrics/metrics_service.h', - 'metrics/user_metrics.cc', - 'metrics/user_metrics.h', - ]), - MSVSFilter('SSL', [ - 'ssl/ssl_blocking_page.cc', - 'ssl/ssl_blocking_page.h', - 'ssl/ssl_error_info.cc', - 'ssl/ssl_error_info.h', - 'ssl/ssl_host_state.cc', - 'ssl/ssl_host_state.h', - 'ssl/ssl_manager.cc', - 'ssl/ssl_manager.h', - 'ssl/ssl_policy.cc', - 'ssl/ssl_policy.h', - ]), - 'browser_trial.cc', - 'browser_trial.h', - 'cert_store.cc', - 'cert_store.h', - 'chrome_plugin_browsing_context.cc', - 'chrome_plugin_browsing_context.h', - 'chrome_plugin_host.cc', - 'encoding_menu_controller_delegate.cc', - 'encoding_menu_controller_delegate.h', - 'external_protocol_handler.cc', - 'external_protocol_handler.h', - 'gears_integration.cc', - 'gears_integration.h', - 'google_update.cc', - 'google_update.h', - 'modal_html_dialog_delegate.cc', - 'modal_html_dialog_delegate.h', - 'page_state.cc', - 'page_state.h', - 'plugin_installer.cc', - 'plugin_installer.h', - 'toolbar_model.cc', - 'toolbar_model.h', - 'worker_host/worker_process_host.cc', - 'worker_host/worker_process_host.h', - 'worker_host/worker_service.cc', - 'worker_host/worker_service.h', -]) - -if not env.Bit('windows'): - # TODO: Port these. - input_files.Remove( - 'app_modal_dialog_queue.cc', - 'autocomplete/autocomplete_accessibility.cc', - 'autocomplete/autocomplete_popup_view_win.cc', - 'autocomplete/edit_drop_target.cc', - 'automation/ui_controls.cc', - 'browser_accessibility.cc', - 'browser_accessibility_manager.cc', - 'dock_info.cc', - 'dom_ui/html_dialog_contents.cc', - 'download/download_exe.cc', - 'download/download_util.cc', - 'drag_utils.cc', - 'encoding_menu_controller_delegate.cc', - 'external_tab_container.cc', - 'first_run.cc', - 'hang_monitor/hung_plugin_action.cc', - 'hang_monitor/hung_window_detector.cc', - 'icon_loader.cc', - 'icon_manager.cc', - 'ime_input.cc', - 'jankometer.cc', - 'login_prompt.cc', - 'memory_details.cc', - 'modal_html_dialog_delegate.cc', - 'google_update.cc', - 'password_manager/encryptor.cc', - 'printing/page_overlays.cc', - 'printing/print_job.cc', - 'printing/print_job_manager.cc', - 'printing/print_job_worker.cc', - 'printing/print_settings.cc', - 'printing/print_view_manager.cc', - 'printing/printed_document.cc', - 'printing/printed_page.cc', - 'printing/printer_query.cc', - 'printing/win_printing_context.cc', - 'rlz/rlz.cc', - 'sandbox_policy.cc', - 'shell_integration.cc', - 'tab_contents/web_drop_target.cc', - 'task_manager.cc', - 'task_manager_resource_providers.cc', - 'window_sizer.cc', - ) - - # Remove Windows-specific files on other platforms. - input_files.Remove( - 'back_forward_menu_model_win.cc', - 'browser_main_win.cc', - 'history/history_publisher_win.cc', - 'importer/firefox_profile_lock_win.cc', - 'importer/ie_importer.cc', - 'js_before_unload_handler_win.cc', - 'jsmessage_box_handler_win.cc', - 'password_manager/ie7_password.cc', - 'password_manager/password_form_manager_win.cc', - 'renderer_host/backing_store_win.cc', - 'renderer_host/render_widget_host_view_win.cc', - 'tab_contents/web_contents_view_win.cc', - 'webdata/web_data_service_win.cc', - 'webdata/web_database_win.cc', - '../tools/build/win/precompiled_wtl.cc', - '../tools/build/win/precompiled_wtl.h', - ) - - # Add files shared across non-Windows platforms. - input_files.Append( - 'importer/firefox_profile_lock_posix.cc', - 'renderer_host/backing_store_x.cc', - ) - - -if env.Bit('linux'): - input_files.Extend([ - 'autocomplete/autocomplete_edit_view_gtk.cc', - 'autocomplete/autocomplete_popup_view_gtk.cc', - 'browser_main_gtk.cc', - 'gtk/back_forward_menu_model_gtk.cc', - 'gtk/browser_toolbar_gtk.cc', - 'gtk/browser_window_factory_gtk.cc', - 'gtk/browser_window_gtk.cc', - 'gtk/custom_button.cc', - 'gtk/dialogs_gtk.cc', - 'gtk/download_item_gtk.cc', - 'gtk/download_shelf_gtk.cc', - 'gtk/find_bar_gtk.cc', - 'gtk/location_bar_view_gtk.cc', - 'gtk/menu_gtk.cc', - 'gtk/nine_box.cc', - 'gtk/standard_menus.cc', - 'gtk/status_bubble_gtk.cc', - 'gtk/tab_contents_container_gtk.cc', - 'gtk/tabs/tab_gtk.cc', - 'gtk/tabs/tab_renderer_gtk.cc', - 'gtk/tabs/tab_strip_gtk.cc', - 'process_singleton_linux.cc', - 'renderer_host/render_widget_host_view_gtk.cc', - 'tab_contents/web_contents_view_gtk.cc', - 'tab_contents/render_view_context_menu_gtk.cc', - ]) - -if env.Bit('mac'): - input_files.Remove( - 'spellchecker.cc', - 'tab_contents/web_contents_view.cc', - ) - -if not env.Bit('mac'): - # Mac-specific files - input_files.Remove( - 'automation/automation_provider_list_mac.mm', - ) - -if env.Bit('windows'): - env.TypeLibrary('history/history_indexer.idl') - - input_files.Remove( - 'history/history_publisher_none.cc', - 'importer/firefox_profile_lock_posix.cc', - ) - -if not env.Bit('mac'): - # TODO: This should work for all platforms. - env.ChromeLibrary('browser', input_files) - -p = env.ChromeMSVSProject('browser.vcproj', - dest='$CHROME_SRC_DIR/chrome/browser/browser.vcproj', - guid='{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}', - keyword='Win32Proj', - root_namespace='Browser', - dependencies = [ - '$LIBXML_DIR/build/libxml_config.vcproj', - '$GOOGLE_UPDATE_DIR/ondemand_updates.vcproj', - '$NET_DIR/build/net_resources.vcproj', - '$CHROME_DIR/app/generated_resources.vcproj', - ], - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - relative_path_prefix='./', - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'Resource text file copy', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - 'VCLibrarianTool', - 'VCALinkTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCPostBuildEventTool', - ], - ConfigurationType='4') - -p.AddToolFile('../tools/build/win/resource_text_file_copy.rules') - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - './browser.vsprops', - '$(SolutionDir)../build/debug.vsprops', - '../tools/build/win/precompiled_wtl.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - './browser.vsprops', - '$(SolutionDir)../build/release.vsprops', - '$(SolutionDir)/tools/build/win/js_engine.vsprops', - ]) - -p.AddFileConfig('../tools/build/win/precompiled_wtl.cc', - 'Debug|Win32', - tools=[ - MSVSTool('VCCLCompilerTool', - UsePrecompiledHeader='1'), - ]) - -p.AddFileConfig('../tools/build/win/precompiled_wtl.cc', - 'Release|Win32', - ExcludedFromBuild='true', - tools=[ - 'VCCLCompilerTool', - ]) - -xmldoc_files = [ - 'net/url_fetcher.cc', - 'net/url_fetcher_protect.cc', - 'net/url_fixer_upper.cc', - 'password_manager/encryptor.cc', - 'search_engines/template_url.cc', - 'search_engines/template_url_fetcher.cc', - 'search_engines/template_url_model.cc', - 'search_engines/template_url_parser.cc', - 'search_engines/template_url_prepopulate_data.cc', - 'ssl/ssl_blocking_page.cc', - 'ssl/ssl_error_info.cc', - 'ssl/ssl_host_state.cc', - 'ssl/ssl_manager.cc', - 'ssl/ssl_policy.cc', - 'tab_contents/interstitial_page.cc', - 'tab_contents/native_ui_contents.cc', - 'tab_contents/navigation_controller.cc', - 'tab_contents/navigation_entry.cc', - 'tab_contents/provisional_load_details.cc', - 'tab_contents/site_instance.cc', - 'tab_contents/web_drag_source.cc', - 'tab_contents/web_drop_target.cc', -] - -xmldoc_tool_list = [ - MSVSTool('VCCLCompilerTool', - XMLDocumentationFileName=('$(IntDir)/$(InputName)1.xdc'), - ObjectFile='$(IntDir)/$(InputName)1.obj'), -] - -for filename in xmldoc_files: - p.AddFileConfig(filename, 'Debug|Win32', xmldoc_tool_list) - p.AddFileConfig(filename, 'Release|Win32', xmldoc_tool_list) diff --git a/chrome/browser/debugger/debugger.scons b/chrome/browser/debugger/debugger.scons deleted file mode 100644 index 0990813..0000000 --- a/chrome/browser/debugger/debugger.scons +++ /dev/null @@ -1,191 +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.SConscript([ - '$BREAKPAD_DIR/using_breakpad.scons', - '$CHROME_DIR/third_party/wtl/using_wtl.scons', - '$CHROME_SRC_DIR/build/using_v8.scons', - '$GRIT_DIR/build/using_generated_resources.scons', - '$ICU38_DIR/using_icu38.scons', - '$LIBPNG_DIR/using_libpng.scons', - '$LIBXML_DIR/using_libxml.scons', - '$NPAPI_DIR/using_npapi.scons', - '$SKIA_DIR/using_skia.scons', - '$ZLIB_DIR/using_zlib.scons', -], {'env':env}) - -env.Prepend( - CPPPATH = [ - '$CHROME_DIR/app', - '$CHROME_SRC_DIR', - ], -) - -input_files = ChromeFileList([ - # TODO(sgk): violate standard indentation so we don't have to - # reindent too much when we remove the explicit MSVSFilter() calls - # in favor of generating the hierarchy to reflect the file system. - MSVSFilter('resources', [ - 'resources/debugger.css', - 'resources/debugger.html', - 'resources/debugger.js', - 'resources/debugger_shell.js', - ]), - 'debugger_host.h', - 'debugger_host_impl.cpp', - 'debugger_host_impl.h', - 'debugger_io.h', - 'debugger_io_socket.cc', - 'debugger_io_socket.h', - 'debugger_node.cc', - 'debugger_node.h', - 'debugger_shell.cc', - 'debugger_shell.h', - 'resources/debugger_resources.h', - 'debugger_view.cc', - 'debugger_view.h', - 'debugger_window.cc', - 'debugger_window.h', - 'debugger_wrapper.cc', - 'debugger_wrapper.h', - 'devtools_client_host.h', - 'devtools_manager.h', - 'devtools_manager.cc', - 'devtools_view.cc', - 'devtools_view.h', - 'devtools_window.h', -]) - -if env.Bit('linux'): - # TODO(port): Port these. - input_files.Remove( - 'debugger_view.cc', - 'debugger_window.cc', - 'devtools_view.cc', - ) - input_files.Append( - 'devtools_window_gtk.cc', - ) - -if env.Bit('mac'): - # TODO(port): Port these. - input_files.Remove( - 'debugger_contents.cc', - 'debugger_host_impl.cpp', - 'debugger_node.cc', - 'debugger_view.cc', - 'debugger_window.cc', - 'devtools_view.cc', - ) - input_files.Append( - 'devtools_window_mac.cc', - ) - - -if not env.Bit('mac'): - # TODO(port): Enable for Mac. - env.ChromeLibrary('debugger', input_files) - - -p = env.ChromeMSVSProject('debugger.vcproj', - dest=('$CHROME_SRC_DIR/chrome/' - + 'browser/debugger/debugger.vcproj'), - guid='{57823D8C-A317-4713-9125-2C91FDFD12D6}', - keyword='Win32Proj', - dependencies = [ - '$CHROME_DIR/app/generated_resources.vcproj', - ], - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - relative_path_prefix='./', - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - 'VCLibrarianTool', - 'VCALinkTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCPostBuildEventTool', - ], - ConfigurationType='4') - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - './debugger.vsprops', - '$(SolutionDir)../build/debug.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - './debugger.vsprops', - '$(SolutionDir)../build/release.vsprops', - ]) - -############################################################################## -# TODO(sgk): move to a separate debugger_disabled.scons file? ############### - -input_files = ChromeFileList([ - 'debugger_contents.cc', - 'debugger_contents.h', - 'debugger_shell.h', - 'debugger_window.cc', - 'debugger_window.h', - 'debugger_wrapper.cc', - 'debugger_wrapper.h', -]) - -p = env.ChromeMSVSProject('debugger_disabled.vcproj', - dest=('$CHROME_SRC_DIR/chrome/' - + 'browser/debugger/debugger_disabled.vcproj'), - guid='{369B9881-3F2C-464D-A96C-E281405DF8F6}', - keyword='Win32Proj', - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - relative_path_prefix='./', - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - 'VCLibrarianTool', - 'VCALinkTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCPostBuildEventTool', - ], - ConfigurationType='4') - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/debug.vsprops', - './debugger_disabled.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/release.vsprops', - './debugger_disabled.vsprops', - ]) diff --git a/chrome/browser/views/SConscript b/chrome/browser/views/SConscript deleted file mode 100644 index 6af89a0..0000000 --- a/chrome/browser/views/SConscript +++ /dev/null @@ -1,475 +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 = [ - '$TARGET_ROOT/grit_derived_sources', - #'$OBJ_ROOT/google_update', - '$OBJ_ROOT/chrome/tools/build/win', - '$CHROME_SRC_DIR', - ], - CPPDEFINES = [ - 'U_STATIC_IMPLEMENTATION', - 'USE_HUNSPELL', - 'HUNSPELL_CHROME_CLIENT', - 'LIBXML_STATIC', - 'PNG_USER_CONFIG', - 'CHROME_PNG_WRITE_SUPPORT', - ], -) - -if env.Bit('windows'): - env.Prepend( - CCFLAGS = [ - '/TP', - ], - ) - -env.Append( - CPPPATH = [ - '$GTEST_DIR/include', - - '$GOOGLE_UPDATE_DIR', - '$CHROME_DIR/third_party/hunspell/src/hunspell', - '$CHROME_DIR/third_party/wtl/include', - '$NPAPI_DIR', - '$LIBXML_DIR/DerivedSources/include', - '$LIBXML_DIR/include', - '$ICU38_DIR/public/common', - '$ICU38_DIR/public/i18n', - '$CHROME_DIR/app', - '$WEBKIT_DIR/build/localized_strings', - '$ZLIB_DIR', - '$SKIA_DIR/include', - '$SKIA_DIR/include/corecg', - '$SKIA_DIR/platform', - '$LIBPNG_DIR', - '$BREAKPAD_DIR/src', - ], -) - -input_files = ChromeFileList([ - # TODO(sgk): violate standard indentation so we don't have to - # reindent too much when we remove the explicit MSVSFilter() calls - # in favor of generating the hierarchy to reflect the file system. - MSVSFilter('Frame', [ - 'frame/aero_glass_frame.cc', - 'frame/aero_glass_frame.h', - 'frame/aero_glass_non_client_view.cc', - 'frame/aero_glass_non_client_view.h', - 'frame/browser_frame.h', - 'frame/browser_view.cc', - 'frame/browser_view.h', - 'frame/browser_window_factory.cc', - 'frame/opaque_frame.cc', - 'frame/opaque_frame.h', - 'frame/opaque_non_client_view.cc', - 'frame/opaque_non_client_view.h', - ]), - MSVSFilter('Info Bars', [ - 'infobars/infobar_container.cc', - 'infobars/infobar_container.h', - 'infobars/infobars.cc', - 'infobars/infobars.h', - ]), - MSVSFilter('Options', [ - 'options/advanced_contents_view.cc', - 'options/advanced_contents_view.h', - 'options/advanced_page_view.cc', - 'options/advanced_page_view.h', - 'options/content_page_view.cc', - 'options/content_page_view.h', - 'options/cookies_view.cc', - 'options/cookies_view.h', - 'options/fonts_languages_window_view.cc', - 'options/fonts_languages_window_view.h', - 'options/fonts_page_view.cc', - 'options/fonts_page_view.h', - 'options/general_page_view.cc', - 'options/general_page_view.h', - 'options/language_combobox_model.cc', - 'options/language_combobox_model.h', - 'options/languages_page_view.cc', - 'options/languages_page_view.h', - 'options/options_group_view.cc', - 'options/options_group_view.h', - 'options/options_page_view.cc', - 'options/options_page_view.h', - 'options/options_window_view.cc', - ]), - MSVSFilter('Tabs', [ - 'tabs/dragged_tab_controller.cc', - 'tabs/dragged_tab_controller.h', - 'tabs/dragged_tab_view.cc', - 'tabs/dragged_tab_view.h', - 'tabs/hwnd_photobooth.cc', - 'tabs/hwnd_photobooth.h', - 'tabs/tab.cc', - 'tabs/tab.h', - 'tabs/tab_renderer.cc', - 'tabs/tab_renderer.h', - 'tabs/tab_strip.cc', - 'tabs/tab_strip.h', - ]), - MSVSFilter('Find Bar', [ - 'find_bar_view.cc', - 'find_bar_view.h', - 'find_bar_win.cc', - 'find_bar_win.h', - ]), - 'about_chrome_view.cc', - 'about_chrome_view.h', - 'about_ipc_dialog.cc', - 'about_ipc_dialog.h', - 'about_network_dialog.cc', - 'about_network_dialog.h', - 'blocked_popup_container.cc', - 'blocked_popup_container.h', - 'bookmark_bar_view.cc', - 'bookmark_bar_view.h', - 'bookmark_bubble_view.cc', - 'bookmark_bubble_view.h', - 'bookmark_editor_view.cc', - 'bookmark_editor_view.h', - 'bookmark_folder_tree_view.cc', - 'bookmark_folder_tree_view.h', - 'bookmark_manager_view.cc', - 'bookmark_manager_view.h', - 'bookmark_table_view.cc', - 'bookmark_table_view.h', - 'bug_report_view.cc', - 'bug_report_view.h', - 'clear_browsing_data.cc', - 'clear_browsing_data.h', - 'constrained_window_impl.cc', - 'constrained_window_impl.h', - 'delay_view.cc', - 'delay_view.h', - 'dom_view.cc', - 'dom_view.h', - 'download_item_view.cc', - 'download_item_view.h', - 'download_shelf_view.cc', - 'download_shelf_view.h', - 'download_started_animation.cc', - 'download_started_animation.h', - 'edit_keyword_controller.cc', - 'edit_keyword_controller.h', - 'event_utils.cc', - 'event_utils.h', - 'external_protocol_dialog.cc', - 'external_protocol_dialog.h', - 'first_run_bubble.cc', - 'first_run_bubble.h', - 'first_run_customize_view.cc', - 'first_run_customize_view.h', - 'first_run_view.cc', - 'first_run_view.h', - 'first_run_view_base.cc', - 'first_run_view_base.h', - 'go_button.cc', - 'go_button.h', - 'html_dialog_view.cc', - 'html_dialog_view.h', - 'hung_renderer_view.cc', - 'hung_renderer_view.h', - 'hwnd_html_view.cc', - 'hwnd_html_view.h', - 'importer_lock_view.cc', - 'importer_lock_view.h', - 'importer_view.cc', - 'importer_view.h', - 'importing_progress_view.cc', - 'importing_progress_view.h', - 'info_bubble.cc', - 'info_bubble.h', - 'input_window.cc', - 'input_window.h', - 'keyword_editor_view.cc', - 'keyword_editor_view.h', - 'location_bar_view.cc', - 'location_bar_view.h', - 'login_view.cc', - 'login_view.h', - 'new_profile_dialog.cc', - 'new_profile_dialog.h', - 'page_info_window.cc', - 'page_info_window.h', - 'password_manager_view.cc', - 'password_manager_view.h', - '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX', - '$CHROME_DIR/tools/build/win/precompiled_wtl.h', - 'restart_message_box.cc', - 'restart_message_box.h', - 'sad_tab_view.cc', - 'sad_tab_view.h', - 'select_profile_dialog.cc', - 'select_profile_dialog.h', - 'shelf_item_dialog.cc', - 'shelf_item_dialog.h', - 'shell_dialogs_win.cc', - 'standard_layout.h', - 'star_toggle.cc', - 'star_toggle.h', - 'status_bubble.cc', - 'status_bubble.h', - 'tab_contents_container_view.cc', - 'tab_contents_container_view.h', - 'tab_icon_view.cc', - 'tab_icon_view.h', - 'theme_helpers.cc', - 'theme_helpers.h', - 'toolbar_star_toggle.cc', - 'toolbar_star_toggle.h', - 'toolbar_view.cc', - 'toolbar_view.h', - 'user_data_dir_dialog.cc', - 'user_data_dir_dialog.h', -]) - -if env.Bit('linux'): - # TODO(port): Port to Linux. - input_files.Remove( - 'about_chrome_view.cc', - 'about_ipc_dialog.cc', - 'about_network_dialog.cc', - 'blocked_popup_container.cc', - 'bookmark_bar_view.cc', - 'bookmark_bubble_view.cc', - 'bookmark_editor_view.cc', - 'bookmark_folder_tree_view.cc', - 'bookmark_manager_view.cc', - 'bookmark_table_view.cc', - 'bug_report_view.cc', - 'clear_browsing_data.cc', - 'constrained_window_impl.cc', - 'delay_view.cc', - 'dom_view.cc', - 'download_item_view.cc', - 'download_shelf_view.cc', - 'download_started_animation.cc', - 'edit_keyword_controller.cc', - 'external_protocol_dialog.cc', - 'find_bar_view.cc', - 'first_run_bubble.cc', - 'first_run_customize_view.cc', - 'first_run_view.cc', - 'first_run_view_base.cc', - 'frame/aero_glass_frame.cc', - 'frame/aero_glass_non_client_view.cc', - 'frame/browser_view.cc', - 'frame/browser_window_factory.cc', - 'frame/opaque_frame.cc', - 'frame/opaque_non_client_view.cc', - 'go_button.cc', - 'html_dialog_view.cc', - 'hung_renderer_view.cc', - 'hwnd_html_view.cc', - 'importer_lock_view.cc', - 'importer_view.cc', - 'importing_progress_view.cc', - 'info_bubble.cc', - 'infobars/infobar_container.cc', - 'infobars/infobars.cc', - 'input_window.cc', - 'keyword_editor_view.cc', - 'location_bar_view.cc', - 'login_view.cc', - 'new_profile_dialog.cc', - 'options/advanced_contents_view.cc', - 'options/advanced_page_view.cc', - 'options/content_page_view.cc', - 'options/cookies_view.cc', - 'options/fonts_languages_window_view.cc', - 'options/fonts_page_view.cc', - 'options/general_page_view.cc', - 'options/language_combobox_model.cc', - 'options/languages_page_view.cc', - 'options/options_group_view.cc', - 'options/options_page_view.cc', - 'options/options_window_view.cc', - 'page_info_window.cc', - 'password_manager_view.cc', - 'restart_message_box.cc', - 'select_profile_dialog.cc', - 'shelf_item_dialog.cc', - 'shell_dialogs_win.cc', - 'star_toggle.cc', - 'status_bubble.cc', - 'tab_contents_container_view.cc', - 'tab_icon_view.cc', - 'tabs/dragged_tab_controller.cc', - 'tabs/dragged_tab_view.cc', - 'tabs/hwnd_photobooth.cc', - 'tabs/tab.cc', - 'tabs/tab_renderer.cc', - 'tabs/tab_strip.cc', - 'theme_helpers.cc', - 'toolbar_star_toggle.cc', - 'toolbar_view.cc', - 'user_data_dir_dialog.cc', - ) - -if env.Bit('mac'): - # TODO(port): Port to Mac. - input_files.Remove( - 'about_chrome_view.cc', - 'about_ipc_dialog.cc' - 'about_network_dialog.cc' - 'blocked_popup_container.cc', - 'bookmark_bar_view.cc', - 'bookmark_bubble_view.cc', - 'bookmark_editor_view.cc', - 'bookmark_folder_tree_view.cc', - 'bookmark_manager_view.cc', - 'bookmark_table_view.cc', - 'bug_report_view.cc', - 'clear_browsing_data.cc', - 'constrained_window_impl.cc', - 'delay_view.cc', - 'dom_view.cc', - 'download_item_view.cc', - 'download_shelf_view.cc', - 'download_started_animation.cc', - 'edit_keyword_controller.cc', - 'event_utils.cc', - 'external_protocol_dialog.cc', - 'find_bar_view.cc', - 'first_run_bubble.cc', - 'first_run_customize_view.cc', - 'first_run_view.cc', - 'first_run_view_base.cc', - 'frame/aero_glass_frame.cc', - 'frame/aero_glass_non_client_view.cc', - 'frame/browser_view.cc', - 'frame/browser_window_factory.cc', - 'frame/opaque_frame.cc', - 'frame/opaque_non_client_view.cc', - 'go_button.cc', - 'html_dialog_view.cc', - 'hung_renderer_view.cc', - 'hwnd_html_view.cc', - 'importer_lock_view.cc', - 'importer_view.cc', - 'importing_progress_view.cc', - 'info_bubble.cc', - 'infobars/infobar_container.cc', - 'infobars/infobars.cc', - 'input_window.cc', - 'keyword_editor_view.cc', - 'location_bar_view.cc', - 'login_view.cc', - 'new_profile_dialog.cc', - 'options/advanced_contents_view.cc', - 'options/advanced_page_view.cc', - 'options/content_page_view.cc', - 'options/cookies_view.cc', - 'options/fonts_languages_window_view.cc', - 'options/fonts_page_view.cc', - 'options/general_page_view.cc', - 'options/language_combobox_model.cc', - 'options/languages_page_view.cc', - 'options/options_group_view.cc', - 'options/options_page_view.cc', - 'options/options_window_view.cc', - 'page_info_window.cc', - 'password_manager_view.cc', - 'restart_message_box.cc', - 'sad_tab_view.cc', - 'select_profile_dialog.cc', - 'shelf_item_dialog.cc', - 'shell_dialogs_win.cc', - 'star_toggle.cc', - 'status_bubble.cc', - 'tab_contents_container_view.cc', - 'tab_icon_view.cc', - 'tabs/dragged_tab_controller.cc', - 'tabs/dragged_tab_view.cc', - 'tabs/hwnd_photobooth.cc', - 'tabs/tab.cc', - 'tabs/tab_renderer.cc', - 'tabs/tab_strip.cc', - 'theme_helpers.cc', - 'toolbar_star_toggle.cc', - 'toolbar_view.cc', - 'user_data_dir_dialog.cc', - ) - -if not env.Bit('windows'): - input_files.Remove( - 'find_bar_win.cc', - '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX', - '$CHROME_DIR/tools/build/win/precompiled_wtl.h', - ) - -env.ChromeLibrary('browser_views', input_files) - -p = env.ChromeMSVSProject('browser_views.vcproj', - dest=('$CHROME_SRC_DIR/chrome/' - + 'browser/views/browser_views.vcproj'), - root_namespace='Browser_views', - guid='{FA537565-7B03-4FFC-AF15-F7A979B72E22}', - keyword='Win32Proj', - dependencies = [ - '$LIBXML_DIR/build/libxml_config.vcproj', - '$GOOGLE_UPDATE_DIR/ondemand_updates.vcproj', - '$CHROME_DIR/app/generated_resources.vcproj', - ], - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - relative_path_prefix='./', - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - 'VCLibrarianTool', - 'VCALinkTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCPostBuildEventTool', - ], - ConfigurationType='4') - - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - '../browser.vsprops', - '$(SolutionDir)../build/debug.vsprops', - '../../tools/build/win/precompiled_wtl.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '../browser.vsprops', - '$(SolutionDir)../build/release.vsprops', - '$(SolutionDir)/tools/build/win/js_engine.vsprops', - ]) - -p.AddFileConfig('../../tools/build/win/precompiled_wtl.cc', - 'Debug|Win32', - tools=[ - MSVSTool('VCCLCompilerTool', - UsePrecompiledHeader='1'), - ]) - -p.AddFileConfig('../../tools/build/win/precompiled_wtl.cc', - 'Release|Win32', - ExcludedFromBuild='true', - tools=[ - 'VCCLCompilerTool', - ]) diff --git a/chrome/chrome_main.scons b/chrome/chrome_main.scons deleted file mode 100644 index 75e3090..0000000 --- a/chrome/chrome_main.scons +++ /dev/null @@ -1,100 +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. - -__doc__ = """ -Master configuration for building chrome components. -""" - -Import('env') - -# Arrange for Hammer to add all programs to the 'chrome' Alias. -env.Append( - COMPONENT_PROGRAM_GROUPS = ['chrome'], - COMPONENT_TEST_PROGRAM_GROUPS = ['chrome'], - STATIC_AND_SHARED_OBJECTS_ARE_THE_SAME = 1, -) - - -# TODO(sgk): move the ChromeVersionRC builder into a Tool module -def chrome_version_emitter(target, source, env): - source.append(env.File('$CHROME_SRC_DIR/chrome/VERSION')) - # TODO(sgk): parameterize for chromium-vs.-google_chrome - source.append(env.File('$CHROME_SRC_DIR/chrome/' - + 'app/theme/google_chrome/BRANDING')) - return target, source - -b = Builder(action = '$CHROME_VERSION_RC_COM', - emitter = chrome_version_emitter) - -env['BUILDERS']['ChromeVersionRC'] = b - -env.Replace( - # NOTE: the / after $CHROME_SRC_DIR/chrome/ is required because - # version.bat assumes a path with a trailing slash. - CHROME_VERSION_RC_COM = - '$VERSION_BAT $SOURCE $CHROME_SRC_DIR/chrome/ $PWD $TARGET', - VERSION_BAT = env.File( - '$CHROME_SRC_DIR/chrome/tools/build/win/version.bat'), - PWD = Dir('.'), -) - - -sconscript_files = env.ChromiumLoadComponentSConscripts( - 'SConscript', - - LOAD_NAMES = ['chrome'], - - chrome_sln = 'chrome_sln.scons', - - locales = 'app/locales/locales.scons', - chrome_resources = 'app/chrome_resources.scons', - chrome_strings = 'app/chrome_strings.scons', - theme_dll = 'app/theme/theme_dll.scons', - - browser = 'browser/browser.scons', - debugger = 'browser/debugger/debugger.scons', - - common = 'common/common.scons', - ipc_tests = 'common/ipc_tests.scons', - - #gcapi_dll = 'installer/gcapi/gcapi_dll.scons', - #gcapi_lib = 'installer/gcapi/gcapi_lib.scons', - #gcapi_test = 'installer/gcapi/gcapi_test.scons', - mini_installer = 'installer/mini_installer/mini_installer.scons', - setup = 'installer/setup/setup.scons', - #installer_unittests = 'installer/util/installer_unittests.scons', - util = 'installer/util/util.scons', - installer_unittests = 'installer/util/installer_unittests.scons', - - plugin = 'plugin/plugin.scons', - - renderer = 'renderer/renderer.scons', - - activex_test_controls = - 'test/activex_test_control/activex_test_control.scons', - automated_ui_tests = 'test/automated_ui_tests/automated_ui_tests.scons', - automtion = 'test/automation/automation.scons', - test_chrome_plugin = 'test/chrome_plugin/test_chrome_plugin.scons', - interactive_ui_tests = 'test/interactive_ui/interactive_ui_tests.scons', - memory_test = 'test/memory_test/memory_test.scons', - mini_installer_test = 'test/mini_installer_test/mini_installer_test.scons', - page_cycler_tests = 'test/page_cycler/page_cycler_tests.scons', - perf_tests = 'test/perf/perftests.scons', - plugin_tests = 'test/plugin/plugin_tests.scons', - reliability_tests = 'test/reliability/reliability_tests.scons', - security_tests = 'test/security_tests/security_tests.scons', - selenium_tests = 'test/selenium/selenium_tests.scons', - startup_tests = 'test/startup/startup_tests.scons', - tab_switching_test = 'test/tab_switching/tab_switching_test.scons', - ui_tests = 'test/ui/ui_tests.scons', - unit_tests = 'test/unit/unit_tests.scons', - - convert_dict = 'tools/convert_dict/convert_dict.scons', - crash_service = 'tools/crash_service/crash_service.scons', - flush_cache = 'tools/perf/flush_cache/flush_cache.scons', - generate_profile = 'tools/profiles/generate_profile.scons', - image_diff = 'tools/test/image_diff/image_diff.scons', -) - -SConscript(sconscript_files, exports=['env']) diff --git a/chrome/chrome_sln.scons b/chrome/chrome_sln.scons deleted file mode 100644 index b025320..0000000 --- a/chrome/chrome_sln.scons +++ /dev/null @@ -1,547 +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. - -__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', - dependencies = [ - '$GOOGLE_UPDATE_DIR/ondemand_updates.vcproj', - ], - guid='{B802A2FE-E4E2-4F5A-905A-D5128875C954}') - -env.ChromeMSVSProject('$CHROME_DIR/installer/gcapi/gcapi_lib.vcproj', - dependencies = [ - '$GOOGLE_UPDATE_DIR/ondemand_updates.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', - '$NET_DIR/build/net_resources.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', - dest='$CHROME_SRC_DIR/chrome/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', - '$NET_DIR/build/net_resources.vcproj', - ], - variants = [ - 'Debug|Win32', - 'Release|Win32', - ]) diff --git a/chrome/common/common.scons b/chrome/common/common.scons deleted file mode 100644 index 66b9add..0000000 --- a/chrome/common/common.scons +++ /dev/null @@ -1,371 +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.SConscript([ - '$BREAKPAD_DIR/using_breakpad.scons', - '$CHROME_DIR/third_party/wtl/using_wtl.scons', - '$GRIT_DIR/build/using_generated_resources.scons', - '$ICU38_DIR/using_icu38.scons', - '$LIBJPEG_DIR/using_libjpeg.scons', - '$LIBPNG_DIR/using_libpng.scons', - '$LIBXML_DIR/using_libxml.scons', - '$NPAPI_DIR/using_npapi.scons', - '$SKIA_DIR/using_skia.scons', - '$ZLIB_DIR/using_zlib.scons', -], {'env':env}) - -env.Prepend( - CPPPATH = [ - '$CHROME_DIR/app', - '$CHROME_SRC_DIR', - ], -) - -env.Append( - CPPPATH = [ - '$WEBKIT_DIR/build/localized_strings', - ], -) - -if env.Bit('windows'): - env.Prepend( - CPPPATH = [ - '$CHROME_DIR/tools/build/win', - ], - ) - -input_files = ChromeFileList([ - # TODO(sgk): violate standard indentation so we don't have to - # reindent too much when we remove the explicit MSVSFilter() calls - # in favor of generating the hierarchy to reflect the file system. - MSVSFilter('extensions', [ - 'extensions/url_pattern.cc', - 'extensions/url_pattern.h', - 'extensions/user_script.cc', - 'extensions/user_script.h', - ]), - MSVSFilter('net', [ - 'net/cookie_monster_sqlite.cc', - 'net/cookie_monster_sqlite.h', - 'net/dns.h', - 'net/url_request_intercept_job.cc', - 'net/url_request_intercept_job.h', - ]), - MSVSFilter('gfx', [ - 'gfx/chrome_canvas.cc', - 'gfx/chrome_canvas.h', - 'gfx/chrome_canvas_skia.cc', - 'gfx/chrome_canvas_win.cc', - 'gfx/chrome_font.h', - 'gfx/chrome_font_gtk.cc', - 'gfx/chrome_font_skia.cc', - 'gfx/chrome_font_win.cc', - 'gfx/color_utils.cc', - 'gfx/color_utils.h', - 'gfx/emf.cc', - 'gfx/emf.h', - 'gfx/favicon_size.h', - 'gfx/icon_util.cc', - 'gfx/icon_util.h', - 'gfx/insets.h', - 'gfx/path_gtk.cc', - 'gfx/path_win.cc', - 'gfx/path.h', - 'gfx/text_elider.cc', - 'gfx/text_elider.h', - 'gfx/utils.h', - ]), - MSVSFilter('ipc', [ - 'ipc_channel.h', - 'ipc_channel_posix.cc', - 'ipc_channel_proxy.cc', - 'ipc_channel_proxy.h', - 'ipc_channel_win.cc', - 'ipc_logging.cc', - 'ipc_logging.h', - 'ipc_message.cc', - 'ipc_message.h', - 'ipc_message_macros.h', - 'ipc_message_utils.cc', - 'ipc_message_utils.h', - 'ipc_sync_channel.cc', - 'ipc_sync_channel.h', - 'ipc_sync_message.cc', - 'ipc_sync_message.h', - 'plugin_messages.h', - 'plugin_messages_internal.h', - 'render_messages.h', - 'render_messages_internal.h', - 'worker_messages.h', - 'worker_messages_internal.h', - ]), - 'accessibility.h', - 'animation.cc', - 'animation.h', - 'bindings_policy.h', - 'child_process.cc', - 'child_process.h', - 'child_process_host.cc', - 'child_process_host.h', - 'child_process_info.cc', - 'child_process_info.h', - 'child_thread.cc', - 'child_thread.h', - 'chrome_constants.cc', - 'chrome_constants.h', - 'chrome_counters.cc', - 'chrome_counters.h', - 'chrome_paths.cc', - 'chrome_paths.h', - 'chrome_paths_internal.h', - 'chrome_paths_linux.cc', - 'chrome_paths_mac.cc', - 'chrome_paths_win.cc', - 'chrome_plugin_api.h', - 'chrome_plugin_lib.cc', - 'chrome_plugin_lib.h', - 'chrome_plugin_util.cc', - 'chrome_plugin_util.h', - 'chrome_process_filter.cc', - 'chrome_process_filter.h', - 'chrome_switches.cc', - 'chrome_switches.h', - 'classfactory.cc', - 'classfactory.h', - 'clipboard_service.h', - 'common_glue.cc', - 'common_resources.h', - 'debug_flags.cc', - 'debug_flags.h', - 'drag_drop_types.cc', - 'drag_drop_types.h', - 'env_vars.cc', - 'env_vars.h', - 'filter_policy.h', - 'gears_api.h', - 'json_value_serializer.cc', - 'json_value_serializer.h', - 'jstemplate_builder.cc', - 'jstemplate_builder.h', - 'l10n_util.cc', - 'l10n_util.h', - 'l10n_util_posix.cc', - 'libxml_utils.cc', - 'libxml_utils.h', - 'logging_chrome.cc', - 'logging_chrome.h', - 'main_function_params.h', - 'message_router.cc', - 'message_router.h', - 'mru_cache.h', - 'native_web_keyboard_event.h', - 'native_web_keyboard_event_linux.cc', - 'navigation_types.h', - 'notification_details.h', - 'notification_registrar.cc', - 'notification_registrar.h', - 'notification_service.cc', - 'notification_service.h', - 'notification_source.h', - 'notification_types.h', - 'os_exchange_data.cc', - 'os_exchange_data.h', - 'owned_widget_gtk.cc', - 'owned_widget_gtk.h', - 'page_transition_types.h', - 'page_zoom.h', - 'platform_util.h', - 'platform_util_linux.cc', - 'platform_util_mac.mm', - 'platform_util_win.cc', - '$CHROME_DIR/tools/build/win/precompiled$OBJSUFFIX', - '$CHROME_DIR/tools/build/win/precompiled.h', - 'pref_member.cc', - 'pref_member.h', - 'pref_names.cc', - 'pref_names.h', - 'pref_service.cc', - 'pref_service.h', - 'process_watcher.cc', - 'process_watcher.h', - 'property_bag.cc', - 'property_bag.h', - 'ref_counted_util.h', - 'resource_bundle.cc', - 'resource_bundle.h', - 'resource_bundle_linux.cc', - 'resource_bundle_win.cc', - 'resource_dispatcher.cc', - 'resource_dispatcher.h', - 'sandbox_init_wrapper.cc', - 'sandbox_init_wrapper.h', - 'scoped_vector.h', - 'security_filter_peer.cc', - 'security_filter_peer.h', - 'slide_animation.cc', - 'slide_animation.h', - 'sqlite_compiled_statement.cc', - 'sqlite_compiled_statement.h', - 'sqlite_utils.cc', - 'sqlite_utils.h', - 'stl_util-inl.h', - 'task_queue.cc', - 'task_queue.h', - 'throb_animation.cc', - 'throb_animation.h', - 'thumbnail_score.cc', - 'thumbnail_score.h', - 'time_format.cc', - 'time_format.h', - 'unzip.cc', - 'unzip.h', - 'url_constants.cc', - 'url_constants.h', - 'visitedlink_common.cc', - 'visitedlink_common.h', - 'win_safe_util.cc', - 'win_safe_util.h', - 'win_util.cc', - 'win_util.h', - 'worker_thread_ticker.cc', - 'worker_thread_ticker.h', -]) - -if not env.Bit('windows'): - # TODO(port): This is temporary so we can link. - input_files.Append( - 'temp_scaffolding_stubs.cc', - 'file_descriptor_set_posix.cc', - ) - - # TODO(port): Port these. - input_files.Remove( - 'chrome_process_filter.cc', - 'drag_drop_types.cc', - 'gfx/emf.cc', - 'gfx/icon_util.cc', - 'os_exchange_data.cc', - 'process_watcher.cc', - ) - -if not env.Bit('windows'): - # Windows specific files - input_files.Remove( - 'chrome_paths_win.cc', - 'classfactory.cc', - 'gfx/chrome_canvas_win.cc', - 'gfx/chrome_font_win.cc', - 'gfx/path_win.cc', - 'ipc_channel_win.cc', - 'platform_util_win.cc', - 'resource_bundle_win.cc', - 'win_safe_util.cc', - 'win_util.cc', - '$CHROME_DIR/tools/build/win/precompiled$OBJSUFFIX', - ) - -if not env.Bit('linux'): - # Linux specific files - input_files.Remove( - 'chrome_paths_linux.cc', - 'gfx/chrome_canvas_skia.cc', - 'gfx/chrome_font_gtk.cc', - 'gfx/chrome_font_skia.cc', - 'gfx/path_gtk.cc', - 'owned_widget_gtk.cc', - 'owned_widget_gtk.h', - 'platform_util_linux.cc', - 'resource_bundle_linux.cc', - ) - -if not env.Bit('mac'): - # Mac specific files - input_files.Remove( - 'chrome_paths_mac.cc', - 'platform_util_mac.mm', - ) - -if not env.Bit('posix'): - input_files.Remove( - 'ipc_channel_posix.cc', - 'l10n_util_posix.cc', - ) - -if env.Bit('windows'): - input_files.Append( - 'transport_dib_win.cc' - ) - -if env.Bit('linux'): - input_files.Append( - '$CHROME_DIR/third_party/xdg_user_dirs/xdg_user_dir_lookup.cc', - 'transport_dib_linux.cc', - 'x11_util.cc' - ) - -if env.Bit('mac'): - input_files.Append( - 'transport_dib_mac.cc' - ) - -if not env.Bit('mac'): - # TODO(port): This should be enabled for all platforms. - env.ChromeLibrary('common', input_files) - -p = env.ChromeMSVSProject('common.vcproj', - dest='$CHROME_SRC_DIR/chrome/common/common.vcproj', - guid='{899F1280-3441-4D1F-BA04-CCD6208D9146}', - keyword='Win32Proj', - dependencies = [ - '$LIBXML_DIR/build/libxml_config.vcproj', - '$CHROME_DIR/app/generated_resources.vcproj', - ], - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - relative_path_prefix='./', - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - 'VCLibrarianTool', - 'VCALinkTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCPostBuildEventTool', - ], - ConfigurationType='4') - - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - './common.vsprops', - '$(SolutionDir)../build/debug.vsprops', - '../tools/build/win/precompiled.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - './common.vsprops', - '$(SolutionDir)../build/release.vsprops', - ]) - -p.AddFileConfig('../tools/build/win/precompiled.cc', - 'Debug|Win32', - tools=[ - MSVSTool('VCCLCompilerTool', - UsePrecompiledHeader='1'), - ]) diff --git a/chrome/common/ipc_tests.scons b/chrome/common/ipc_tests.scons deleted file mode 100644 index aaa926284..0000000 --- a/chrome/common/ipc_tests.scons +++ /dev/null @@ -1,187 +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 = env.Clone() - -env.SConscript([ - '$BASE_DIR/using_base.scons', - '$BASE_DIR/gfx/using_base_gfx.scons', # needed for logging - '$CHROME_SRC_DIR/build/using_googleurl.scons', # needed for logging - '$BREAKPAD_DIR/using_breakpad.scons', - '$CHROME_DIR/third_party/wtl/using_wtl.scons', - '$GTEST_DIR/../using_gtest.scons', - '$ICU38_DIR/using_icu38.scons', - '$LIBJPEG_DIR/using_libjpeg.scons', - '$LIBPNG_DIR/using_libpng.scons', - '$LIBXML_DIR/using_libxml.scons', - '$NET_DIR/using_net.scons', # needed for logging - '$NPAPI_DIR/using_npapi.scons', - '$SKIA_DIR/using_skia.scons', - '$ZLIB_DIR/using_zlib.scons', -], {'env':env}) - -# needed for logging -env.Append( - LIBS = [ - 'glue', - 'WTF', - 'WebKit', - - 'bzip2', - 'X11', - 'Xrender', - 'Xext', - - 'media', - 'sdch', - 'views', - - 'hunspell', - 'printing', - 'modp_b64', - 'debugger', - ], -) - -if env.Bit('posix'): - env.SConscript([ - '$LIBEVENT_DIR/using_libevent.scons', - '$CHROME_SRC_DIR/build/using_v8.scons', # needed for shared link deps - '$LIBXSLT_DIR/using_libxslt.scons', # needed for shared link deps - ], {'env':env}) - # needed for shared link deps - env.Append( - LIBS = [ - 'JavaScriptCore_pcre', - 'V8Bindings', - 'WebCore', - 'browser', - 'port', - 'renderer', - 'sqlite', - ] - ) - -# TODO(sgk): convert into a using_*.scons pattern when we update WebKit. -env.Append( - CPPPATH = [ - '$WEBKIT_DIR/build/localized_strings', - ], -) - -env.Prepend( - CPPPATH = [ - '$CHROME_DIR/app/resources', - '$CHROME_DIR/app', - '$CHROME_SRC_DIR', - ], - LIBS = [ - 'common', - ] -) - -if env.Bit('windows'): - env.Prepend( - CPPPATH = [ - '$CHROME_DIR/tools/build/win', - ], - ) - -if env.Bit('windows'): - env.Append( - LINKFLAGS = [ - '/INCREMENTAL', - - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"uxtheme.dll"', - - '/DEBUG', - '/MACHINE:X86', - '/FIXED:No', - ], - LIBS = [ - 'rpcrt4', - 'shlwapi', - 'winmm', - ], - ) - -input_files = ChromeFileList([ - 'ipc_fuzzing_tests.cc', - 'ipc_send_fds_test.cc', - 'ipc_tests.cc', - 'ipc_tests.h', - '$BASE_DIR/perftimer$OBJSUFFIX', -]) - -ipc_tests = env.ChromeTestProgram('ipc_tests', input_files) -i = env.Install('$TARGET_ROOT', ipc_tests) -Alias('chrome', i) - -p = env.ChromeMSVSProject('ipc_tests.vcproj', - dest='$CHROME_SRC_DIR/chrome/common/ipc_tests.vcproj', - guid='{B92AE829-E1CD-4781-824A-DCB1603A1672}', - keyword='Win32Proj', - dependencies = [ - '$BASE_DIR/build/base.vcproj', - '$CHROME_DIR/common/common.vcproj', - '$ICU38_DIR/build/icu.vcproj', - '$TESTING_DIR/gtest.vcproj', - ], - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - local_directory_prefix='./', - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - MSVSTool('VCLinkerTool', - AdditionalDependencies=[ - 'shlwapi.lib', - 'rpcrt4.lib', - 'winmm.lib' - ], - SubSystem='1'), - 'VCALinkTool', - 'VCManifestTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCAppVerifierTool', - 'VCWebDeploymentTool', - 'VCPostBuildEventTool', - ], - ConfigurationType='1') - - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/debug.vsprops', - '$(SolutionDir)../skia/using_skia.vsprops', - '$(SolutionDir)../testing/using_gtest.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/release.vsprops', - '$(SolutionDir)../skia/using_skia.vsprops', - '$(SolutionDir)../testing/using_gtest.vsprops', - ]) diff --git a/chrome/installer/mini_installer/mini_installer.scons b/chrome/installer/mini_installer/mini_installer.scons deleted file mode 100644 index c4c4ae8..0000000 --- a/chrome/installer/mini_installer/mini_installer.scons +++ /dev/null @@ -1,232 +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.ApplySConscript([ - '$GTEST_DIR/../using_gtest.scons', -]) - - -# TODO(port): Don't be too fooled by the presence of all the -# if env.Bit('windows') tests in this file into thinking -# this is necessarily portable. They're just there to wall off the -# obviously windows-specific things - -if env.Bit('windows'): - env_res = env.Clone() - - env_res.Append( - CPPPATH = [ - "$DESTINATION_ROOT", - ".", - "$CHROME_SRC_DIR", - ], - RCFLAGS = [ - ["/l", "0x409"], - ], - ) - - resources = env_res.RES('mini_installer.rc') - - -env.Prepend( - CPPPATH = [ - '$CHROME_SRC_DIR', - ], - LIBS = [ - 'chrome', - ], -) - -if env.Bit('windows'): - env.FilterOut( - LIBS = ['DelayImp.lib'], - CCFLAGS = ['/RTC1'], - ) - - env.Prepend( - CCFLAGS = [ - '/TP', - '/GS-', # because we link with /NODEFAULTLIB - ], - LINKFLAGS = [ - '/INCREMENTAL', - '/NODEFAULTLIB', - '/DEBUG', - '/SUBSYSTEM:WINDOWS', - '/OPT:NOWIN98', - '/ENTRY:"MainEntryPoint"', - '/MACHINE:X86', - '/FIXED:No', - - '/SAFESEH:NO', - '/NXCOMPAT', - '/DYNAMICBASE:NO', - - '/PDB:${TARGETS[1]}', - #'/MAP:${TARGETS[2]}', - ], - LIBS = [ - 'shlwapi', - ], - ) - -input_files = ChromeFileList([ - # TODO(sgk): violate standard indentation so we don't have to - # reindent too much when we remove the explicit MSVSFilter() calls - # in favor of generating the hierarchy to reflect the file system. - MSVSFilter('resources', [ - 'mini_installer.ico', - 'mini_installer.rc', - 'mini_installer_exe_version.rc.version', - 'mini_installer_resource.h', - ]), - 'chrome.release', - 'mini_installer.cc', - 'mini_installer.h', - 'pe_resource.cc', - 'pe_resource.h', -]) - -if env.Bit('windows'): - additional_dependencies = [ - "$VISUAL_STUDIO/VC/crt/src/intel/mt_lib/memset.obj", - "$VISUAL_STUDIO/VC/crt/src/intel/mt_lib/P4_memset.obj", - ] - -# TODO(port): -if env.Bit('windows'): - env.ChromeProgram('mini_installer', - input_files + additional_dependencies + resources) - - -env.AppendENVPath('PATH', r'C:\WINDOWS\system32') - -# 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) - - -# 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) - -p = env.ChromeMSVSProject('mini_installer.vcproj', - dest=('$CHROME_SRC_DIR/chrome/installer/' - + 'mini_installer/mini_installer.vcproj'), - guid='{24A5AC7C-280B-4899-9153-6BA570A081E7}', - keyword='Win32Proj', - 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', - ], - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - relative_path_prefix='./', - tools=[ - MSVSTool('create installer archive', - LastChromeInstaller='$(LAST_CHROME_INSTALLER)', - LastChromeVersion='$(LAST_CHROME_VERSION)', - SkipRebuildArchive='$(SKIP_REBUILD_CHROME_ARCHIVE)' - ), - 'Version', - 'VCCLCompilerTool', - 'VCResourceCompilerTool', - 'VCLinkerTool', - 'VCManifestTool', - ], - ConfigurationType='1') - -p.AddToolFile('$CHROME_DIR/tools/build/win/release.rules') -p.AddToolFile('$CHROME_DIR/tools/build/win/version.rules') - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - './mini_installer_debug.vsprops', - '$(SolutionDir)../testing/using_gtest.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - './mini_installer_release.vsprops', - '$(SolutionDir)../testing/using_gtest.vsprops', - ]) diff --git a/chrome/installer/setup/setup.scons b/chrome/installer/setup/setup.scons deleted file mode 100644 index 260d0e6..0000000 --- a/chrome/installer/setup/setup.scons +++ /dev/null @@ -1,147 +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.ApplySConscript([ - '$BASE_DIR/using_base.scons', - '$BSPATCH_DIR/using_bspatch.scons', - '$ICU38_DIR/using_icu38.scons', - '$LZMA_SDK_DIR/using_lzma_sdk.scons', -]) - -if env.Bit('windows'): - env_res = env.Clone() - - env_res.Append( - CPPPATH = [ - ".", - "$CHROME_SRC_DIR", - "$CHROME_DIR/installer/util", - ], - RCFLAGS = [ - ["/l", "0x409"], - ], - ) - - resources = env_res.RES('setup.rc') - - # TODO(sgk): implicit dependency should be picked up automatically - env_res.Depends(resources, - '$CHROME_DIR/installer/util/installer_util_strings.rc') - - -env.Prepend( - CPPPATH = [ - '../util', - '.', - '$CHROME_SRC_DIR', - ], - LIBS = [ - 'common', - 'util', - ], -) - -if env.Bit('windows'): - env.Prepend( - LINKFLAGS = [ - '/INCREMENTAL', - '/DEBUG', - - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"uxtheme.dll"', - - '/OPT:NOWIN98', - '/SUBSYSTEM:WINDOWS', - '/MACHINE:X86', - '/FIXED:No', - - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - - '/PDB:${TARGETS[1]}', - ], - LIBS = [ - 'msi', - ], - ) - -input_files = ChromeFileList([ - # TODO(sgk): violate standard indentation so we don't have to - # reindent too much when we remove the explicit MSVSFilter() calls - # in favor of generating the hierarchy to reflect the file system. - MSVSFilter('resources', [ - 'setup.ico', - 'setup.rc', - 'setup_exe_version.rc.version', - 'setup_resource.h', - ]), - 'install.cc', - 'main.cc', - 'setup.cc', - 'setup.h', - 'setup_constants.cc', - 'setup_constants.h', - 'uninstall.cc', - 'uninstall.h', -]) - -# TODO(port): -if env.Bit('windows'): - env.ChromeProgram('setup', resources + input_files[1:]) - -p = env.ChromeMSVSProject('setup.vcproj', - dest=('$CHROME_SRC_DIR/chrome/' - + 'installer/setup/setup.vcproj'), - guid='{21C76E6E-8B38-44D6-8148-B589C13B9554}', - keyword='Win32Proj', - 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', - ], - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - relative_path_prefix='./', - tools=[ - 'Version', - 'VCCLCompilerTool', - 'VCResourceCompilerTool', - 'VCLinkerTool', - 'VCManifestTool', - ], - ConfigurationType='1') - -p.AddToolFile('$CHROME_DIR/tools/build/win/version.rules') - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - './setup_debug.vsprops', - '$(SolutionDir)installer/util/using_util.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - './setup_release.vsprops', - '$(SolutionDir)installer/util/using_util.vsprops', - ]) - -# TODO(port): -if env.Bit('windows'): - exe_version_rc = env.ChromeVersionRC('setup_exe_version.rc', - 'setup_exe_version.rc.version', - PWD = env.Dir('.')) - - # TODO(sgk): implicit dependency should be picked up automatically - env_res.Depends(resources, exe_version_rc) diff --git a/chrome/installer/util/installer_unittests.scons b/chrome/installer/util/installer_unittests.scons deleted file mode 100644 index f5e4b1f..0000000 --- a/chrome/installer/util/installer_unittests.scons +++ /dev/null @@ -1,136 +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.ApplySConscript([ - '$BASE_DIR/using_base.scons', - '$GTEST_DIR/../using_gtest.scons', - '$ICU38_DIR/using_icu38.scons', -]) - -env.Prepend( - CPPPATH = [ - '$CHROME_SRC_DIR', - ], - LIBS = [ - 'common', - 'util', - ], -) - -if env.Bit('windows'): - env.FilterOut( - LIBS = ['DelayImp.lib'], - ) - - env.Prepend( - LINKFLAGS = [ - '/INCREMENTAL', - '/DEBUG', - - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"uxtheme.dll"', - - '/MACHINE:X86', - '/FIXED:No', - - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - ], - LIBS = [ - 'comsupp', - 'oleacc', - 'rpcrt4', - 'shlwapi', - ], - ) - -input_files = ChromeFileList([ - # TODO(sgk): violate standard indentation so we don't have to - # reindent too much when we remove the explicit MSVSFilter() calls - # in favor of generating the hierarchy to reflect the file system. - MSVSFilter('support', [ - 'run_all_unittests.cc', - ]), - MSVSFilter('tests', [ - 'copy_tree_work_item_unittest.cc', - 'create_dir_work_item_unittest.cc', - 'create_reg_key_work_item_unittest.cc', - 'delete_reg_value_work_item_unittest.cc', - 'delete_tree_work_item_unittest.cc', - 'helper_unittest.cc', - 'google_chrome_distribution_unittest.cc', - 'set_reg_value_work_item_unittest.cc', - '../setup/setup_constants$OBJSUFFIX', - 'work_item_list_unittest.cc', - ]), -]) - - -# TODO(port): -if env.Bit('windows'): - env.ChromeTestProgram('installer_unittests', input_files) - -p = env.ChromeMSVSProject('installer_unittests.vcproj', - dest=('$CHROME_SRC_DIR/chrome/' - + 'installer/util/installer_unittests.vcproj'), - guid='{903F8C1E-537A-4C9E-97BE-075147CBE769}', - 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', - ], - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - 'VCLinkerTool', - 'VCALinkTool', - MSVSTool('VCManifestTool', - AdditionalManifestFiles=( - '$(SolutionDir)installer/' - + 'mini_installer/' - + 'mini_installer.exe.manifest')), - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCAppVerifierTool', - 'VCWebDeploymentTool', - 'VCPostBuildEventTool', - ], - ConfigurationType='1') - - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/debug.vsprops', - '$(SolutionDir)/tools/build/win/unit_test.vsprops', - '$(SolutionDir)../testing/using_gtest.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/release.vsprops', - '$(SolutionDir)/tools/build/win/unit_test.vsprops', - '$(SolutionDir)../testing/using_gtest.vsprops', - ]) diff --git a/chrome/installer/util/util.scons b/chrome/installer/util/util.scons deleted file mode 100644 index 69e39d1..0000000 --- a/chrome/installer/util/util.scons +++ /dev/null @@ -1,191 +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.ApplySConscript([ - '$BREAKPAD_DIR/using_breakpad.scons', - '$CHROME_DIR/third_party/wtl/using_wtl.scons', - '$ICU38_DIR/using_icu38.scons', - '$LIBJPEG_DIR/using_libjpeg.scons', - '$LIBPNG_DIR/using_libpng.scons', - '$LIBXML_DIR/using_libxml.scons', - '$LZMA_SDK_DIR/using_lzma_sdk.scons', - '$NPAPI_DIR/using_npapi.scons', - '$SKIA_DIR/using_skia.scons', - '$ZLIB_DIR/using_zlib.scons', -]) - -env.Prepend( - CPPPATH = [ - '$CHROME_SRC_DIR', - '.', - ], -) - -input_files = ChromeFileList([ - 'browser_distribution.cc', - 'browser_distribution.h', - 'copy_tree_work_item.cc', - 'copy_tree_work_item.h', - 'create_dir_work_item.cc', - 'create_dir_work_item.h', - 'create_reg_key_work_item.cc', - 'create_reg_key_work_item.h', - 'delete_reg_value_work_item.cc', - 'delete_reg_value_work_item.h', - 'delete_tree_work_item.cc', - 'delete_tree_work_item.h', - 'google_chrome_distribution.cc', - 'google_chrome_distribution.h', - 'google_update_constants.cc', - 'google_update_constants.h', - 'google_update_settings.cc', - 'google_update_settings.h', - 'helper.cc', - 'helper.h', - 'html_dialog.h', - 'html_dialog_impl.cc', - 'install_util.cc', - 'install_util.h', - 'l10n_string_util.cc', - 'l10n_string_util.h', - 'logging_installer.cc', - 'logging_installer.h', - 'lzma_util.cc', - 'lzma_util.h', - 'master_preferences.cc', - 'master_preferences.h', - 'set_reg_value_work_item.cc', - 'set_reg_value_work_item.h', - 'shell_util.cc', - 'shell_util.h', - 'util_constants.cc', - 'util_constants.h', - 'version.cc', - 'version.h', - 'work_item.cc', - 'work_item.h', - 'work_item_list.cc', - 'work_item_list.h', -]) - -# TODO(port): -if env.Bit('windows'): - env.ChromeLibrary('util', input_files) - -p = env.ChromeMSVSProject('util.vcproj', - dest=('$CHROME_SRC_DIR/chrome/' - + 'installer/util/util.vcproj'), - guid='{EFBB1436-A63F-4CD8-9E99-B89226E782EC}', - dependencies = [ - ('$CHROME_DIR/installer/util/prebuild/' + - 'util_prebuild.vcproj'), - ], - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - local_directory_prefix='./', - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - 'VCLibrarianTool', - 'VCALinkTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCPostBuildEventTool', - ], - ConfigurationType='4') - - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/debug.vsprops', - '$(SolutionDir)common/common.vsprops', - '$(SolutionDir)installer/util/using_util.vsprops', - '$(SolutionDir)../third_party/lzma_sdk/using_lzma_sdk.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/release.vsprops', - '$(SolutionDir)common/common.vsprops', - '$(SolutionDir)installer/util/using_util.vsprops', - '$(SolutionDir)../third_party/lzma_sdk/using_lzma_sdk.vsprops', - ]) - - -############################################################################## - -input_files = ChromeFileList([ - 'prebuild/create_string_rc.bat', - 'prebuild/create_string_rc.py', -]) - -# 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}") - -p = env.ChromeMSVSProject('prebuild/util_prebuild.vcproj', - dest=('$CHROME_SRC_DIR/chrome/installer/' - + 'util/prebuild/util_prebuild.vcproj'), - guid='{0026A376-C4F1-4575-A1BA-578C69F07013}', - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - relative_path_prefix='./', - tools=[ - 'VCPreBuildEventTool', - MSVSTool('VCCustomBuildTool', - CommandLine=('create_string_rc.bat ' - + '$(IntDir)'), - AdditionalDependencies=( - 'create_string_rc.py;' - + '$(SolutionDir)/app/' - + 'generated_resources.grd'), - Outputs=('$(IntDir)/' - + 'installer_util_strings.rc;' - + '$(IntDir)/' - + 'installer_util_strings.h')), - 'VCMIDLTool', - 'VCPostBuildEventTool', - ], - ConfigurationType='10') - - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/debug.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/release.vsprops', - ]) diff --git a/chrome/plugin/plugin.scons b/chrome/plugin/plugin.scons deleted file mode 100644 index 5621eeb..0000000 --- a/chrome/plugin/plugin.scons +++ /dev/null @@ -1,128 +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.SConscript([ - '$NPAPI_DIR/using_npapi.scons', - '$SKIA_DIR/using_skia.scons', -], {'env':env}) - -env.Prepend( - CPPPATH = [ - '$CHROME_SRC_DIR', - ], -) - -if env.Bit('windows'): - env.Prepend( - CPPPATH = [ - '$CHROME_DIR/tools/build/win', - ], - ) - -input_files = ChromeFileList([ - # TODO(sgk): violate standard indentation so we don't have to - # reindent too much when we remove the explicit MSVSFilter() calls - # in favor of generating the hierarchy to reflect the file system. - MSVSFilter('NPObject', [ - 'npobject_proxy.cc', - 'npobject_proxy.h', - 'npobject_stub.cc', - 'npobject_stub.h', - 'npobject_util.cc', - 'npobject_util.h', - ]), - 'chrome_plugin_host.cc', - 'chrome_plugin_host.h', - 'plugin_channel.cc', - 'plugin_channel.h', - 'plugin_channel_base.cc', - 'plugin_channel_base.h', - 'plugin_main.cc', - 'plugin_thread.cc', - 'plugin_thread.h', - '$CHROME_DIR/tools/build/win/precompiled$OBJSUFFIX', - '$CHROME_DIR/tools/build/win/precompiled.h', - 'webplugin_delegate_stub.cc', - 'webplugin_delegate_stub.h', - 'webplugin_proxy.cc', - 'webplugin_proxy.h', -]) - -if not env.Bit('windows'): - input_files.Remove( - '$CHROME_DIR/tools/build/win/precompiled$OBJSUFFIX', - ) - -if env.Bit('posix'): - # TODO(port) - input_files.Remove( - 'chrome_plugin_host.cc', - 'npobject_proxy.cc', - 'npobject_stub.cc', - 'plugin_channel.cc', - 'plugin_channel_base.cc', - 'plugin_main.cc', - 'plugin_thread.cc', - 'webplugin_delegate_stub.cc', - 'webplugin_proxy.cc', - ) - -env.ChromeLibrary('plugin', input_files) - -p = env.ChromeMSVSProject('plugin.vcproj', - dest='$CHROME_SRC_DIR/chrome/plugin/plugin.vcproj', - guid='{20A560A0-2CD0-4D9E-A58B-1F24B99C087A}', - keyword='Win32Proj', - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - local_directory_prefix='./', - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - 'VCLibrarianTool', - 'VCALinkTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCPostBuildEventTool', - ], - ConfigurationType='4') - - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/debug.vsprops', - '$(SolutionDir)../skia/using_skia.vsprops', - '../tools/build/win/precompiled.vsprops', - '$(SolutionDir)../third_party/npapi/using_npapi.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/release.vsprops', - '$(SolutionDir)../third_party/npapi/using_npapi.vsprops', - '$(SolutionDir)../skia/using_skia.vsprops', - ]) - -p.AddFileConfig('../tools/build/win/precompiled.cc', - 'Debug|Win32', - tools=[ - MSVSTool('VCCLCompilerTool', - UsePrecompiledHeader='1'), - ]) diff --git a/chrome/renderer/renderer.scons b/chrome/renderer/renderer.scons deleted file mode 100644 index a620ad6..0000000 --- a/chrome/renderer/renderer.scons +++ /dev/null @@ -1,206 +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.SConscript([ - '$CHROME_DIR/third_party/wtl/using_wtl.scons', - '$GRIT_DIR/build/using_generated_resources.scons', - '$ICU38_DIR/using_icu38.scons', - '$MEDIA_DIR/using_media.scons', - '$NPAPI_DIR/using_npapi.scons', - '$PRINTING_DIR/using_printing.scons', - '$SKIA_DIR/using_skia.scons', -], {'env':env}) - -env.Prepend( - CPPPATH = [ - '$CHROME_SRC_DIR', - ], -) - -env.Append( - LIBS = [ - 'common', - ], -) - -if env.Bit('windows'): - env.Prepend( - CPPPATH = [ - '$CHROME_DIR/tools/build/win', - ], - ) - -input_files = ChromeFileList([ - # TODO(sgk): violate standard indentation so we don't have to - # reindent too much when we remove the explicit MSVSFilter() calls - # in favor of generating the hierarchy to reflect the file system. - MSVSFilter('automation', [ - 'automation/dom_automation_controller.cc', - 'automation/dom_automation_controller.h', - ]), - MSVSFilter('media', [ - 'media/audio_renderer_impl.cc', - 'media/audio_renderer_impl.h', - 'media/data_source_impl.cc', - 'media/data_source_impl.h', - 'media/video_renderer_impl.cc', - 'media/video_renderer_impl.h', - ]), - MSVSFilter('net', [ - 'net/render_dns_master.cc', - 'net/render_dns_master.h', - 'net/render_dns_queue.cc', - 'net/render_dns_queue.h', - ]), - MSVSFilter('extensions', [ - 'extensions/extension_process_bindings.cc', - 'extensions/extension_process_bindings.h', - 'extensions/renderer_extension_bindings.cc', - 'extensions/renderer_extension_bindings.h', - ]), - 'about_handler.cc', - 'about_handler.h', - 'debug_message_handler.cc', - 'debug_message_handler.h', - 'devtools_agent.cc', - 'devtools_agent.h', - 'devtools_client.cc', - 'devtools_client.h', - 'devtools_messages.h', - 'devtools_messages_internal.h', - 'dom_ui_bindings.cc', - 'dom_ui_bindings.h', - 'external_host_bindings.cc', - 'external_host_bindings.h', - 'external_js_object.cc', - 'external_js_object.h', - 'localized_error.cc', - 'localized_error.h', - 'plugin_channel_host.cc', - 'plugin_channel_host.h', - '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX', - '$CHROME_DIR/tools/build/win/precompiled_wtl.h', - 'render_process.cc', - 'render_process.h', - 'render_thread.cc', - 'render_thread.h', - 'render_view.cc', - 'render_view.h', - 'render_widget.cc', - 'render_widget.h', - 'renderer_glue.cc', - 'renderer_histogram_snapshots.cc', - 'renderer_histogram_snapshots.h', - 'renderer_webkitclient_impl.cc', - 'renderer_webkitclient_impl.h', - 'renderer_main.cc', - 'renderer_resources.h', - 'user_script_slave.cc', - 'user_script_slave.h', - 'visitedlink_slave.cc', - 'visitedlink_slave.h', - 'webmediaplayer_delegate_impl.cc', - 'webmediaplayer_delegate_impl.h', - 'webplugin_delegate_proxy.cc', - 'webplugin_delegate_proxy.h', - 'webworker_proxy.cc', - 'webworker_proxy.h', -]) - -if not env.Bit('windows'): - # Windows-specific. - input_files.Remove( - '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX', - '$CHROME_DIR/tools/build/win/precompiled_wtl.h', - ) - -if env.Bit('linux'): - # Linux-specific. - input_files.Append( - 'renderer_main_platform_delegate_linux.cc', - 'renderer_logging_linux.cc', - ) - - # TODO(port): Port these to Linux - input_files.Remove( - 'plugin_channel_host.cc', - 'webplugin_delegate_proxy.cc', - ) - -# TODO(port): Port these to Mac -if env.Bit('mac'): - input_files.Remove( - 'debug_message_handler.cc', - 'external_js_object.cc', - 'net/render_dns_master.cc', - 'plugin_channel_host.cc', - 'render_view.cc', - 'render_widget.cc', - 'renderer_glue.cc', - 'webplugin_delegate_proxy.cc', - ) - - -# TODO(port): Enable for Mac. -if not env.Bit('mac'): - env.ChromeLibrary('renderer', input_files) - -# TODO######################################################################## - -p = env.ChromeMSVSProject('renderer.vcproj', - dest=('$CHROME_SRC_DIR/chrome/' - + 'renderer/renderer.vcproj'), - guid='{9301A569-5D2B-4D11-9332-B1E30AEACB8D}', - keyword='Win32Proj', - dependencies = [ - '$CHROME_DIR/app/generated_resources.vcproj', - ], - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - relative_path_prefix='./', - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - 'VCLibrarianTool', - 'VCALinkTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCPostBuildEventTool', - ], - ConfigurationType='4') - - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - './renderer.vsprops', - '$(SolutionDir)../build/debug.vsprops', - '../tools/build/win/precompiled_wtl.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - './renderer.vsprops', - '$(SolutionDir)../build/release.vsprops', - ]) - -p.AddFileConfig('../tools/build/win/precompiled_wtl.cc', - 'Debug|Win32', - tools=[ - MSVSTool('VCCLCompilerTool', - UsePrecompiledHeader='1'), - ]) diff --git a/chrome/test/activex_test_control/activex_test_control.scons b/chrome/test/activex_test_control/activex_test_control.scons deleted file mode 100644 index 15ce4ef..0000000 --- a/chrome/test/activex_test_control/activex_test_control.scons +++ /dev/null @@ -1,110 +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 = [ - '.', - '$CHROME_SRC_DIR', - ], -) - -if env.Bit('windows'): - env.Prepend( - LINKFLAGS = [ - '/INCREMENTAL', - - '/MANIFEST', - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"uxtheme.dll"', - '/MACHINE:X86', - '/FIXED:No', - - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - - '/DEBUG', - ], - LIBS = [ - 'comsuppw.lib', - ], - ) - -# TODO(port): -if env.Bit('windows'): - env.TypeLibrary('activex_test_control.idl') - -input_files = ChromeFileList([ - # TODO(sgk): violate standard indentation so we don't have to - # reindent too much when we remove the explicit MSVSFilter() calls - # in favor of generating the hierarchy to reflect the file system. - MSVSFilter('resource', [ - 'activex_test_control.rc', - 'activex_test_control.rgs', - 'chrome_test_control.bmp', - 'chrome_test_control.rgs', - ]), - 'activex_test_control.cc', - 'activex_test_control.def', - 'activex_test_control.idl', - 'chrome_test_control.cc', - 'chrome_test_control.h', - 'chrome_test_control_cp.h', - 'resource.h', -]) - -# TODO(port): -if env.Bit('windows'): - env.ChromeSharedLibrary('activex_test_control', input_files) - -p = env.ChromeMSVSProject('activex_test_control.vcproj', - dest=('$CHROME_SRC_DIR/chrome/test/' - + 'activex_test_control/' - + 'activex_test_control.vcproj'), - keyword='AtlProj', - guid='{414D4D24-5D65-498B-A33F-3A29AD3CDEDC}', - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - relative_path_prefix='./', - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - 'VCLinkerTool', - 'VCALinkTool', - 'VCManifestTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCAppVerifierTool', - 'VCWebDeploymentTool', - 'VCPostBuildEventTool', - ], - ConfigurationType='2') - - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - './activex_test_control.vsprops', - '$(SolutionDir)../build/debug.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - './activex_test_control.vsprops', - '$(SolutionDir)../build/release.vsprops', - ]) diff --git a/chrome/test/automated_ui_tests/automated_ui_tests.scons b/chrome/test/automated_ui_tests/automated_ui_tests.scons deleted file mode 100644 index e0de9ac..0000000 --- a/chrome/test/automated_ui_tests/automated_ui_tests.scons +++ /dev/null @@ -1,186 +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.ApplySConscript([ - '$BASE_DIR/using_base.scons', - '$BASE_DIR/gfx/using_base_gfx.scons', - '$CHROME_DIR/third_party/wtl/using_wtl.scons', - '$CHROME_SRC_DIR/build/using_googleurl.scons', - '$GTEST_DIR/../using_gtest.scons', - '$ICU38_DIR/using_icu38.scons', - '$LIBPNG_DIR/using_libpng.scons', - '$LIBXML_DIR/using_libxml.scons', - '$MODP_B64_DIR/using_modp_b64.scons', - '$NET_DIR/using_net.scons', - '$SKIA_DIR/using_skia.scons', - '$ZLIB_DIR/using_zlib.scons', -]) - -env.Prepend( - CPPPATH = [ - '$CHROME_SRC_DIR', - ], - LIBS = [ - 'automation', - 'browser', - 'browser_views', - 'common', - ], -) - -if env.Bit('windows'): - env.Prepend( - CPPPATH = [ - '$CHROME_DIR/tools/build/win', - ], - LINKFLAGS = [ - '/INCREMENTAL', - - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - - '/MANIFEST', - '/DELAYLOAD:"ws2_32.dll"', - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"uxtheme.dll"', - - '/DEBUG', - '/MACHINE:X86', - '/FIXED:No', - ], - LIBS = [ - 'comsupp', - 'oleacc', - 'psapi', - 'rpcrt4', - ], - ) - -input_files = ChromeFileList([ - # TODO(sgk): violate standard indentation so we don't have to - # reindent too much when we remove the explicit MSVSFilter() calls - # in favor of generating the hierarchy to reflect the file system. - MSVSFilter('Common', [ - '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX', - '$CHROME_DIR/tools/build/win/precompiled_wtl.h', - '$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX', - '$CHROME_DIR/test/testing_browser_process.h', - '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX', - '$CHROME_DIR/test/ui/ui_test.h', - '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX', - ]), - MSVSFilter('MemoryUsage', [ - '$CHROME_DIR/test/perf/mem_usage$OBJSUFFIX', - '$CHROME_DIR/test/perf/mem_usage.h', - ]), - MSVSFilter('AutomatedUITest', [ - 'automated_ui_tests.cc', - 'automated_ui_tests.h', - ]), -]) - -if not env.Bit('windows'): - input_files.Remove( - '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX', - '$CHROME_DIR/tools/build/win/precompiled_wtl.h', - ) - -# TODO(port): -if env.Bit('windows'): - env.ChromeTestProgram('automated_ui_tests', input_files) - -p = env.ChromeMSVSProject('automated_ui_tests.vcproj', - dest=('$CHROME_SRC_DIR/chrome/test/' - + 'automated_ui_tests/' - + 'automated_ui_tests.vcproj'), - root_namespace='page_cycler_tests', - guid='{D2250C20-3A94-4FB9-AF73-11BC5B73884B}', - 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', - ], - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - local_directory_prefix='./', - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - 'VCLinkerTool', - 'VCALinkTool', - 'VCManifestTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCAppVerifierTool', - 'VCWebDeploymentTool', - 'VCPostBuildEventTool', - ], - ConfigurationType='1') - - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/debug.vsprops', - '../../tools/build/win/precompiled_wtl.vsprops', - '../../tools/build/win/unit_test.vsprops', - '../../tools/build/win/ui_test.vsprops', - '$(SolutionDir)../skia/using_skia.vsprops', - ('$(SolutionDir)../' - + 'third_party/libxml/build/using_libxml.vsprops'), - '$(SolutionDir)../third_party/icu38/build/using_icu.vsprops', - '../../tools/build/win/test_memory_usage.vsprops', - '$(SolutionDir)../testing/using_gtest.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/release.vsprops', - '../../tools/build/win/unit_test.vsprops', - '../../tools/build/win/ui_test.vsprops', - '../../tools/build/win/test_memory_usage.vsprops', - '$(SolutionDir)../skia/using_skia.vsprops', - ('$(SolutionDir)../' - + 'third_party/libxml/build/using_libxml.vsprops'), - '$(SolutionDir)../third_party/icu38/build/using_icu.vsprops', - '$(SolutionDir)../testing/using_gtest.vsprops', - ]) - -p.AddFileConfig('../../tools/build/win/precompiled_wtl.cc', - 'Debug|Win32', - tools=[ - MSVSTool('VCCLCompilerTool', - UsePrecompiledHeader='1'), - ]) diff --git a/chrome/test/automation/automation.scons b/chrome/test/automation/automation.scons deleted file mode 100644 index f4856c8..0000000 --- a/chrome/test/automation/automation.scons +++ /dev/null @@ -1,90 +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.ApplySConscript([ - '$CHROME_DIR/third_party/wtl/using_wtl.scons', - '$CHROME_SRC_DIR/tools/grit/build/using_generated_resources.scons', - '$SKIA_DIR/using_skia.scons', -]) - -env.Prepend( - CPPPATH = [ - '$CHROME_SRC_DIR', - ], -) - -input_files = ChromeFileList([ - 'autocomplete_edit_proxy.cc', - 'autocomplete_edit_proxy.h', - 'automation_constants.h', - 'automation_handle_tracker.cc', - 'automation_handle_tracker.h', - 'automation_messages.h', - 'automation_messages_internal.h', - 'automation_proxy.cc', - 'automation_proxy.h', - 'browser_proxy.cc', - 'browser_proxy.h', - 'constrained_window_proxy.cc', - 'constrained_window_proxy.h', - 'tab_proxy.cc', - 'tab_proxy.h', - 'window_proxy.cc', - 'window_proxy.h', -]) - -if not env.Bit('windows'): - # TODO(port): port. - input_files.Remove( - 'autocomplete_edit_proxy.cc', - 'constrained_window_proxy.cc', - 'window_proxy.cc', - ) - -env.ChromeLibrary('automation', input_files) - -p = env.ChromeMSVSProject('automation.vcproj', - dest=('$CHROME_SRC_DIR/chrome/' - + 'test/automation/automation.vcproj'), - guid='{1556EF78-C7E6-43C8-951F-F6B43AC0DD12}', - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - relative_path_prefix='./', - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - 'VCLibrarianTool', - 'VCALinkTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCPostBuildEventTool', - ], - ConfigurationType='4') - - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/debug.vsprops', - './automation.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/release.vsprops', - './automation.vsprops', - ]) diff --git a/chrome/test/chrome_plugin/test_chrome_plugin.scons b/chrome/test/chrome_plugin/test_chrome_plugin.scons deleted file mode 100644 index 699bcc0..0000000 --- a/chrome/test/chrome_plugin/test_chrome_plugin.scons +++ /dev/null @@ -1,129 +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.ApplySConscript([ - '$BASE_DIR/using_base.scons', - '$CHROME_SRC_DIR/build/using_googleurl.scons', - '$ICU38_DIR/using_icu38.scons', -]) - -env.Prepend( - CPPPATH = [ - '$CHROME_SRC_DIR', - ], -) - -if env.Bit('windows'): - env.Prepend( - LINKFLAGS = [ - '/INCREMENTAL', - - '/MANIFEST', - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"uxtheme.dll"', - '/MACHINE:X86', - '/FIXED:No', - - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - - '/DEBUG', - ], - LIBS = [ - 'winmm.lib', - ], - ) - -input_files = ChromeFileList([ - 'test_chrome_plugin.cc', - 'test_chrome_plugin.def', - 'test_chrome_plugin.h', -]) - -if not env.Bit('windows'): - input_files.Remove( - 'test_chrome_plugin.def', - ) - -env.ChromeSharedLibrary('test_chrome_plugin', input_files) - -p = env.ChromeMSVSProject('test_chrome_plugin.vcproj', - dest=('$CHROME_SRC_DIR/chrome/test/' - + 'chrome_plugin/test_chrome_plugin.vcproj'), - root_namespace='startup_tests', - guid='{7F0A70F6-BE3F-4C19-B435-956AB8F30BA4}', - dependencies = [ - '$BASE_DIR/build/base.vcproj', - '$ICU38_DIR/build/icu.vcproj', - '$ICU38_DIR/build/icudt.vcproj', - '$GOOGLEURL_DIR/build/googleurl.vcproj', - ], - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - relative_path_prefix='./', - ConfigurationType='2') - - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/debug.vsprops', - './test_chrome_plugin.vsprops', - ], - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - MSVSTool('VCCLCompilerTool', - UsePrecompiledHeader='0'), - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - MSVSTool('VCLinkerTool', - AdditionalDependencies='winmm.lib'), - 'VCALinkTool', - 'VCManifestTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCAppVerifierTool', - 'VCWebDeploymentTool', - 'VCPostBuildEventTool', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/release.vsprops', - './test_chrome_plugin.vsprops', - ], - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - MSVSTool('VCLinkerTool', - AdditionalDependencies='winmm.lib'), - 'VCALinkTool', - 'VCManifestTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCAppVerifierTool', - 'VCWebDeploymentTool', - 'VCPostBuildEventTool', - ]) diff --git a/chrome/test/interactive_ui/interactive_ui_tests.scons b/chrome/test/interactive_ui/interactive_ui_tests.scons deleted file mode 100644 index dfe56a9..0000000 --- a/chrome/test/interactive_ui/interactive_ui_tests.scons +++ /dev/null @@ -1,277 +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.SConscript([ - '$BASE_DIR/gfx/using_base_gfx.scons', - '$BASE_DIR/using_base.scons', - '$BZIP2_DIR/using_bzip2.scons', - '$CHROME_DIR/third_party/hunspell/using_hunspell.scons', - '$CHROME_DIR/third_party/wtl/using_wtl.scons', - '$CHROME_SRC_DIR/build/using_googleurl.scons', - '$CHROME_SRC_DIR/build/using_v8.scons', - '$GTEST_DIR/../using_gtest.scons', - '$ICU38_DIR/using_icu38.scons', - '$LIBJPEG_DIR/using_libjpeg.scons', - '$LIBPNG_DIR/using_libpng.scons', - '$LIBXML_DIR/using_libxml.scons', - '$LIBXSLT_DIR/using_libxslt.scons', - '$MODP_B64_DIR/using_modp_b64.scons', - '$NET_DIR/using_net.scons', - '$NPAPI_DIR/using_npapi.scons', - '$SDCH_DIR/using_sdch.scons', - '$SKIA_DIR/using_skia.scons', - '$ZLIB_DIR/using_zlib.scons', -], {'env':env}) - -env.Prepend( - CPPDEFINES = [ - 'UI_TEST', - ], - CPPPATH = [ - '$CHROME_DIR/app', - # For generated_resources.h - '$CHROME_DIR/app/resources', - '$CHROME_SRC_DIR', - ], - LIBS = [ - 'automation', - 'browser', - 'browser_views', - 'common', - 'debugger', - 'default_plugin', - 'glue', - #'jscre', - 'JavaScriptCore_pcre', - 'plugin', - 'port', - 'renderer', - 'sqlite', - 'test_chrome_plugin', - 'util', - 'views', - 'v8_snapshot', - 'V8Bindings', - 'WebCore', - 'WTF', - ], -) - -if env.Bit('windows'): - env.Prepend( - LINKFLAGS = [ - '/INCREMENTAL', - '/DEBUG', - - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"uxtheme.dll"', - - '/MACHINE:X86', - '/FIXED:No', - - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - ], - LIBS = [ - 'activex_shim', - 'comsupp', - 'oleacc', - 'psapi', - 'rpcrt4', - 'winmm', - ], - ) - -input_files = ChromeFileList([ - # TODO(sgk): violate standard indentation so we don't have to - # reindent too much when we remove the explicit MSVSFilter() calls - # in favor of generating the hierarchy to reflect the file system. - MSVSFilter('Common', [ - '$CHROME_DIR/test/ui/npapi_test_helper$OBJSUFFIX', - '$CHROME_DIR/test/ui/npapi_test_helper.h', - '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX', - '$CHROME_DIR/tools/build/win/precompiled_wtl.h', - '$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX', - '$CHROME_DIR/test/testing_profile$OBJSUFFIX', - '$CHROME_DIR/test/testing_profile.h', - '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX', - '$CHROME_DIR/test/ui/ui_test.h', - '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX', - 'view_event_test_base.cc', - 'view_event_test_base.h', - ]), - MSVSFilter('TestBookmarkBarView', [ - '$CHROME_DIR/browser/views/bookmark_bar_view_test.cc', - ]), - MSVSFilter('TestFindInPage', [ - '$CHROME_DIR/browser/views/find_bar_win_interactive_uitest.cc', - ]), - MSVSFilter('TestFocus', [ - '$CHROME_DIR/browser/browser_focus_uitest.cc', - '$CHROME_DIR/browser/views/constrained_window_impl_interactive_uitest.cc', - ]), - MSVSFilter('TestTabDragging', [ - '$CHROME_DIR/browser/views/tabs/tab_dragging_test.cc', - ]), - MSVSFilter('TestNPAPI', [ - 'npapi_interactive_test.cc', - ]), -]) - -if not env.Bit('windows'): - # Windows-specific. - input_files.Remove( - '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX', - '$CHROME_DIR/tools/build/win/precompiled_wtl.h', - ) - -# TODO(port): -if env.Bit('windows'): - env.ChromeTestProgram('interactive_ui_tests', input_files) - -p = env.ChromeMSVSProject('interactive_ui.vcproj', - name='interactive_ui_tests', - root_namespace='manual_ui', - dest=('$CHROME_SRC_DIR/chrome/test/' - + 'interactive_ui/interactive_ui.vcproj'), - guid='{018D4F38-6272-448F-A864-976DA09F05D0}', - 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', - ], - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - local_directory_prefix='./', - ConfigurationType='1') - - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/debug.vsprops', - '../../tools/build/win/precompiled_wtl.vsprops', - '../../tools/build/win/unit_test.vsprops', - '$(SolutionDir)../third_party/libpng/using_libpng.vsprops', - '$(SolutionDir)../third_party/zlib/using_zlib.vsprops', - '$(SolutionDir)../skia/using_skia.vsprops', - ('$(SolutionDir)../' - + 'third_party/libxml/build/using_libxml.vsprops'), - '../../../third_party/icu38/build/using_icu.vsprops', - '$(SolutionDir)../testing/using_gtest.vsprops', - '../../third_party/hunspell/using_hunspell.vsprops', - ], - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - 'VCLinkerTool', - 'VCALinkTool', - 'VCManifestTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCAppVerifierTool', - 'VCWebDeploymentTool', - 'VCPostBuildEventTool', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/release.vsprops', - '../../tools/build/win/unit_test.vsprops', - '$(SolutionDir)../third_party/libpng/using_libpng.vsprops', - '$(SolutionDir)../third_party/zlib/using_zlib.vsprops', - '$(SolutionDir)../skia/using_skia.vsprops', - ('$(SolutionDir)../' - + 'third_party/libxml/build/using_libxml.vsprops'), - '../../../third_party/icu38/build/using_icu.vsprops', - '$(SolutionDir)../testing/using_gtest.vsprops', - '../../third_party/hunspell/using_hunspell.vsprops', - ], - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - MSVSTool('VCLinkerTool', - AdditionalDependencies='winmm.lib'), - 'VCALinkTool', - 'VCManifestTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCAppVerifierTool', - 'VCWebDeploymentTool', - 'VCPostBuildEventTool', - ]) - -p.AddFileConfig('../../tools/build/win/precompiled_wtl.cc', - 'Debug|Win32', - tools=[ - MSVSTool('VCCLCompilerTool', - UsePrecompiledHeader='1'), - ]) diff --git a/chrome/test/memory_test/memory_test.scons b/chrome/test/memory_test/memory_test.scons deleted file mode 100644 index fb3a316..0000000 --- a/chrome/test/memory_test/memory_test.scons +++ /dev/null @@ -1,166 +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.ApplySConscript([ - '$BASE_DIR/using_base.scons', - '$BASE_DIR/gfx/using_base_gfx.scons', - '$CHROME_SRC_DIR/build/using_googleurl.scons', - '$GTEST_DIR/../using_gtest.scons', - '$ICU38_DIR/using_icu38.scons', - '$LIBPNG_DIR/using_libpng.scons', - '$MODP_B64_DIR/using_modp_b64.scons', - '$NET_DIR/using_net.scons', - '$SKIA_DIR/using_skia.scons', - '$ZLIB_DIR/using_zlib.scons', -]) - -env.Prepend( - CPPDEFINES = [ - 'UI_TEST', - 'UNIT_TEST', - ], - CPPPATH = [ - '$CHROME_SRC_DIR', - ], - LIBS = [ - 'automation', - 'browser', - 'browser_views', - 'common', - ], -) - -if env.Bit('windows'): - env.Prepend( - LINKFLAGS = [ - '/INCREMENTAL', - '/DEBUG', - - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"uxtheme.dll"', - - '/MACHINE:X86', - '/FIXED:No', - - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - ], - ) - -input_files = ChromeFileList([ - # TODO(sgk): violate standard indentation so we don't have to - # reindent too much when we remove the explicit MSVSFilter() calls - # in favor of generating the hierarchy to reflect the file system. - MSVSFilter('Common', [ - '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX', - '$CHROME_DIR/tools/build/win/precompiled_wtl.h', - '$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX', - '$CHROME_DIR/test/testing_browser_process.h', - '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX', - '$CHROME_DIR/test/ui/ui_test.h', - '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX', - ]), - MSVSFilter('MemoryUsage', [ - '$CHROME_DIR/test/perf/mem_usage$OBJSUFFIX', - '$CHROME_DIR/test/perf/mem_usage.h', - ]), - MSVSFilter('TestMemory', [ - 'memory_test.cc', - ]), -]) - -if not env.Bit('windows'): - # Windows-specific. - input_files.Remove( - '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX', - '$CHROME_DIR/tools/build/win/precompiled_wtl.h', - ) - -# TODO(port): -if env.Bit('windows'): - env.ChromeTestProgram('memory_test', input_files) - -p = env.ChromeMSVSProject('memory_test.vcproj', - dest=('$CHROME_SRC_DIR/chrome/' - + 'test/memory_test/memory_test.vcproj'), - guid='{A5F831FD-9B9C-4FEF-9FBA-554817B734CE}', - 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', - ], - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - local_directory_prefix='./', - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - MSVSTool('VCLinkerTool', - AdditionalDependencies='winmm.lib'), - 'VCALinkTool', - 'VCManifestTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCAppVerifierTool', - 'VCWebDeploymentTool', - 'VCPostBuildEventTool', - ], - ConfigurationType='1') - - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/debug.vsprops', - '../../tools/build/win/precompiled_wtl.vsprops', - '../../tools/build/win/unit_test.vsprops', - '../../tools/build/win/ui_test.vsprops', - '../../tools/build/win/test_memory_usage.vsprops', - '$(SolutionDir)../skia/using_skia.vsprops', - '$(SolutionDir)../testing/using_gtest.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/release.vsprops', - '../../tools/build/win/unit_test.vsprops', - '../../tools/build/win/ui_test.vsprops', - '../../tools/build/win/test_memory_usage.vsprops', - '$(SolutionDir)../skia/using_skia.vsprops', - '$(SolutionDir)../testing/using_gtest.vsprops', - ]) - -p.AddFileConfig('../../tools/build/win/precompiled_wtl.cc', - 'Debug|Win32', - tools=[ - MSVSTool('VCCLCompilerTool', - UsePrecompiledHeader='1'), - ]) diff --git a/chrome/test/mini_installer_test/mini_installer_test.scons b/chrome/test/mini_installer_test/mini_installer_test.scons deleted file mode 100644 index 6d8b12d..0000000 --- a/chrome/test/mini_installer_test/mini_installer_test.scons +++ /dev/null @@ -1,155 +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.ApplySConscript([ - '$BASE_DIR/using_base.scons', - '$GTEST_DIR/../using_gtest.scons', - '$ICU38_DIR/using_icu38.scons', - - '$BASE_DIR/gfx/using_base_gfx.scons', - '$CHROME_DIR/third_party/wtl/using_wtl.scons', - '$CHROME_SRC_DIR/build/using_googleurl.scons', - '$LIBPNG_DIR/using_libpng.scons', - '$LIBXML_DIR/using_libxml.scons', - '$MODP_B64_DIR/using_modp_b64.scons', - '$NET_DIR/using_net.scons', - '$SKIA_DIR/using_skia.scons', - '$ZLIB_DIR/using_zlib.scons', -]) - -env.Prepend( - CPPPATH = [ - '$CHROME_SRC_DIR', - ], - LIBS = [ - 'util', - ], -) - -if env.Bit('windows'): - env.Prepend( - LINKFLAGS = [ - '/INCREMENTAL', - '/DEBUG', - - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"uxtheme.dll"', - - '/MACHINE:X86', - '/FIXED:No', - - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - ], - LIBS = [ - 'comsupp', - 'oleacc', - 'rpcrt4', - 'shlwapi', - ], - ) - -input_files = ChromeFileList([ - 'chrome_mini_installer.cc', - 'chrome_mini_installer.h', - 'mini_installer_test_constants.cc', - 'mini_installer_test_constants.h', - '$CHROME_DIR/installer/util/run_all_unittests$OBJSUFFIX', - '$CHROME_DIR/installer/setup/setup_constants$OBJSUFFIX', - 'test.cc', -]) - -# TODO(port): -if env.Bit('windows'): - env.ChromeTestProgram('mini_installer_test', input_files) - -p = env.ChromeMSVSProject('mini_installer_test.vcproj', - dest=('$CHROME_SRC_DIR/chrome/test/' - + 'mini_installer_test/' - + 'mini_installer_test.vcproj'), - guid='{4B6E199A-034A-49BD-AB93-458DD37E45B1}', - keyword='Win32Proj', - dependencies = [ - '$BASE_DIR/build/base.vcproj', - '$ICU38_DIR/build/icu.vcproj', - '$TESTING_DIR/gtest.vcproj', - '$CHROME_DIR/installer/util/util.vcproj', - ], - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - local_directory_prefix='./', - ConfigurationType='1') - - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/debug.vsprops', - '$(SolutionDir)/tools/build/win/unit_test.vsprops', - '$(SolutionDir)../testing/using_gtest.vsprops', - ], - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - MSVSTool('VCLinkerTool', - IgnoreDefaultLibraryNames=''), - 'VCALinkTool', - MSVSTool('VCManifestTool', - AdditionalManifestFiles=('$(SolutionDir)installer/' - + 'mini_installer/' - + 'mini_installer.exe.manifest')), - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCAppVerifierTool', - 'VCWebDeploymentTool', - 'VCPostBuildEventTool', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/release.vsprops', - '$(SolutionDir)/tools/build/win/unit_test.vsprops', - '$(SolutionDir)../testing/using_gtest.vsprops', - ], - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - 'VCLinkerTool', - 'VCALinkTool', - MSVSTool('VCManifestTool', - AdditionalManifestFiles=('$(SolutionDir)installer/' - + 'mini_installer/' - + 'mini_installer.exe.manifest')), - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCAppVerifierTool', - 'VCWebDeploymentTool', - 'VCPostBuildEventTool', - ]) diff --git a/chrome/test/page_cycler/page_cycler_tests.scons b/chrome/test/page_cycler/page_cycler_tests.scons deleted file mode 100644 index d43ed36..0000000 --- a/chrome/test/page_cycler/page_cycler_tests.scons +++ /dev/null @@ -1,208 +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.ApplySConscript([ - '$BASE_DIR/using_base.scons', - '$BASE_DIR/gfx/using_base_gfx.scons', - '$CHROME_SRC_DIR/build/using_googleurl.scons', - '$CHROME_SRC_DIR/tools/grit/build/using_generated_resources.scons', - '$GTEST_DIR/../using_gtest.scons', - '$ICU38_DIR/using_icu38.scons', - '$LIBPNG_DIR/using_libpng.scons', - '$MODP_B64_DIR/using_modp_b64.scons', - '$NET_DIR/using_net.scons', - '$SKIA_DIR/using_skia.scons', - '$ZLIB_DIR/using_zlib.scons', - '$CHROME_SRC_DIR/build/using_v8.scons', -]) - -env.Prepend( - CPPDEFINES = [ - 'UI_TEST', - ], - CPPPATH = [ - '$CHROME_SRC_DIR', - ], - LIBS = [ - 'automation', - 'browser', - 'common', - 'glue', - 'WTF', - # needed for shared link deps - 'sqlite', - 'xslt', - - 'WebKit', - 'WebCore', - 'V8Bindings', - 'v8_snapshot', - 'libxml', - 'port', - 'renderer', - 'JavaScriptCore_pcre', - - 'jpeg', - - 'bzip2', - 'X11', - 'Xrender', - 'Xext', - - 'media', - 'sdch', - 'views', - - 'hunspell', - 'printing', - 'modp_b64', - 'debugger', - ], -) - -if env.Bit('windows'): - env.Prepend( - LINKFLAGS = [ - '/INCREMENTAL', - '/DEBUG', - - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"uxtheme.dll"', - - '/MACHINE:X86', - '/FIXED:No', - - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - ], - LIBS = [ - 'comsupp', - 'oleacc', - 'psapi', - 'rpcrt4', - 'winmm', - ], - ) - -input_files = ChromeFileList([ - # TODO(sgk): violate standard indentation so we don't have to - # reindent too much when we remove the explicit MSVSFilter() calls - # in favor of generating the hierarchy to reflect the file system. - MSVSFilter('Common', [ - '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX', - '$CHROME_DIR/tools/build/win/precompiled_wtl.h', - '$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX', - '$CHROME_DIR/test/testing_browser_process.h', - '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX', - '$CHROME_DIR/test/ui/ui_test.h', - '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX', - ]), - MSVSFilter('MemoryUsage', [ - '$CHROME_DIR/test/perf/mem_usage$OBJSUFFIX', - '$CHROME_DIR/test/perf/mem_usage.h', - ]), - MSVSFilter('TestPageCycler', [ - 'page_cycler_test.cc', - ]), -]) - -if not env.Bit('windows'): - # Windows-specific. - input_files.Remove( - '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX', - '$CHROME_DIR/tools/build/win/precompiled_wtl.h', - ) - - # TODO(port): Remove files from this list as they get ported. - input_files.Remove( - '$CHROME_DIR/test/perf/mem_usage$OBJSUFFIX', - ) - -env.ChromeTestProgram('page_cycler_tests', input_files) - -p = env.ChromeMSVSProject('page_cycler_tests.vcproj', - dest=('$CHROME_SRC_DIR/chrome/' - + 'test/page_cycler/page_cycler_tests.vcproj'), - guid='{C9E0BD1D-B175-4A91-8380-3FDC81FAB9D7}', - 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', - ], - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - local_directory_prefix='./', - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - MSVSTool('VCLinkerTool', - AdditionalDependencies='winmm.lib'), - 'VCALinkTool', - 'VCManifestTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCAppVerifierTool', - 'VCWebDeploymentTool', - 'VCPostBuildEventTool', - ], - ConfigurationType='1') - - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/debug.vsprops', - '../../tools/build/win/precompiled_wtl.vsprops', - '../../tools/build/win/unit_test.vsprops', - '../../tools/build/win/ui_test.vsprops', - '../../tools/build/win/test_memory_usage.vsprops', - '$(SolutionDir)../skia/using_skia.vsprops', - '$(SolutionDir)../testing/using_gtest.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/release.vsprops', - '../../tools/build/win/unit_test.vsprops', - '../../tools/build/win/ui_test.vsprops', - '../../tools/build/win/test_memory_usage.vsprops', - '$(SolutionDir)../skia/using_skia.vsprops', - '$(SolutionDir)../testing/using_gtest.vsprops', - ]) - -p.AddFileConfig('../../tools/build/win/precompiled_wtl.cc', - 'Debug|Win32', - tools=[ - MSVSTool('VCCLCompilerTool', - UsePrecompiledHeader='1'), - ]) diff --git a/chrome/test/perf/perftests.scons b/chrome/test/perf/perftests.scons deleted file mode 100644 index 031f386..0000000 --- a/chrome/test/perf/perftests.scons +++ /dev/null @@ -1,224 +0,0 @@ -# Copyright (c) 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 the perf_tests{,.exe} executable. -""" - -Import('env') - -env = env.Clone() - -env.ApplySConscript([ - '$BASE_DIR/using_base.scons', - '$NET_DIR/using_net.scons', - '$CHROME_SRC_DIR/build/using_googleurl.scons', - '$GTEST_DIR/../using_gtest.scons', - '$ICU38_DIR/using_icu38.scons', - '$MODP_B64_DIR/using_modp_b64.scons', - - '$BASE_DIR/gfx/using_base_gfx.scons', - '$BZIP2_DIR/using_bzip2.scons', - '$CHROME_SRC_DIR/build/using_v8.scons', - '$LIBJPEG_DIR/using_libjpeg.scons', - '$LIBPNG_DIR/using_libpng.scons', - '$LIBXML_DIR/using_libxml.scons', - '$LIBXSLT_DIR/using_libxslt.scons', - '$MEDIA_DIR/using_media.scons', - '$PRINTING_DIR/using_printing.scons', - '$SDCH_DIR/using_sdch.scons', - '$SKIA_DIR/using_skia.scons', - '$ZLIB_DIR/using_zlib.scons', - - # TODO(port): we should have a using_browser.scons that pulls in hunspell - # for itself. - '$CHROME_DIR/third_party/hunspell/using_hunspell.scons', -]) - -env.Prepend( - CPPDEFINES = [ - 'PERF_TEST', - ], - LIBS = [ - 'views', - - 'browser', - 'common', - 'sqlite', - - 'JavaScriptCore_pcre', - 'V8Bindings', - 'WTF', - 'WebCore', - 'WebKit', - 'debugger', - 'glue', - 'port', - 'renderer', - - 'X11', - 'Xrender', - 'Xext', - ], -) - -if env.Bit('posix'): - env.SConscript([ - '$LIBEVENT_DIR/using_libevent.scons', - ], {'env':env}) - -if env.Bit('windows'): - env.Prepend( - LIBS = [ - 'rpcrt4', - 'shlwapi', - 'winmm', - ] - ) - -input_files = ChromeFileList([ - # TODO(sgk): violate standard indentation so we don't have to - # reindent too much when we remove the explicit MSVSFilter() calls - # in favor of generating the hierarchy to reflect the file system. - MSVSFilter('TestVisitedLink', [ - '$CHROME_DIR/browser/visitedlink_master$OBJSUFFIX', - '$CHROME_DIR/browser/visitedlink_perftest.cc', - ]), - MSVSFilter('Common', [ - 'perftests.cc', - '$BASE_DIR/perftimer$OBJSUFFIX', - ]), - MSVSFilter('TestURLParser', [ - 'url_parse_perftest.cc', - ]), - MSVSFilter('TestJSONSerializer', [ - '$CHROME_DIR/common/json_value_serializer_perftest.cc', - ]), - MSVSFilter('TestSafeBrowsing', [ - '$CHROME_DIR/browser/safe_browsing/database_perftest.cc', - ]), -]) - -if env.Bit('linux'): - # TODO(port): Port these files. - input_files.Remove( - 'url_parse_perftest.cc', - '$CHROME_DIR/browser/visitedlink_master$OBJSUFFIX', - '$CHROME_DIR/browser/visitedlink_perftest.cc', - ) - -if env.Bit('mac'): - # TODO(port): Port these files. - input_files.Remove( - 'url_parse_perftest.cc', - '$CHROME_DIR/browser/visitedlink_master$OBJSUFFIX', - '$CHROME_DIR/browser/visitedlink_perftest.cc', - ) - -if not env.Bit('mac'): - env.ChromeTestProgram('perf_tests', input_files) - -p = env.ChromeMSVSProject('perftests.vcproj', - name='perf_tests', - dest=('$CHROME_SRC_DIR/chrome/' - + 'test/perf/perftests.vcproj'), - guid='{9055E088-25C6-47FD-87D5-D9DD9FD75C9F}', - keyword='Win32Proj', - 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', - ], - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - local_directory_prefix='./', - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - MSVSTool('VCCLCompilerTool', - PreprocessorDefinitions=[ - 'PERF_TEST', - '_CRT_RAND_S', - ]), - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - MSVSTool('VCLinkerTool', - AdditionalDependencies=[ - 'shlwapi.lib', - 'rpcrt4.lib', - 'winmm.lib', - ], - SubSystem='1'), - 'VCALinkTool', - 'VCManifestTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCAppVerifierTool', - 'VCWebDeploymentTool', - 'VCPostBuildEventTool', - ], - ConfigurationType='1') - - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/debug.vsprops', - '$(SolutionDir)../third_party/icu38/build/using_icu.vsprops', - ('$(SolutionDir)../' - + 'third_party/libxml/build/using_libxml.vsprops'), - '$(SolutionDir)../testing/using_gtest.vsprops', - '$(SolutionDir)../skia/using_skia.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/release.vsprops', - '$(SolutionDir)../third_party/icu38/build/using_icu.vsprops', - ('$(SolutionDir)../' - + 'third_party/libxml/build/using_libxml.vsprops'), - '$(SolutionDir)../testing/using_gtest.vsprops', - '$(SolutionDir)../skia/using_skia.vsprops', - ]) diff --git a/chrome/test/plugin/plugin_tests.scons b/chrome/test/plugin/plugin_tests.scons deleted file mode 100644 index 06dfb33..0000000 --- a/chrome/test/plugin/plugin_tests.scons +++ /dev/null @@ -1,176 +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.ApplySConscript([ - '$BASE_DIR/using_base.scons', - '$BASE_DIR/gfx/using_base_gfx.scons', - '$CHROME_SRC_DIR/build/using_googleurl.scons', - '$GTEST_DIR/../using_gtest.scons', - '$ICU38_DIR/using_icu38.scons', - '$LIBPNG_DIR/using_libpng.scons', - '$LIBXML_DIR/using_libxml.scons', - '$LIBXSLT_DIR/using_libxslt.scons', - '$MODP_B64_DIR/using_modp_b64.scons', - '$NET_DIR/using_net.scons', - '$SKIA_DIR/using_skia.scons', - '$ZLIB_DIR/using_zlib.scons', -]) - -env.Prepend( - CPPDEFINES = [ - 'UI_TEST', - ], - CPPPATH = [ - '$CHROME_SRC_DIR', - ], - LIBS = [ - 'automation', - 'browser', - 'browser_views', - 'common', - 'security_tests', - ], -) - -if env.Bit('windows'): - env.Prepend( - LINKFLAGS = [ - '/INCREMENTAL', - '/DEBUG', - - '/DELAYLOAD:"ws2_32.dll"', - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"uxtheme.dll"', - - '/MACHINE:X86', - '/FIXED:No', - - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - ], - LIBS = [ - 'comsupp', - 'oleacc', - 'rpcrt4', - 'winmm', - ], - ) - -input_files = ChromeFileList([ - 'plugin_test.cpp', - '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX', - '$CHROME_DIR/tools/build/win/precompiled_wtl.h', - '$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX', - '$CHROME_DIR/test/testing_browser_process.h', - '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX', - '$CHROME_DIR/test/ui/ui_test.h', - '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX', -]) - -if not env.Bit('windows'): - # Windows-specific. - input_files.Remove( - '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX', - '$CHROME_DIR/tools/build/win/precompiled_wtl.h', - ) - -# TODO(port): -if env.Bit('windows'): - env.ChromeTestProgram('plugin_tests', input_files) - -p = env.ChromeMSVSProject('plugin_tests.vcproj', - dest=('$CHROME_SRC_DIR/chrome/' - + 'test/plugin/plugin_tests.vcproj'), - guid='{A1CAA831-C507-4B2E-87F3-AEC63C9907F9}', - 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', - ], - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - local_directory_prefix='./', - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - MSVSTool('VCLinkerTool', - AdditionalDependencies='winmm.lib'), - 'VCALinkTool', - 'VCManifestTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCAppVerifierTool', - 'VCWebDeploymentTool', - 'VCPostBuildEventTool', - ], - ConfigurationType='1') - - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/debug.vsprops', - '../../tools/build/win/precompiled_wtl.vsprops', - ('$(SolutionDir)../' - + 'third_party/libxml/build/using_libxml.vsprops'), - ('$(SolutionDir)../' - + 'third_party/libxslt/build/using_libxslt.vsprops'), - '../../tools/build/win/unit_test.vsprops', - '../../tools/build/win/ui_test.vsprops', - '$(SolutionDir)../skia/using_skia.vsprops', - '$(SolutionDir)../testing/using_gtest.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/release.vsprops', - ('$(SolutionDir)../' - + 'third_party/libxml/build/using_libxml.vsprops'), - ('$(SolutionDir)../' - + 'third_party/libxslt/build/using_libxslt.vsprops'), - '../../tools/build/win/unit_test.vsprops', - '../../tools/build/win/ui_test.vsprops', - '$(SolutionDir)../skia/using_skia.vsprops', - '$(SolutionDir)../testing/using_gtest.vsprops', - ]) - -p.AddFileConfig('../../tools/build/win/precompiled_wtl.cc', - 'Debug|Win32', - tools=[ - MSVSTool('VCCLCompilerTool', - UsePrecompiledHeader='1'), - ]) diff --git a/chrome/test/reliability/reliability_tests.scons b/chrome/test/reliability/reliability_tests.scons deleted file mode 100644 index 38767a8..0000000 --- a/chrome/test/reliability/reliability_tests.scons +++ /dev/null @@ -1,180 +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.ApplySConscript([ - '$BASE_DIR/using_base.scons', - '$BASE_DIR/gfx/using_base_gfx.scons', - '$CHROME_SRC_DIR/build/using_googleurl.scons', - '$GTEST_DIR/../using_gtest.scons', - '$ICU38_DIR/using_icu38.scons', - '$LIBPNG_DIR/using_libpng.scons', - '$LIBXML_DIR/using_libxml.scons', - '$MODP_B64_DIR/using_modp_b64.scons', - '$NET_DIR/using_net.scons', - '$SKIA_DIR/using_skia.scons', - '$ZLIB_DIR/using_zlib.scons', -]) - -env.Prepend( - CPPDEFINES = [ - 'RELIABILITY_TEST', # seems to be unused - 'UI_TEST', - ], - CPPPATH = [ - '$CHROME_SRC_DIR', - ], - LIBS = [ - 'automation', - 'browser', - 'browser_views', - 'common', - ], -) - -if env.Bit('windows'): - env.Prepend( - LINKFLAGS = [ - '/INCREMENTAL', - '/DEBUG', - - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"uxtheme.dll"', - - '/MACHINE:X86', - '/FIXED:No', - - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - ], - LIBS = [ - 'comsupp', - 'oleacc', - 'psapi', - 'rpcrt4', - 'winmm', - ], - ) - -input_files = ChromeFileList([ - # TODO(sgk): violate standard indentation so we don't have to - # reindent too much when we remove the explicit MSVSFilter() calls - # in favor of generating the hierarchy to reflect the file system. - MSVSFilter('Common', [ - '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX', - '$CHROME_DIR/tools/build/win/precompiled_wtl.h', - 'reliability_test_suite.h', - 'run_all_unittests.cc', - '$CHROME_DIR/test/testing_browser_process.h', - '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX', - '$CHROME_DIR/test/ui/ui_test.h', - '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX', - ]), - MSVSFilter('MemoryUsage', [ - '$CHROME_DIR/test/perf/mem_usage$OBJSUFFIX', - '$CHROME_DIR/test/perf/mem_usage.h', - ]), - MSVSFilter('TestPageLoader', [ - 'page_load_test.cc', - 'page_load_test.h', - ]), -]) - -if not env.Bit('windows'): - # Windows-specific. - input_files.Remove( - '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX', - '$CHROME_DIR/tools/build/win/precompiled_wtl.h', - ) - -# TODO(port): -if env.Bit('windows'): - env.ChromeTestProgram('reliability_tests', input_files) - -p = env.ChromeMSVSProject('reliability_tests.vcproj', - dest=('$CHROME_SRC_DIR/chrome/' - + 'test/reliability/reliability_tests.vcproj'), - guid='{8A3E1774-1DE9-445C-982D-3EE37C8A752A}', - 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', - ], - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - local_directory_prefix='./', - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - MSVSTool('VCLinkerTool', - AdditionalDependencies='winmm.lib'), - 'VCALinkTool', - 'VCManifestTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCAppVerifierTool', - 'VCWebDeploymentTool', - 'VCPostBuildEventTool', - ], - ConfigurationType='1') - - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/debug.vsprops', - '../../tools/build/win/precompiled_wtl.vsprops', - '../../tools/build/win/unit_test.vsprops', - '../../tools/build/win/ui_test.vsprops', - '../../tools/build/win/test_memory_usage.vsprops', - '../../tools/build/win/reliability_test.vsprops', - '$(SolutionDir)../skia/using_skia.vsprops', - '$(SolutionDir)../testing/using_gtest.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/release.vsprops', - '../../tools/build/win/unit_test.vsprops', - '../../tools/build/win/ui_test.vsprops', - '../../tools/build/win/test_memory_usage.vsprops', - '../../tools/build/win/reliability_test.vsprops', - '$(SolutionDir)../skia/using_skia.vsprops', - '$(SolutionDir)../testing/using_gtest.vsprops', - ]) - -p.AddFileConfig('../../tools/build/win/precompiled_wtl.cc', - 'Debug|Win32', - tools=[ - MSVSTool('VCCLCompilerTool', - UsePrecompiledHeader='1'), - ]) diff --git a/chrome/test/security_tests/security_tests.scons b/chrome/test/security_tests/security_tests.scons deleted file mode 100644 index cd825ce..0000000 --- a/chrome/test/security_tests/security_tests.scons +++ /dev/null @@ -1,94 +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 = [ - '$CHROME_SRC_DIR', - ], -) - -if env.Bit('windows'): - env.Prepend( - LINKFLAGS = [ - '/INCREMENTAL', - - '/MANIFEST', - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"uxtheme.dll"', - '/MACHINE:X86', - '/FIXED:No', - - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - - '/DEBUG', - ], - LIBS = [ - 'DelayImp.lib', - ], - ) - -input_files = ChromeFileList([ - '$SANDBOX_DIR/tests/validation_tests/commands$OBJSUFFIX', - '$SANDBOX_DIR/tests/validation_tests/commands.h', - '$CHROME_DIR/test/injection_test_dll.h', - 'ipc_security_tests.cc', - 'ipc_security_tests.h', - 'security_tests.cc', -]) - -# TODO(port): -if env.Bit('windows'): - env.ChromeSharedLibrary('security_tests', input_files) - -p = env.ChromeMSVSProject('security_tests.vcproj', - dest=('$CHROME_SRC_DIR/chrome/' - + 'test/security_tests/security_tests.vcproj'), - guid='{E750512D-FC7C-4C98-BF04-0A0DAF882055}', - keyword='Win32Proj', - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - local_directory_prefix='./', - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - 'VCLinkerTool', - 'VCALinkTool', - 'VCManifestTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCAppVerifierTool', - 'VCWebDeploymentTool', - 'VCPostBuildEventTool', - ], - ConfigurationType='2') - - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/debug.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/release.vsprops', - ]) diff --git a/chrome/test/selenium/selenium_tests.scons b/chrome/test/selenium/selenium_tests.scons deleted file mode 100644 index f0c066a..0000000 --- a/chrome/test/selenium/selenium_tests.scons +++ /dev/null @@ -1,172 +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.ApplySConscript([ - '$BASE_DIR/using_base.scons', - '$BASE_DIR/gfx/using_base_gfx.scons', - '$CHROME_SRC_DIR/build/using_googleurl.scons', - '$GTEST_DIR/../using_gtest.scons', - '$ICU38_DIR/using_icu38.scons', - '$LIBPNG_DIR/using_libpng.scons', - '$MODP_B64_DIR/using_modp_b64.scons', - '$NET_DIR/using_net.scons', - '$SKIA_DIR/using_skia.scons', - '$ZLIB_DIR/using_zlib.scons', -]) - -env.Prepend( - CPPDEFINES = [ - 'UI_TEST', - 'UNIT_TEST', - ], - CPPPATH = [ - '$GTEST_DIR/include', - '$GTEST_DIR', - '$SKIA_DIR/include', - '$SKIA_DIR/include/corecg', - '$SKIA_DIR/platform', - '$CHROME_SRC_DIR', - ], - LIBS = [ - 'automation', - 'browser', - 'browser_views', - 'common', - ], -) - -if env.Bit('windows'): - env.Prepend( - LINKFLAGS = [ - '/INCREMENTAL', - '/DEBUG', - - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"uxtheme.dll"', - - '/MACHINE:X86', - '/FIXED:No', - - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - ], - LIBS = [ - 'winmm', - 'rpcrt4', - 'oleacc', - 'comsupp', - ], - ) - -input_files = ChromeFileList([ - # TODO(sgk): violate standard indentation so we don't have to - # reindent too much when we remove the explicit MSVSFilter() calls - # in favor of generating the hierarchy to reflect the file system. - MSVSFilter('Common', [ - '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX', - '$CHROME_DIR/tools/build/win/precompiled_wtl.h', - '$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX', - '$CHROME_DIR/test/testing_browser_process.h', - '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX', - '$CHROME_DIR/test/ui/ui_test.h', - '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX', - ]), - MSVSFilter('TestSelenium', [ - 'selenium_test.cc', - ]), -]) - -if not env.Bit('windows'): - # Windows-specific. - input_files.Remove( - '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX', - '$CHROME_DIR/tools/build/win/precompiled_wtl.h', - ) - -# TODO(port): -if env.Bit('windows'): - env.ChromeTestProgram('selenium_tests', input_files) - -p = env.ChromeMSVSProject('selenium_tests.vcproj', - dest=('$CHROME_SRC_DIR/chrome/' - + 'test/selenium/selenium_tests.vcproj'), - guid='{E3749617-BA3D-4230-B54C-B758E56D9FA5}', - 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', - ], - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - local_directory_prefix='./', - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - MSVSTool('VCLinkerTool', - AdditionalDependencies='winmm.lib'), - 'VCALinkTool', - 'VCManifestTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCAppVerifierTool', - 'VCWebDeploymentTool', - 'VCPostBuildEventTool', - ], - ConfigurationType='1') - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/debug.vsprops', - '../../tools/build/win/precompiled_wtl.vsprops', - '../../tools/build/win/unit_test.vsprops', - '../../tools/build/win/ui_test.vsprops', - '$(SolutionDir)../skia/using_skia.vsprops', - '$(SolutionDir)../testing/using_gtest.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/release.vsprops', - '../../tools/build/win/unit_test.vsprops', - '../../tools/build/win/ui_test.vsprops', - '$(SolutionDir)../skia/using_skia.vsprops', - '$(SolutionDir)../testing/using_gtest.vsprops', - ]) - -p.AddFileConfig('../../tools/build/win/precompiled_wtl.cc', - 'Debug|Win32', - tools=[ - MSVSTool('VCCLCompilerTool', - UsePrecompiledHeader='1'), - ]) diff --git a/chrome/test/startup/startup_tests.scons b/chrome/test/startup/startup_tests.scons deleted file mode 100644 index fcc4040..0000000 --- a/chrome/test/startup/startup_tests.scons +++ /dev/null @@ -1,205 +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.ApplySConscript([ - '$BASE_DIR/using_base.scons', - '$BASE_DIR/gfx/using_base_gfx.scons', - '$CHROME_SRC_DIR/build/using_googleurl.scons', - '$CHROME_SRC_DIR/tools/grit/build/using_generated_resources.scons', - '$GTEST_DIR/../using_gtest.scons', - '$ICU38_DIR/using_icu38.scons', - '$LIBPNG_DIR/using_libpng.scons', - '$MODP_B64_DIR/using_modp_b64.scons', - '$NET_DIR/using_net.scons', - '$SKIA_DIR/using_skia.scons', - '$ZLIB_DIR/using_zlib.scons', - '$CHROME_SRC_DIR/build/using_v8.scons', -]) - -env.Prepend( - CPPDEFINES = [ - 'UI_TEST', - ], - CPPPATH = [ - '$CHROME_SRC_DIR', - ], - LIBS = [ - 'automation', - 'browser', - 'common', - 'glue', - 'WTF', - # needed for shared link deps - 'sqlite', - 'xslt', - - 'WebKit', - 'WebCore', - 'V8Bindings', - 'v8_snapshot', - 'libxml', - 'port', - 'renderer', - 'JavaScriptCore_pcre', - - 'jpeg', - - 'bzip2', - 'X11', - 'Xrender', - 'Xext', - - 'media', - 'sdch', - 'views', - - 'hunspell', - 'printing', - 'modp_b64', - 'debugger', - ], -) - -if env.Bit('windows'): - env.Prepend( - LINKFLAGS = [ - '/INCREMENTAL', - '/DEBUG', - - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"uxtheme.dll"', - - '/MACHINE:X86', - '/FIXED:No', - - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - ], - LIBS = [ - 'browser_views', - 'comsupp', - 'oleacc', - 'rpcrt4', - 'winmm', - ], - ) - -input_files = ChromeFileList([ - # TODO(sgk): violate standard indentation so we don't have to - # reindent too much when we remove the explicit MSVSFilter() calls - # in favor of generating the hierarchy to reflect the file system. - MSVSFilter('Common', [ - '$CHROME_DIR/tools/build/win/precompiled.cc', - '$CHROME_DIR/tools/build/win/precompiled.h', - '$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX', - '$CHROME_DIR/test/testing_browser_process.h', - '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX', - '$CHROME_DIR/test/ui/ui_test.h', - '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX', - ]), - MSVSFilter('TestStartup', [ - 'feature_startup_test.cc', - 'startup_test.cc', - ]), -]) - -if not env.Bit('windows'): - # TODO(port): port. - input_files.Remove( - 'feature_startup_test.cc', - ) - - # Windows-specific files - input_files.Remove( - '$CHROME_DIR/tools/build/win/precompiled.cc', - ) - -# Please note that currently you have to manually ensure that Hammer/chrome -# is up to date when you build startup_tests. -# TODO(sgk): Proper dependency tracking for startup_tests. -startup_tests = env.ChromeTestProgram('startup_tests', input_files) - -p = env.ChromeMSVSProject('startup_tests.vcproj', - dest=('$CHROME_SRC_DIR/chrome/' - + 'test/startup/startup_tests.vcproj'), - guid='{D3E6C0FD-54C7-4FF2-9AE1-72F2DAFD820C}', - 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', - ], - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - local_directory_prefix='./', - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - MSVSTool('VCLinkerTool', - AdditionalDependencies='winmm.lib'), - 'VCALinkTool', - 'VCManifestTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCAppVerifierTool', - 'VCWebDeploymentTool', - 'VCPostBuildEventTool', - ], - ConfigurationType='1') - - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/debug.vsprops', - '../../tools/build/win/precompiled.vsprops', - '../../tools/build/win/unit_test.vsprops', - '../../tools/build/win/ui_test.vsprops', - '$(SolutionDir)../skia/using_skia.vsprops', - '$(SolutionDir)../testing/using_gtest.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/release.vsprops', - '../../tools/build/win/unit_test.vsprops', - '../../tools/build/win/ui_test.vsprops', - '$(SolutionDir)../skia/using_skia.vsprops', - '$(SolutionDir)../testing/using_gtest.vsprops', - ]) - -p.AddFileConfig('../../tools/build/win/precompiled.cc', - 'Debug|Win32', - tools=[ - MSVSTool('VCCLCompilerTool', - UsePrecompiledHeader='1'), - ]) diff --git a/chrome/test/tab_switching/tab_switching_test.scons b/chrome/test/tab_switching/tab_switching_test.scons deleted file mode 100644 index e5c1efd..0000000 --- a/chrome/test/tab_switching/tab_switching_test.scons +++ /dev/null @@ -1,172 +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.ApplySConscript([ - '$BASE_DIR/using_base.scons', - '$BASE_DIR/gfx/using_base_gfx.scons', - '$CHROME_SRC_DIR/build/using_googleurl.scons', - '$GTEST_DIR/../using_gtest.scons', - '$ICU38_DIR/using_icu38.scons', - '$LIBPNG_DIR/using_libpng.scons', - '$MODP_B64_DIR/using_modp_b64.scons', - '$NET_DIR/using_net.scons', - '$SKIA_DIR/using_skia.scons', - '$ZLIB_DIR/using_zlib.scons', -]) - -env.Prepend( - CPPDEFINES = [ - 'UI_TEST', - ], - CPPPATH = [ - '$CHROME_SRC_DIR', - ], - LIBS = [ - 'automation', - 'browser', - 'browser_views', - 'common', - ], -) - -if env.Bit('windows'): - env.Prepend( - LINKFLAGS = [ - '/INCREMENTAL', - '/DEBUG', - - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"uxtheme.dll"', - - '/MACHINE:X86', - '/FIXED:No', - - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - ], - LIBS = [ - 'comsupp', - 'oleacc', - 'psapi', - 'rpcrt4', - 'winmm', - ], - ) - -input_files = ChromeFileList([ - # TODO(sgk): violate standard indentation so we don't have to - # reindent too much when we remove the explicit MSVSFilter() calls - # in favor of generating the hierarchy to reflect the file system. - MSVSFilter('Common', [ - '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX', - '$CHROME_DIR/tools/build/win/precompiled_wtl.h', - '$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX', - '$CHROME_DIR/test/testing_browser_process.h', - '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX', - '$CHROME_DIR/test/ui/ui_test.h', - '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX', - ]), - MSVSFilter('TabSwitchingTest', [ - 'tab_switching_test.cc', - ]), -]) - -if not env.Bit('windows'): - # Windows-specific. - input_files.Remove( - '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX', - '$CHROME_DIR/tools/build/win/precompiled_wtl.h', - ) - -# TODO(port): -if env.Bit('windows'): - env.ChromeTestProgram('tab_switching_test', input_files) - -p = env.ChromeMSVSProject('tab_switching.vcproj', - name='tab_switching_test', - dest=('$CHROME_SRC_DIR/chrome/' - + 'test/tab_switching/tab_switching.vcproj'), - guid='{A34770EA-A574-43E8-9327-F79C04770E98}', - 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', - ], - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - local_directory_prefix='./', - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - MSVSTool('VCLinkerTool', - AdditionalDependencies='winmm.lib'), - 'VCALinkTool', - 'VCManifestTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCAppVerifierTool', - 'VCWebDeploymentTool', - 'VCPostBuildEventTool', - ], - ConfigurationType='1') - - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/debug.vsprops', - '../../tools/build/win/precompiled_wtl.vsprops', - '../../tools/build/win/unit_test.vsprops', - '../../tools/build/win/ui_test.vsprops', - '../../tools/build/win/test_memory_usage.vsprops', - '$(SolutionDir)../skia/using_skia.vsprops', - '$(SolutionDir)../testing/using_gtest.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/release.vsprops', - '../../tools/build/win/unit_test.vsprops', - '../../tools/build/win/ui_test.vsprops', - '../../tools/build/win/test_memory_usage.vsprops', - '$(SolutionDir)../skia/using_skia.vsprops', - '$(SolutionDir)../testing/using_gtest.vsprops', - ]) - -p.AddFileConfig('../../tools/build/win/precompiled_wtl.cc', - 'Debug|Win32', - tools=[ - MSVSTool('VCCLCompilerTool', - UsePrecompiledHeader='1'), - ]) diff --git a/chrome/test/ui/ui_tests.scons b/chrome/test/ui/ui_tests.scons deleted file mode 100644 index 28c50ee..0000000 --- a/chrome/test/ui/ui_tests.scons +++ /dev/null @@ -1,431 +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.SConscript([ - '$BASE_DIR/using_base.scons', - '$BASE_DIR/gfx/using_base_gfx.scons', - '$BZIP2_DIR/using_bzip2.scons', - '$CHROME_DIR/third_party/wtl/using_wtl.scons', - '$CHROME_SRC_DIR/build/using_googleurl.scons', - '$CHROME_SRC_DIR/tools/grit/build/using_generated_resources.scons', - '$GTEST_DIR/../using_gtest.scons', - '$ICU38_DIR/using_icu38.scons', - '$LIBPNG_DIR/using_libpng.scons', - '$LIBXML_DIR/using_libxml.scons', - '$LIBXSLT_DIR/using_libxslt.scons', - '$MODP_B64_DIR/using_modp_b64.scons', - '$NET_DIR/using_net.scons', - #'$NPAPI_DIR/using_npapi.scons', - '$SDCH_DIR/using_sdch.scons', - '$SKIA_DIR/using_skia.scons', - '$ZLIB_DIR/using_zlib.scons', - '$CHROME_SRC_DIR/build/using_v8.scons', -], {'env':env}) - -env.Prepend( - CPPPATH = [ - '$CHROME_DIR/app/resources', - '$CHROME_SRC_DIR', - ], - CPPDEFINES = [ - 'UI_TEST', - ], - LIBS = [ - 'automation', - 'browser', - 'common', - 'glue', - 'port', - 'sqlite', - 'WTF', - 'views', - - 'WebKit', - 'WebCore', - 'V8Bindings', - 'v8_snapshot', - 'libxml', - 'port', - 'renderer', - 'JavaScriptCore_pcre', - - 'jpeg', - - 'bzip2', - 'X11', - 'Xrender', - 'Xext', - - 'media', - 'sdch', - 'views', - - 'hunspell', - 'printing', - 'modp_b64', - 'debugger', - - ] -) - -if env.Bit('windows'): - # TODO(port): split these into upper env.Prepend (for portable libs) and - # lower env.Prepend (for win-specific libs). - env.Prepend( - LIBS = [ - 'browser_views', - 'npapi_layout_test_plugin', - 'npapi_test_plugin', - 'security_tests', - ], - ) - -if env.Bit('windows'): - env.Prepend( - CPPPATH = [ - '$CHROME_DIR/tools/build/win', - ], - LINKFLAGS = [ - '/INCREMENTAL', - - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - - '/MANIFEST', - '/DELAYLOAD:"ws2_32.dll"', - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"uxtheme.dll"', - - '/DEBUG', - '/MACHINE:X86', - '/FIXED:No', - ], - LIBS = [ - 'comsupp', - 'oleacc', - 'rpcrt4', - 'winmm', - ], - ) - -input_files = ChromeFileList([ - # TODO(sgk): violate standard indentation so we don't have to - # reindent too much when we remove the explicit MSVSFilter() calls - # in favor of generating the hierarchy to reflect the file system. - MSVSFilter('Common', [ - 'npapi_test_helper.cc', - 'npapi_test_helper.h', - '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX', - '$CHROME_DIR/tools/build/win/precompiled_wtl.h', - 'run_all_unittests.cc', - 'javascript_test_util.cc', - 'javascript_test_util.h', - '$CHROME_DIR/test/testing_browser_process.h', - 'ui_test.cc', - 'ui_test.h', - 'ui_test_suite.cc', - 'ui_test_suite.h', - '$NET_DIR/url_request/url_request_test_job$OBJSUFFIX', - '$NET_DIR/url_request/url_request_test_job.h', - ]), - MSVSFilter('TestChromeMain', [ - '$CHROME_DIR/app/chrome_main_uitest.cc', - ]), - MSVSFilter('TestErrorPage', [ - '$CHROME_DIR/browser/errorpage_uitest.cc', - ]), - MSVSFilter('TestBrowser', [ - '$CHROME_DIR/browser/browser_uitest.cc', - MSVSFilter('TestImages', [ - '$CHROME_DIR/browser/images_uitest.cc', - ]), - ]), - MSVSFilter('TestChromeLogging', [ - '$CHROME_DIR/common/logging_chrome_uitest.cc', - ]), - MSVSFilter('TestDownload', [ - '$CHROME_DIR/browser/download/download_uitest.cc', - ]), - MSVSFilter('TestIFrame', [ - '$CHROME_DIR/browser/iframe_uitest.cc', - ]), - MSVSFilter('TestCache', [ - '$CHROME_DIR/common/net/cache_uitest.cc', - ]), - MSVSFilter('TestSanity', [ - '$CHROME_DIR/browser/sanity_uitest.cc', - ]), - MSVSFilter('TestAutomationProxy', [ - '$CHROME_DIR/test/automation/automation_proxy_uitest.cc', - ]), - MSVSFilter('TestNPAPI', [ - 'layout_plugin_uitest.cc', - 'npapi_uitest.cc', - ]), - MSVSFilter('TestSessionHistory', [ - '$CHROME_DIR/browser/session_history_uitest.cc', - ]), - MSVSFilter('TestSessionRestore', [ - '$CHROME_DIR/browser/sessions/session_restore_uitest.cc', - ]), - MSVSFilter('TestTabRestore', [ - '$CHROME_DIR/browser/tab_restore_uitest.cc', - ]), - MSVSFilter('TestUnload', [ - '$CHROME_DIR/browser/unload_uitest.cc', - ]), - MSVSFilter('TestAuthentication', [ - '$CHROME_DIR/browser/login_prompt_uitest.cc', - ]), - MSVSFilter('TestPreferences', [ - '$CHROME_DIR/common/pref_service_uitest.cc', - ]), - MSVSFilter('TestViewSource', [ - '$CHROME_DIR/browser/tab_contents/view_source_uitest.cc', - ]), - MSVSFilter('TestRedirects', [ - '$CHROME_DIR/browser/history/redirect_uitest.cc', - ]), - MSVSFilter('TestResourceDispatcherHost', [ - '$CHROME_DIR/browser/renderer_host/resource_dispatcher_host_uitest.cc', - ]), - MSVSFilter('TestFindInPage', [ - '$CHROME_DIR/browser/views/find_bar_win_uitest.cc', - ]), - MSVSFilter('TestPageLoader', [ - '$CHROME_DIR/test/perf/mem_usage.cc', - '$CHROME_DIR/test/perf/mem_usage.h', - '$CHROME_DIR/test/reliability/page_load_test$OBJSUFFIX', - '$CHROME_DIR/test/reliability/page_load_test.h', - ]), - MSVSFilter('TestSandbox', [ - 'sandbox_uitests.cc', - ]), - MSVSFilter('TestInspector', [ - 'inspector_controller_uitest.cc', - ]), - MSVSFilter('TestLocalizedBuilds', [ - '$CHROME_DIR/browser/locale_tests_uitest.cc', - ]), - MSVSFilter('TestMetricsService', [ - '$CHROME_DIR/browser/metrics/metrics_service_uitest.cc', - ]), - MSVSFilter('TestInterstitialPage', [ - '$CHROME_DIR/browser/interstitial_page_uitest.cc', - ]), - MSVSFilter('TestSSL', [ - '$CHROME_DIR/browser/ssl/ssl_uitest.cc', - ]), - MSVSFilter('TestAccessibility', [ - '$CHROME_DIR/test/accessibility/accessibility_tests.cc', - MSVSFilter('Accessibility Client', [ - '$CHROME_DIR/test/accessibility/accessibility_util.cc', - '$CHROME_DIR/test/accessibility/accessibility_util.h', - '$CHROME_DIR/test/accessibility/browser_impl.cc', - '$CHROME_DIR/test/accessibility/browser_impl.h', - '$CHROME_DIR/test/accessibility/constants.h', - '$CHROME_DIR/test/accessibility/keyboard_util.cc', - '$CHROME_DIR/test/accessibility/keyboard_util.h', - '$CHROME_DIR/test/accessibility/registry_util.cc', - '$CHROME_DIR/test/accessibility/registry_util.h', - '$CHROME_DIR/test/accessibility/tab_impl.cc', - '$CHROME_DIR/test/accessibility/tab_impl.h', - ]), - ]), - MSVSFilter('TestCrashRecovery', [ - '$CHROME_DIR/browser/crash_recovery_uitest.cc', - ]), - MSVSFilter('TestPrinting', [ - '$CHROME_DIR/browser/printing/printing_layout_uitest.cc', - '$CHROME_DIR/browser/printing/printing_test.h', - ]), - MSVSFilter('TestSavePage', [ - '$CHROME_DIR/browser/download/save_page_uitest.cc', - ]), - MSVSFilter('TestOmnibox', [ - 'omnibox_uitest.cc', - ]), - MSVSFilter('TestHistory', [ - 'history_uitest.cc', - ]), - MSVSFilter('TestDOMChecker', [ - 'dom_checker_uitest.cc', - ]), - MSVSFilter('TestSunSpider', [ - 'sunspider_uitest.cc', - ]), - MSVSFilter('TestV8Benchmark', [ - 'v8_benchmark_uitest.cc', - ]), -]) - -if not env.Bit('windows'): - # TODO(port): mark which of these work and which don't. - input_files.Remove( - 'layout_plugin_uitest.cc', - 'npapi_test_helper.cc', - 'npapi_uitest.cc', - 'omnibox_uitest.cc', - 'dom_checker_uitest.cc', - 'sunspider_uitest.cc', - 'v8_benchmark_uitest.cc', - - 'sandbox_uitests.cc', - - '$CHROME_DIR/app/chrome_main_uitest.cc', - '$CHROME_DIR/browser/browser_uitest.cc', - '$CHROME_DIR/browser/crash_recovery_uitest.cc', - '$CHROME_DIR/browser/download/download_uitest.cc', - '$CHROME_DIR/browser/download/save_page_uitest.cc', - '$CHROME_DIR/browser/errorpage_uitest.cc', - '$CHROME_DIR/browser/iframe_uitest.cc', - '$CHROME_DIR/browser/history/redirect_uitest.cc', - '$CHROME_DIR/browser/interstitial_page_uitest.cc', - '$CHROME_DIR/browser/login_prompt_uitest.cc', - '$CHROME_DIR/browser/metrics/metrics_service_uitest.cc', - '$CHROME_DIR/browser/printing/printing_layout_uitest.cc', - '$CHROME_DIR/browser/renderer_host/resource_dispatcher_host_uitest.cc', - '$CHROME_DIR/browser/session_history_uitest.cc', - '$CHROME_DIR/browser/sessions/session_restore_uitest.cc', - '$CHROME_DIR/browser/ssl/ssl_uitest.cc', - '$CHROME_DIR/browser/tab_contents/view_source_uitest.cc', - '$CHROME_DIR/browser/tab_restore_uitest.cc', - '$CHROME_DIR/browser/unload_uitest.cc', - '$CHROME_DIR/common/logging_chrome_uitest.cc', - '$CHROME_DIR/common/net/cache_uitest.cc', - '$CHROME_DIR/common/pref_service_uitest.cc', - '$CHROME_DIR/test/accessibility/accessibility_tests.cc', - '$CHROME_DIR/test/accessibility/accessibility_util.cc', - '$CHROME_DIR/test/accessibility/browser_impl.cc', - '$CHROME_DIR/test/accessibility/keyboard_util.cc', - '$CHROME_DIR/test/accessibility/registry_util.cc', - '$CHROME_DIR/test/accessibility/tab_impl.cc', - '$CHROME_DIR/test/automation/automation_proxy_uitest.cc', - '$CHROME_DIR/test/perf/mem_usage.cc', - '$CHROME_DIR/test/reliability/page_load_test$OBJSUFFIX', - '$NET_DIR/url_request/url_request_test_job$OBJSUFFIX', - ) - -if not env.Bit('windows'): - # Windows-specific tests. - input_files.Remove( - '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX', - '$CHROME_DIR/tools/build/win/precompiled_wtl.h', - '$CHROME_DIR/browser/views/find_bar_win_interactive_uitest.cc', - '$CHROME_DIR/browser/views/find_bar_win_uitest.cc', - ) - -env.ChromeTestProgram('ui_tests', input_files) - -p = env.ChromeMSVSProject('ui_tests.vcproj', - dest='$CHROME_SRC_DIR/chrome/test/ui/ui_tests.vcproj', - guid='{76235B67-1C27-4627-8A33-4B2E1EF93EDE}', - 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', - ], - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - local_directory_prefix='./', - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - MSVSTool('VCCLCompilerTool', - AdditionalIncludeDirectories=[ - '"$(OutDir)/obj/generated_resources"', - ]), - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - MSVSTool('VCLinkerTool', - AdditionalDependencies='winmm.lib'), - 'VCALinkTool', - 'VCManifestTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCAppVerifierTool', - 'VCWebDeploymentTool', - 'VCPostBuildEventTool', - ], - ConfigurationType='1') - - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/debug.vsprops', - '../../tools/build/win/precompiled_wtl.vsprops', - ('$(SolutionDir)../third_party/' - + 'libxml/build/using_libxml.vsprops'), - ('$(SolutionDir)../third_party/' - + 'libxslt/build/using_libxslt.vsprops'), - '../../tools/build/win/unit_test.vsprops', - '../../tools/build/win/ui_test.vsprops', - '../../tools/build/win/test_memory_usage.vsprops', - '$(SolutionDir)../skia/using_skia.vsprops', - '$(SolutionDir)../third_party/icu38/build/using_icu.vsprops', - '$(SolutionDir)/tools/build/win/js_engine.vsprops', - '$(SolutionDir)../testing/using_gtest.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/release.vsprops', - ('$(SolutionDir)../third_party/' - + 'libxml/build/using_libxml.vsprops'), - ('$(SolutionDir)../third_party/' - + 'libxslt/build/using_libxslt.vsprops'), - '../../tools/build/win/unit_test.vsprops', - '../../tools/build/win/ui_test.vsprops', - '$(SolutionDir)../skia/using_skia.vsprops', - '$(SolutionDir)../third_party/icu38/build/using_icu.vsprops', - '$(SolutionDir)/tools/build/win/js_engine.vsprops', - '$(SolutionDir)../testing/using_gtest.vsprops', - ]) - -p.AddFileConfig('../../tools/build/win/precompiled_wtl.cc', - 'Debug|Win32', - tools=[ - MSVSTool('VCCLCompilerTool', - UsePrecompiledHeader='1'), - ]) diff --git a/chrome/test/unit/unit_tests.scons b/chrome/test/unit/unit_tests.scons deleted file mode 100644 index edc4ed7c..0000000 --- a/chrome/test/unit/unit_tests.scons +++ /dev/null @@ -1,553 +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') -Import('bdict_reader_o', 'bdict_writer_o') - -env = env.Clone() - -env.SConscript([ - '$BASE_DIR/gfx/using_base_gfx.scons', - '$BASE_DIR/using_base.scons', - '$BZIP2_DIR/using_bzip2.scons', - '$CHROME_DIR/third_party/hunspell/using_hunspell.scons', - '$CHROME_DIR/third_party/wtl/using_wtl.scons', - '$CHROME_SRC_DIR/build/using_googleurl.scons', - '$CHROME_SRC_DIR/build/using_v8.scons', - '$GRIT_DIR/build/using_generated_resources.scons', - '$GTEST_DIR/../using_gtest.scons', - '$ICU38_DIR/using_icu38.scons', - '$LIBJPEG_DIR/using_libjpeg.scons', - '$LIBPNG_DIR/using_libpng.scons', - '$LIBXML_DIR/using_libxml.scons', - '$LIBXSLT_DIR/using_libxslt.scons', - '$MODP_B64_DIR/using_modp_b64.scons', - '$MEDIA_DIR/using_media.scons', - '$NET_DIR/using_net.scons', - '$NPAPI_DIR/using_npapi.scons', - '$PRINTING_DIR/using_printing.scons', - '$SDCH_DIR/using_sdch.scons', - '$SKIA_DIR/using_skia.scons', - '$ZLIB_DIR/using_zlib.scons', -], {'env':env}) - -env.Prepend( - CPPPATH = [ - '$CHROME_DIR/app/resources', - '$CHROME_SRC_DIR', - ], - LIBS = [ - 'views', - - 'browser', - 'common', - 'debugger', - 'plugin', - 'renderer', - 'sqlite', - 'util', - 'v8_snapshot', - - 'WTF', - 'V8Bindings', - 'default_plugin', - 'glue', - 'JavaScriptCore_pcre', - 'port', - 'WebCore', - 'WebKit', - - 'X11', - 'Xrender', - 'Xext', - ], -) - -if env.Bit('windows'): - env.Prepend( - CPPPATH = [ - '$CHROME_DIR/tools/build/win', - ], - ) - -if env.Bit('windows'): - # TODO(port): Port or mark as Windows-specific. - env.Prepend( - LIBS = [ - # TODO(port): to be ported to Mac and Linux, or else - # moved to the Windows-specific list below. - 'browser_views', - 'jscre', - 'test_chrome_plugin', - 'views', - - # Windows-specific libraries. - 'activex_shim', - - 'winmm', - 'rpcrt4', - 'oleacc', - 'comsupp', - ], - LINKFLAGS = [ - '/INCREMENTAL', - - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - - '/MANIFEST', - '/DELAYLOAD:"ws2_32.dll"', - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"uxtheme.dll"', - - '/DEBUG', - '/MACHINE:X86', - '/FIXED:No', - ], - ) - -input_files = ChromeFileList([ - MSVSFilter('browser', [ - '$CHROME_DIR/browser/autocomplete/autocomplete_unittest.cc', - '$CHROME_DIR/browser/back_forward_menu_model_unittest.cc', - '$CHROME_DIR/browser/safe_browsing/bloom_filter_unittest.cc', - '$CHROME_DIR/browser/bookmarks/bookmark_context_menu_test.cc', - '$CHROME_DIR/browser/bookmarks/bookmark_drag_data_unittest.cc', - '$CHROME_DIR/browser/views/bookmark_editor_view_unittest.cc', - '$CHROME_DIR/browser/bookmarks/bookmark_folder_tree_model_unittest.cc', - '$CHROME_DIR/browser/bookmarks/bookmark_html_writer_unittest.cc', - '$CHROME_DIR/browser/bookmarks/bookmark_model_unittest.cc', - '$CHROME_DIR/browser/bookmarks/bookmark_table_model_unittest.cc', - '$CHROME_DIR/browser/bookmarks/bookmark_utils_unittest.cc', - '$CHROME_DIR/browser/browser_commands_unittest.cc', - '$CHROME_DIR/browser/chrome_thread_unittest.cc', - '$CHROME_DIR/browser/safe_browsing/chunk_range_unittest.cc', - '$CHROME_DIR/browser/command_updater_unittest.cc', - '$CHROME_DIR/browser/debugger/devtools_manager_unittest.cc', - '$CHROME_DIR/browser/net/dns_host_info_unittest.cc', - '$CHROME_DIR/browser/net/dns_master_unittest.cc', - '$CHROME_DIR/browser/download/download_manager_unittest.cc', - '$CHROME_DIR/browser/download/download_request_manager_unittest.cc', - '$CHROME_DIR/browser/password_manager/encryptor_unittest.cc', - '$CHROME_DIR/browser/history/expire_history_backend_unittest.cc', - '$CHROME_DIR/browser/extensions/extension_unittest.cc', - '$CHROME_DIR/browser/extensions/extension_ui_unittest.cc', - '$CHROME_DIR/browser/extensions/extensions_service_unittest.cc', - '$CHROME_DIR/browser/importer/firefox_importer_unittest.cc', - '$CHROME_DIR/browser/google_url_tracker_unittest.cc', - '$CHROME_DIR/browser/history/history_backend_unittest.cc', - '$CHROME_DIR/browser/autocomplete/history_contents_provider_unittest.cc', - '$CHROME_DIR/browser/history/history_querying_unittest.cc', - '$CHROME_DIR/browser/history/history_types_unittest.cc', - '$CHROME_DIR/browser/history/history_unittest.cc', - '$CHROME_DIR/browser/autocomplete/history_url_provider_unittest.cc', - '$CHROME_DIR/browser/importer/importer_unittest.cc', - '$CHROME_DIR/browser/views/keyword_editor_view_unittest.cc', - '$CHROME_DIR/browser/autocomplete/keyword_provider_unittest.cc', - '$CHROME_DIR/browser/login_prompt_unittest.cc', - '$CHROME_DIR/browser/metrics/metrics_log_unittest.cc', - '$CHROME_DIR/browser/metrics/metrics_response_unittest.cc', - '$CHROME_DIR/browser/navigation_controller_unittest.cc', - '$CHROME_DIR/browser/printing/page_number_unittest.cc', - '$CHROME_DIR/browser/printing/page_overlays_unittest.cc', - '$CHROME_DIR/browser/printing/page_range_unittest.cc', - '$CHROME_DIR/browser/printing/page_setup_unittest.cc', - '$CHROME_DIR/browser/password_manager/password_form_manager_unittest.cc', - '$CHROME_DIR/browser/printing/print_job_unittest.cc', - '$CHROME_DIR/browser/printing/printing_test.h', - '$CHROME_DIR/browser/profile_manager_unittest.cc', - '$CHROME_DIR/browser/safe_browsing/protocol_manager_unittest.cc', - '$CHROME_DIR/browser/safe_browsing/protocol_parser_unittest.cc', - '$CHROME_DIR/browser/history/query_parser_unittest.cc', - '$CHROME_DIR/browser/renderer_host/renderer_security_policy_unittest.cc', - '$CHROME_DIR/browser/renderer_host/resource_dispatcher_host_unittest.cc', - '$CHROME_DIR/browser/renderer_host/test_render_view_host.cc', - '$CHROME_DIR/browser/renderer_host/web_cache_manager_unittest.cc', - '$CHROME_DIR/browser/rlz/rlz_unittest.cc', - '$CHROME_DIR/browser/safe_browsing/safe_browsing_database_unittest.cc', - '$CHROME_DIR/browser/safe_browsing/safe_browsing_util_unittest.cc', - '$CHROME_DIR/browser/download/save_package_unittest.cc', - '$CHROME_DIR/browser/sessions/session_backend_unittest.cc', - '$CHROME_DIR/browser/sessions/session_service_test_helper.cc', - '$CHROME_DIR/browser/sessions/session_service_test_helper.h', - '$CHROME_DIR/browser/sessions/session_service_unittest.cc', - '$CHROME_DIR/browser/site_instance_unittest.cc', - '$CHROME_DIR/browser/history/snippet_unittest.cc', - '$CHROME_DIR/browser/spellcheck_unittest.cc', - '$CHROME_DIR/browser/history/starred_url_database_unittest.cc', - '$CHROME_DIR/browser/sessions/tab_restore_service_unittest.cc', - '$CHROME_DIR/browser/tabs/tab_strip_model_unittest.cc', - '$CHROME_DIR/browser/search_engines/template_url_model_unittest.cc', - '$CHROME_DIR/browser/search_engines/template_url_parser_unittest.cc', - '$CHROME_DIR/browser/search_engines/template_url_prepopulate_data_unittest.cc', - '$CHROME_DIR/browser/search_engines/template_url_unittest.cc', - '$CHROME_DIR/browser/history/text_database_manager_unittest.cc', - '$CHROME_DIR/browser/history/text_database_unittest.cc', - '$CHROME_DIR/browser/history/thumbnail_database_unittest.cc', - '$CHROME_DIR/browser/history/url_database_unittest.cc', - '$CHROME_DIR/browser/net/resolve_proxy_msg_helper_unittest.cc', - '$CHROME_DIR/browser/net/url_fetcher_unittest.cc', - '$CHROME_DIR/browser/net/url_fixer_upper_unittest.cc', - '$CHROME_DIR/browser/extensions/user_script_master_unittest.cc', - '$CHROME_DIR/browser/history/visit_database_unittest.cc', - '$CHROME_DIR/browser/history/visit_tracker_unittest.cc', - '$CHROME_DIR/browser/visitedlink_unittest.cc', - '$CHROME_DIR/browser/tab_contents/web_contents_unittest.cc', - '$CHROME_DIR/browser/webdata/web_database_unittest.cc', - '$CHROME_DIR/browser/printing/win_printing_context_unittest.cc', - '$CHROME_DIR/browser/window_sizer_unittest.cc', - '$CHROME_DIR/browser/renderer_host/render_widget_host_unittest.cc', - - # test_infrastructure - '$CHROME_DIR/browser/renderer_host/mock_render_process_host.cc', - '$CHROME_DIR/browser/renderer_host/mock_render_process_host.h', - '$CHROME_DIR/browser/tab_contents/test_web_contents.cc', - '$CHROME_DIR/browser/tab_contents/test_web_contents.h', - '$CHROME_DIR/test/browser_with_test_window_test.cc', - '$CHROME_DIR/test/browser_with_test_window_test.h', - '$CHROME_DIR/test/test_browser_window.h', - '$CHROME_DIR/test/test_tab_contents.cc', - '$CHROME_DIR/test/test_tab_contents.h', - ]), - MSVSFilter('common', [ - '$CHROME_DIR/common/animation_unittest.cc', - '$CHROME_DIR/common/bzip2_unittest.cc', - '$CHROME_DIR/common/chrome_plugin_unittest.cc', - '$CHROME_DIR/common/extensions/url_pattern_unittest.cc', - '$CHROME_DIR/common/extensions/user_script_unittest.cc', - '$CHROME_DIR/common/gfx/emf_unittest.cc', - '$CHROME_DIR/common/gfx/icon_util_unittest.cc', - '$CHROME_DIR/common/ipc_message_unittest.cc', - '$CHROME_DIR/common/ipc_sync_channel_unittest.cc', - '$CHROME_DIR/common/ipc_sync_channel_unittest.h', - '$CHROME_DIR/common/ipc_sync_message_unittest.cc', - '$CHROME_DIR/common/ipc_sync_message_unittest.h', - '$CHROME_DIR/common/json_value_serializer_unittest.cc', - '$CHROME_DIR/common/l10n_util_unittest.cc', - '$CHROME_DIR/common/mru_cache_unittest.cc', - '$CHROME_DIR/common/notification_service_unittest.cc', - '$CHROME_DIR/common/os_exchange_data_unittest.cc', - '$CHROME_DIR/common/pref_member_unittest.cc', - '$CHROME_DIR/common/pref_service_unittest.cc', - '$CHROME_DIR/common/property_bag_unittest.cc', - '$CHROME_DIR/common/resource_dispatcher_unittest.cc', - '$CHROME_DIR/common/gfx/text_elider_unittest.cc', - '$CHROME_DIR/common/time_format_unittest.cc', - '$CHROME_DIR/common/unzip_unittest.cc', - '$CHROME_DIR/common/win_util_unittest.cc', - '$CHROME_DIR/common/worker_thread_ticker_unittest.cc', - ]), - MSVSFilter('googleurl', [ - '$CHROME_DIR/../googleurl/src/gurl_unittest$OBJSUFFIX', - '$CHROME_DIR/../googleurl/src/url_canon_unittest$OBJSUFFIX', - '$CHROME_DIR/../googleurl/src/url_parse_unittest$OBJSUFFIX', - '$CHROME_DIR/../googleurl/src/url_util_unittest$OBJSUFFIX', - ]), - MSVSFilter('hunspell', [ - '$CHROME_DIR/tools/convert_dict/aff_reader$OBJSUFFIX', - '$CHROME_DIR/tools/convert_dict/aff_reader.h', - '$CHROME_DIR/third_party/hunspell/google/bdict.h', - bdict_reader_o, - '$CHROME_DIR/third_party/hunspell/google/bdict_reader.h', - bdict_writer_o, - '$CHROME_DIR/third_party/hunspell/google/bdict_writer.h', - '$CHROME_DIR/tools/convert_dict/dic_reader$OBJSUFFIX', - '$CHROME_DIR/tools/convert_dict/dic_reader.h', - '$CHROME_DIR/tools/convert_dict/hunspell_reader$OBJSUFFIX', - '$CHROME_DIR/tools/convert_dict/hunspell_reader.h', - '$CHROME_DIR/third_party/hunspell/google/hunspell_tests.cc', - ]), - MSVSFilter('renderer', [ - '$CHROME_DIR/renderer/extensions/greasemonkey_api_unittest.cc', - '$CHROME_DIR/renderer/net/render_dns_master_unittest.cc', - '$CHROME_DIR/renderer/net/render_dns_queue_unittest.cc', - '$CHROME_DIR/renderer/render_view_unittest.cc', - '$CHROME_DIR/renderer/render_widget_unittest.cc', - '$CHROME_DIR/renderer/render_process_unittest.cc', - '$CHROME_DIR/renderer/render_thread_unittest.cc', - '$CHROME_DIR/renderer/renderer_main_unittest.cc', - - # test_infrastructure - '$CHROME_DIR/renderer/mock_render_process.h', - '$CHROME_DIR/renderer/mock_render_thread.cc', - '$CHROME_DIR/renderer/mock_render_thread.h', - '$CHROME_DIR/test/v8_unit_test.h', - '$CHROME_DIR/test/v8_unit_test.cc', - ]), - MSVSFilter('resources', [ - '$CHROME_DIR/browser/browser_resources.h', - '$CHROME_DIR/browser/browser_resources.rc', - '$CHROME_DIR/app/chrome_dll.rc', - '$CHROME_DIR/app/chrome_dll_resource.h', - '$CHROME_DIR/app/chrome_dll_version.rc.version', - '$CHROME_DIR/common/common_resources.h', - '$CHROME_DIR/common/common_resources.rc', - '$CHROME_DIR/browser/debugger/resources/debugger_resources.h', - '$CHROME_DIR/browser/debugger/resources/debugger_resources.rc', - '$TARGET_ROOT/grit_derived_sources/net_resources.res', - '$CHROME_DIR/renderer/renderer_resources.h', - '$CHROME_DIR/renderer/renderer_resources.rc', - '$CHROME_DIR/test/data/resource.h', - '$CHROME_DIR/test/data/resource.rc', - '$TARGET_ROOT/grit_derived_sources/webkit_resources.res', - ]), - MSVSFilter('test_infrastructure', [ - 'chrome_test_suite.h', - '$CHROME_DIR/common/ipc_test_sink.cc', - '$CHROME_DIR/common/ipc_test_sink.h', - '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX', - '$CHROME_DIR/tools/build/win/precompiled_wtl.h', - 'run_all_unittests.cc', - '$CHROME_DIR/test/test_notification_tracker.cc', - '$CHROME_DIR/test/test_notification_tracker.h', - '$CHROME_DIR/test/testing_browser_process.h', - '$CHROME_DIR/test/testing_profile.cc', - '$CHROME_DIR/test/testing_profile.h', - '$NET_DIR/url_request/url_request_test_job$OBJSUFFIX', - '$NET_DIR/url_request/url_request_test_job.h', - ]), -]) - -if env.Bit('mac'): - # TODO(port): Port to Mac. - input_files.Remove( - 'run_all_unittests.cc', - - '$CHROME_DIR/browser/chrome_thread_unittest.cc', - '$CHROME_DIR/browser/extensions/extension_unittest.cc', - '$CHROME_DIR/browser/extensions/extensions_service_unittest.cc', - '$CHROME_DIR/browser/history/history_types_unittest.cc', - '$CHROME_DIR/browser/history/snippet_unittest.cc', - '$CHROME_DIR/browser/history/text_database_unittest.cc', - '$CHROME_DIR/browser/history/visit_tracker_unittest.cc', - '$CHROME_DIR/browser/metrics/metrics_response_unittest.cc', - '$CHROME_DIR/browser/net/dns_host_info_unittest.cc', - '$CHROME_DIR/browser/net/dns_master_unittest.cc', - '$CHROME_DIR/browser/net/url_fetcher_unittest.cc', - '$CHROME_DIR/browser/printing/page_range_unittest.cc', - '$CHROME_DIR/browser/printing/page_setup_unittest.cc', - '$CHROME_DIR/browser/safe_browsing/bloom_filter_unittest.cc', - '$CHROME_DIR/browser/safe_browsing/chunk_range_unittest.cc', - '$CHROME_DIR/browser/safe_browsing/protocol_parser_unittest.cc', - '$CHROME_DIR/browser/safe_browsing/safe_browsing_database_unittest.cc', - '$CHROME_DIR/browser/safe_browsing/safe_browsing_util_unittest.cc', - '$CHROME_DIR/browser/spellcheck_unittest.cc', - '$CHROME_DIR/common/animation_unittest.cc', - '$CHROME_DIR/common/bzip2_unittest.cc', - '$CHROME_DIR/common/gfx/chrome_font_unittest.cc', - '$CHROME_DIR/common/ipc_message_unittest.cc', - '$CHROME_DIR/common/jpeg_codec_unittest.cc', - '$CHROME_DIR/common/json_value_serializer_unittest.cc', - '$CHROME_DIR/common/mru_cache_unittest.cc', - '$CHROME_DIR/common/notification_service_unittest.cc', - '$CHROME_DIR/common/pref_member_unittest.cc', - '$CHROME_DIR/common/worker_thread_ticker_unittest.cc', - '$CHROME_DIR/renderer/net/render_dns_queue_unittest.cc', - '$CHROME_DIR/test/test_notification_tracker.cc', - - '$NET_DIR/base/ssl_test_util$OBJSUFFIX', - ) - -if not env.Bit('windows'): - # Windows-specific. - input_files.Remove( - '$CHROME_DIR/browser/browser_resources.h', - '$CHROME_DIR/browser/browser_resources.rc', - '$CHROME_DIR/app/chrome_dll.rc', - '$CHROME_DIR/app/chrome_dll_resource.h', - '$CHROME_DIR/app/chrome_dll_version.rc.version', - '$CHROME_DIR/common/common_resources.h', - '$CHROME_DIR/common/common_resources.rc', - '$CHROME_DIR/browser/debugger/resources/debugger_resources.h', - '$CHROME_DIR/browser/debugger/resources/debugger_resources.rc', - '$TARGET_ROOT/grit_derived_sources/net_resources.res', - '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX', - '$CHROME_DIR/tools/build/win/precompiled_wtl.h', - '$CHROME_DIR/renderer/renderer_resources.h', - '$CHROME_DIR/renderer/renderer_resources.rc', - '$CHROME_DIR/test/data/resource.h', - '$CHROME_DIR/test/data/resource.rc', - '$TARGET_ROOT/grit_derived_sources/webkit_resources.res', - ) - -if env.Bit('posix'): - # POSIX only unittests - input_files.Append( - '$CHROME_DIR/common/file_descriptor_set_unittest.cc' - ) - -if not env.Bit('windows'): - # TODO(port): Port these. - input_files.Remove( - '$CHROME_DIR/browser/bookmarks/bookmark_context_menu_test.cc', - '$CHROME_DIR/browser/bookmarks/bookmark_drag_data_unittest.cc', - '$CHROME_DIR/browser/bookmarks/bookmark_folder_tree_model_unittest.cc', - '$CHROME_DIR/browser/bookmarks/bookmark_table_model_unittest.cc', - '$CHROME_DIR/browser/browser_commands_unittest.cc', - # This test is mostly about renaming downloads to safe file names. As such - # we don't need/want to port it to linux. We might want to write our own - # tests for the download manager on linux, though. - '$CHROME_DIR/browser/download/download_manager_unittest.cc', - '$CHROME_DIR/browser/extensions/user_script_master_unittest.cc', - '$CHROME_DIR/browser/importer/firefox_importer_unittest.cc', - '$CHROME_DIR/browser/importer/importer_unittest.cc', - '$CHROME_DIR/browser/login_prompt_unittest.cc', - '$CHROME_DIR/browser/password_manager/encryptor_unittest.cc', - '$CHROME_DIR/browser/password_manager/password_form_manager_unittest.cc', - '$CHROME_DIR/browser/printing/page_number_unittest.cc', - '$CHROME_DIR/browser/printing/page_overlays_unittest.cc', - '$CHROME_DIR/browser/printing/print_job_unittest.cc', - '$CHROME_DIR/browser/printing/win_printing_context_unittest.cc', - '$CHROME_DIR/browser/rlz/rlz_unittest.cc', - '$CHROME_DIR/browser/sessions/session_service_unittest.cc', - '$CHROME_DIR/browser/tabs/tab_strip_model_unittest.cc', - '$CHROME_DIR/browser/views/bookmark_editor_view_unittest.cc', - '$CHROME_DIR/browser/views/keyword_editor_view_unittest.cc', - '$CHROME_DIR/browser/webdata/web_database_unittest.cc', - '$CHROME_DIR/browser/window_sizer_unittest.cc', - '$CHROME_DIR/common/chrome_plugin_unittest.cc', - '$CHROME_DIR/common/gfx/emf_unittest.cc', - '$CHROME_DIR/common/gfx/icon_util_unittest.cc', - '$CHROME_DIR/common/os_exchange_data_unittest.cc', - '$CHROME_DIR/common/win_util_unittest.cc', - '$CHROME_DIR/test/browser_with_test_window_test.cc', - - # Commented out for now because googleurl_tests doesn't build with - # gtest; see ../build/SConscript.googleurl. - #'$GOOGLEURL_DIR/googleurl_tests.lib', - '$NET_DIR/url_request/url_request_test_job$OBJSUFFIX', - - '$CHROME_DIR/browser/browser_resources.res', - '$CHROME_DIR/test/data/resource.res', - ) - -if not env.Bit('mac'): - # TODO(port): This should work on all platforms. - - unit_tests = env.ChromeTestProgram('unit_tests', input_files) - - i = env.Install('$TARGET_ROOT', unit_tests) - Alias('chrome', i) - -p = env.ChromeMSVSProject('unittests.vcproj', - dest='$CHROME_SRC_DIR/chrome/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/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', - '$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}', - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - local_directory_prefix='./', - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - MSVSTool('VCResourceCompilerTool', - AdditionalIncludeDirectories=[ - '$(SolutionDir)..', - '"$(IntDir)"', - '"$(IntDir)"', - '"$(SolutionDir)"', - '"$(IntDir)/../"', - ]), - 'VCPreLinkEventTool', - MSVSTool('VCLinkerTool', - AdditionalDependencies='winmm.lib'), - 'VCALinkTool', - 'VCManifestTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCAppVerifierTool', - 'VCWebDeploymentTool', - 'VCPostBuildEventTool', - ], - ConfigurationType='1') - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/debug.vsprops', - '../../tools/build/win/precompiled_wtl.vsprops', - '../../tools/build/win/unit_test.vsprops', - '$(SolutionDir)../third_party/libpng/using_libpng.vsprops', - '$(SolutionDir)../third_party/zlib/using_zlib.vsprops', - '$(SolutionDir)../skia/using_skia.vsprops', - '$(SolutionDir)../third_party/libxml/build/using_libxml.vsprops', - '$(SolutionDir)../third_party/icu38/build/using_icu.vsprops', - '$(SolutionDir)../testing/using_gtest.vsprops', - '../../third_party/hunspell/using_hunspell.vsprops', - '../../../third_party/npapi/using_npapi.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/release.vsprops', - '../../tools/build/win/unit_test.vsprops', - '$(SolutionDir)../third_party/libpng/using_libpng.vsprops', - '$(SolutionDir)../third_party/zlib/using_zlib.vsprops', - '$(SolutionDir)../skia/using_skia.vsprops', - '$(SolutionDir)../third_party/libxml/build/using_libxml.vsprops', - '$(SolutionDir)../third_party/icu38/build/using_icu.vsprops', - '$(SolutionDir)../testing/using_gtest.vsprops', - '../../third_party/hunspell/using_hunspell.vsprops', - '../../../third_party/npapi/using_npapi.vsprops', - ]) - -p.AddFileConfig('../../tools/build/win/precompiled_wtl.cc', - 'Debug|Win32', - tools=[ - MSVSTool('VCCLCompilerTool', - UsePrecompiledHeader='1'), - ]) diff --git a/chrome/third_party/hunspell/SConscript b/chrome/third_party/hunspell/SConscript deleted file mode 100644 index c9c92c0..0000000 --- a/chrome/third_party/hunspell/SConscript +++ /dev/null @@ -1,173 +0,0 @@ -# Copyright 2008, Google Inc. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following disclaimer -# in the documentation and/or other materials provided with the -# distribution. -# * Neither the name of Google Inc. nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# Copyright 2008 Google Inc. All Rights Reserved. - -Import('env') - -env = env.Clone() - -env.Prepend( - CPPPATH = [ - '$ICU38_DIR/public/common', - '$CHROME_SRC_DIR', - ], -) - -env.Append( - CPPDEFINES = [ - 'OPENOFFICEORG', - 'CHROME_SPELL', - 'HUNSPELL_CHROME_CLIENT', - ], -) - -if env.Bit('windows'): - env.Append( - CPPDEFINES = [ - 'W32', - ], - CCFLAGS = [ - '/TP', - - '/wd4800', - ], - ) - -if env.Bit('linux'): - env.Append( - CCFLAGS = [ - '-Wno-parentheses', - '-Wno-unused-value', - '-Wno-unused-variable', - '-Wno-write-strings', - ], - ) - -input_files = ChromeFileList([ - # TODO(sgk): violate standard indentation so we don't have to - # reindent too much when we remove the explicit MSVSFilter() calls - # in favor of generating the hierarchy to reflect the file system. - MSVSFilter('parsers', [ - 'src/parsers/textparser.cxx', - 'src/parsers/textparser.hxx', - ]), - MSVSFilter('hunspell', [ - 'src/hunspell/affentry.cxx', - 'src/hunspell/affentry.hxx', - 'src/hunspell/affixmgr.cxx', - 'src/hunspell/affixmgr.hxx', - 'src/hunspell/atypes.hxx', - 'src/hunspell/baseaffix.hxx', - 'src/hunspell/csutil.cxx', - 'src/hunspell/csutil.hxx', - 'src/hunspell/dictmgr.cxx', - 'src/hunspell/dictmgr.hxx', - 'src/hunspell/hashmgr.cxx', - 'src/hunspell/hashmgr.hxx', - 'src/hunspell/htypes.hxx', - 'src/hunspell/hunspell.cxx', - 'src/hunspell/hunspell.h', - 'src/hunspell/hunspell.hxx', - 'src/hunspell/langnum.hxx', - 'src/hunspell/suggestmgr.cxx', - 'src/hunspell/suggestmgr.hxx', - 'src/hunspell/utf_info.hxx', - ]), - MSVSFilter('google', [ - 'google/bdict.h', - 'google/bdict_affentry.h', - 'google/bdict_reader.h', - 'google/bdict_writer.h', - ]), -]) - -if env.Bit('linux'): - bdict_reader_o = env.ChromeObject('google/bdict_reader.cc') - input_files.Append(bdict_reader_o) - bdict_writer_o = env.ChromeObject('google/bdict_writer.cc') - input_files.Append(bdict_writer_o) - Export('bdict_reader_o', 'bdict_writer_o') -else: - input_files.Append( - MSVSFilter('google', [ - 'google/bdict_reader.cc', - 'google/bdict_writer.cc', - ]), - ) - -env.ChromeLibrary('hunspell', input_files) - - -p = env.ChromeMSVSProject('hunspell.vcproj', - dest=('$CHROME_SRC_DIR/chrome/' - + 'third_party/hunspell/hunspell.vcproj'), - guid='{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E}', - keyword='Win32Proj', - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - relative_path_prefix='./', - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - 'VCLibrarianTool', - 'VCALinkTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCPostBuildEventTool', - ], - ConfigurationType='4') - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '../../../build/debug.vsprops', - '$(SolutionDir)../build/external_code.vsprops', - './hunspell.vsprops', - './using_hunspell.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '../../../build/release.vsprops', - '$(SolutionDir)../build/external_code.vsprops', - './hunspell.vsprops', - './using_hunspell.vsprops', - ]) diff --git a/chrome/third_party/hunspell/using_hunspell.scons b/chrome/third_party/hunspell/using_hunspell.scons deleted file mode 100644 index 51d430d..0000000 --- a/chrome/third_party/hunspell/using_hunspell.scons +++ /dev/null @@ -1,22 +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. - -__doc__ = """ -Settings for other components using hunspell. -""" - -Import("env") - -env.Append( - CPPDEFINES = [ - 'USE_HUNSPELL', - 'HUNSPELL_CHROME_CLIENT', - ], - CPPPATH = [ - '$CHROME_DIR/third_party/hunspell/src/hunspell', - ], - LIBS = [ - 'hunspell', - ], -) diff --git a/chrome/third_party/wtl/using_wtl.scons b/chrome/third_party/wtl/using_wtl.scons deleted file mode 100644 index 21e528a..0000000 --- a/chrome/third_party/wtl/using_wtl.scons +++ /dev/null @@ -1,15 +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. - -__doc__ = """ -Settings for other components using wtl. -""" - -Import("env") - -env.Append( - CPPPATH = [ - '$CHROME_DIR/third_party/wtl/include', - ], -) diff --git a/chrome/tools/convert_dict/convert_dict.scons b/chrome/tools/convert_dict/convert_dict.scons deleted file mode 100644 index 1d7da3a..0000000 --- a/chrome/tools/convert_dict/convert_dict.scons +++ /dev/null @@ -1,93 +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') -Import('bdict_reader_o', 'bdict_writer_o') - -env = env.Clone() - -env.ApplySConscript([ - '$BASE_DIR/using_base.scons', -# '$BASE_DIR/gfx/using_base_gfx.scons', -# '$BREAKPAD_DIR/using_breakpad.scons', - '$ICU38_DIR/using_icu38.scons', -# '$SKIA_DIR/using_skia.scons', -# '$ZLIB_DIR/using_zlib.scons', -]) - -if env.Bit('windows'): - env.Prepend( - LIBS = [ - #'breakpad_handler', - #'breakpad_sender', - #'common', - ], - ) - -input_files = ChromeFileList([ - 'aff_reader.cc', - 'aff_reader.h', - '$CHROME_DIR/third_party/hunspell/google/bdict.h', - bdict_reader_o, - '$CHROME_DIR/third_party/hunspell/google/bdict_reader.h', - bdict_writer_o, - '$CHROME_DIR/third_party/hunspell/google/bdict_writer.h', - 'convert_dict.cc', - 'dic_reader.cc', - 'dic_reader.h', - 'hunspell_reader.cc', - 'hunspell_reader.h', -]) - -env.ChromeProgram('convert_dict', input_files) - -p = env.ChromeMSVSProject('convert_dict.vcproj', - dest=('$CHROME_SRC_DIR/chrome/' - + 'tools/convert_dict/convert_dict.vcproj'), - guid='{42ECD5EC-722F-41DE-B6B8-83764C8016DF}', - keyword='Win32Proj', - dependencies = [ - '$BASE_DIR/build/base.vcproj', - '$ICU38_DIR/build/icu.vcproj', - '$ICU38_DIR/build/icudt.vcproj', - ], - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - local_directory_prefix='./', - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - 'VCLinkerTool', - 'VCALinkTool', - 'VCManifestTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCAppVerifierTool', - 'VCWebDeploymentTool', - 'VCPostBuildEventTool', - ], - ConfigurationType='1') - - -p.AddConfig('Debug|Win32', - CharacterSet='2', - InheritedPropertySheets=[ - '../../../build/debug.vsprops', - ]) - -p.AddConfig('Release|Win32', - CharacterSet='2', - InheritedPropertySheets=[ - '../../../build/release.vsprops', - ]) diff --git a/chrome/tools/crash_service/crash_service.scons b/chrome/tools/crash_service/crash_service.scons deleted file mode 100644 index da8eddf..0000000 --- a/chrome/tools/crash_service/crash_service.scons +++ /dev/null @@ -1,110 +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.ApplySConscript([ - '$BASE_DIR/using_base.scons', - '$BASE_DIR/gfx/using_base_gfx.scons', - '$BREAKPAD_DIR/using_breakpad.scons', - '$ICU38_DIR/using_icu38.scons', - '$SKIA_DIR/using_skia.scons', - '$ZLIB_DIR/using_zlib.scons', -]) - -if env.Bit('windows'): - env.Prepend( - CPPPATH = [ - '$CHROME_SRC_DIR', - ], - LIBS = [ - 'breakpad_handler', - 'breakpad_sender', - 'common', - ], - LINKFLAGS = [ - '/INCREMENTAL', - - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"uxtheme.dll"', - - '/DEBUG', - '/MACHINE:X86', - '/FIXED:No', - - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - ], - ) - -input_files = ChromeFileList([ - 'crash_service.cc', - 'crash_service.h', - 'main.cc', -]) - -# TODO(port): -if env.Bit('windows'): - env.ChromeProgram('crash_service', input_files) - -p = env.ChromeMSVSProject('crash_service.vcproj', - dest=('$CHROME_SRC_DIR/chrome/' - + 'tools/crash_service/crash_service.vcproj'), - guid='{89C1C190-A5D1-4EC4-BD6A-67FF2195C7CC}', - keyword='Win32Proj', - 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', - ], - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - relative_path_prefix='./', - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - 'VCLinkerTool', - 'VCALinkTool', - 'VCManifestTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCAppVerifierTool', - 'VCWebDeploymentTool', - 'VCPostBuildEventTool', - ], - ConfigurationType='1') - - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/debug.vsprops', - '$(SolutionDir)../breakpad/using_breakpad.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/release.vsprops', - '$(SolutionDir)../breakpad/using_breakpad.vsprops', - ]) diff --git a/chrome/tools/perf/flush_cache/flush_cache.scons b/chrome/tools/perf/flush_cache/flush_cache.scons deleted file mode 100644 index ee36224..0000000 --- a/chrome/tools/perf/flush_cache/flush_cache.scons +++ /dev/null @@ -1,90 +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.ApplySConscript([ - '$BASE_DIR/using_base.scons', - '$ICU38_DIR/using_icu38.scons', -]) - -env.Prepend( - CPPPATH = [ - '$CHROME_SRC_DIR', - ], -) - -if env.Bit('windows'): - env.Prepend( - LINKFLAGS = [ - '/INCREMENTAL', - '/DEBUG', - - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"uxtheme.dll"', - - '/MACHINE:X86', - '/FIXED:No', - - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - ], - ) - -input_files = ChromeFileList([ - 'flush_cache.cc', -]) - -env.ChromeTestProgram('flush_cache', input_files) - -p = env.ChromeMSVSProject('flush_cache.vcproj', - dest=('$CHROME_SRC_DIR/chrome/' - + 'tools/perf/flush_cache/flush_cache.vcproj'), - guid='{4539AFB3-B8DC-47F3-A491-6DAC8FD26657}', - dependencies = [ - '$BASE_DIR/build/base.vcproj', - '$ICU38_DIR/build/icu.vcproj', - ], - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - relative_path_prefix='./', - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - 'VCLinkerTool', - 'VCALinkTool', - 'VCManifestTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCAppVerifierTool', - 'VCWebDeploymentTool', - 'VCPostBuildEventTool', - ], - ConfigurationType='1') - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/debug.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/release.vsprops', - ]) diff --git a/chrome/tools/profiles/generate_profile.scons b/chrome/tools/profiles/generate_profile.scons deleted file mode 100644 index cead552..0000000 --- a/chrome/tools/profiles/generate_profile.scons +++ /dev/null @@ -1,166 +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.ApplySConscript([ - '$BASE_DIR/gfx/using_base_gfx.scons', - '$BASE_DIR/using_base.scons', - '$BZIP2_DIR/using_bzip2.scons', - '$CHROME_SRC_DIR/build/using_googleurl.scons', - '$CHROME_SRC_DIR/build/using_v8.scons', - '$GTEST_DIR/../using_gtest.scons', - '$ICU38_DIR/using_icu38.scons', - '$LIBJPEG_DIR/using_libjpeg.scons', - '$LIBPNG_DIR/using_libpng.scons', - '$LIBXML_DIR/using_libxml.scons', - '$LIBXSLT_DIR/using_libxslt.scons', - '$MODP_B64_DIR/using_modp_b64.scons', - '$NET_DIR/using_net.scons', - '$SDCH_DIR/using_sdch.scons', - '$SKIA_DIR/using_skia.scons', - '$ZLIB_DIR/using_zlib.scons', -]) - -env.Prepend( - CPPDEFINES = [ - 'PERF_TEST', - ], - LIBS = [ - 'activex_shim', - 'browser', - 'browser_views', - 'common', - 'debugger', - 'default_plugin', - 'glue', - 'hunspell', - 'JavaScriptCore_pcre', - 'plugin', - 'port', - 'renderer', - 'sqlite', - 'util', - 'v8_snapshot', - 'V8Bindings', - 'views', - 'WebCore', - 'WTF', - ], -) - -if env.Bit('windows'): - env.Prepend( - LIBS = [ - 'rpcrt4', - 'shlwapi', - 'winmm', - ], - ) - -input_files = ChromeFileList([ - 'generate_profile.cc', - 'thumbnail-inl.h', -]) - -# TODO(port): -if env.Bit('windows'): - env.ChromeTestProgram('generate_profile', input_files) - -p = env.ChromeMSVSProject('generate_profile.vcproj', - dest=('$CHROME_SRC_DIR/chrome/' - + 'tools/profiles/generate_profile.vcproj'), - guid='{2E969AE9-7B12-4EDB-8E8B-48C7AE7BE357}', - keyword='Win32Proj', - 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', - - ], - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - relative_path_prefix='./', - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - MSVSTool('VCCLCompilerTool', - AdditionalIncludeDirectories='../../..', - PreprocessorDefinitions='PERF_TEST'), - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - MSVSTool('VCLinkerTool', - AdditionalDependencies=[ - 'shlwapi.lib', - 'rpcrt4.lib', - 'winmm.lib' - ], - SubSystem='1'), - 'VCALinkTool', - 'VCManifestTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCAppVerifierTool', - 'VCWebDeploymentTool', - 'VCPostBuildEventTool', - ], - ConfigurationType='1') - - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/debug.vsprops', - '$(SolutionDir)../third_party/icu38/build/using_icu.vsprops', - '../../../skia/using_skia.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/release.vsprops', - '$(SolutionDir)../third_party/icu38/build/using_icu.vsprops', - '../../../skia/using_skia.vsprops', - ]) diff --git a/chrome/tools/test/image_diff/image_diff.scons b/chrome/tools/test/image_diff/image_diff.scons deleted file mode 100644 index 3c9b664..0000000 --- a/chrome/tools/test/image_diff/image_diff.scons +++ /dev/null @@ -1,90 +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.ApplySConscript([ - '$BASE_DIR/using_base.scons', - '$BASE_DIR/gfx/using_base_gfx.scons', - '$ICU38_DIR/using_icu38.scons', - '$LIBPNG_DIR/using_libpng.scons', - '$SKIA_DIR/using_skia.scons', - '$ZLIB_DIR/using_zlib.scons', -]) - -env.Prepend( - CPPPATH = [ - '$CHROME_SRC_DIR', - ], -) - -if env.Bit('windows'): - env.Prepend( - LINKFLAGS = [ - '/INCREMENTAL', - '/DEBUG', - - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"uxtheme.dll"', - - '/SUBSYSTEM:CONSOLE', - - '/MACHINE:X86', - '/FIXED:No', - - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - ], - ) - -input_files = ChromeFileList([ - 'image_diff.cc', -]) - -env.ChromeTestProgram('image_diff', input_files) - -p = env.ChromeMSVSProject('image_diff.vcproj', - dest=('$CHROME_SRC_DIR/chrome/' - + 'tools/test/image_diff/image_diff.vcproj'), - guid='{50B079C7-CD01-42D3-B8C4-9F8D9322E822}', - keyword='Win32Proj', - 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', - ], - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - relative_path_prefix='./', - tools=[ - MSVSTool('VCLinkerTool', - SubSystem='1'), - 'VCCLCompilerTool', - ], - ConfigurationType='1') - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/debug.vsprops', - '$(SolutionDir)../third_party/libpng/using_libpng.vsprops', - '$(SolutionDir)../third_party/zlib/using_zlib.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/release.vsprops', - '$(SolutionDir)../third_party/libpng/using_libpng.vsprops', - '$(SolutionDir)../third_party/zlib/using_zlib.vsprops', - ]) diff --git a/chrome/views/SConscript b/chrome/views/SConscript deleted file mode 100644 index db986d6..0000000 --- a/chrome/views/SConscript +++ /dev/null @@ -1,315 +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() - -if env.Bit('windows'): - env.Prepend( - CPPPATH = [ - '$CHROME_DIR/tools/build/win', - '$CHROME_SRC_DIR', - ], - CCFLAGS = [ - '/TP', - #'/Wp64', - ], - ) - -env.Append( - CPPPATH = [ - '$TARGET_ROOT/grit_derived_sources', - '$ICU38_DIR/public/common', - '$ICU38_DIR/public/i18n', - '$SKIA_DIR/include', - '$SKIA_DIR/include/corecg', - '$SKIA_DIR/include/platform', - 'third_party/wtl/include', - ], -) - -input_files = ChromeFileList([ - # TODO(sgk): violate standard indentation so we don't have to - # reindent too much when we remove the explicit MSVSFilter() calls - # in favor of generating the hierarchy to reflect the file system. - MSVSFilter('Accessibility', [ - 'accessibility/accessible_wrapper.cc', - 'accessibility/accessible_wrapper.h', - 'accessibility/view_accessibility.cc', - 'accessibility/view_accessibility.h', - ]), - 'accelerator.cc', - 'accelerator.h', - 'background.cc', - 'background.h', - 'controls/button/button.cc', - 'controls/button/button.h', - 'controls/scrollbar/bitmap_scroll_bar.cc', - 'controls/scrollbar/bitmap_scroll_bar.h', - 'border.cc', - 'border.h', - 'controls/button/custom_button.cc', - 'controls/button/custom_button.h', - 'controls/button/image_button.cc', - 'controls/button/image_button.h', - 'controls/button/button_dropdown.cc', - 'controls/button/button_dropdown.h', - 'controls/button/checkbox.cc', - 'controls/button/checkbox.h', - 'controls/menu/chrome_menu.cc', - 'controls/menu/chrome_menu.h', - 'controls/combo_box.cc', - 'controls/combo_box.h', - 'controls/menu/controller.h', - 'event.cc', - 'event.h', - 'focus/external_focus_tracker.cc', - 'focus/external_focus_tracker.h', - 'focus/focus_manager.cc', - 'focus/focus_manager.h', - 'focus/view_storage.cc', - 'focus/view_storage.h', - 'fill_layout.cc', - 'fill_layout.h', - 'grid_layout.cc', - 'grid_layout.h', - 'controls/table/group_table_view.cc', - 'controls/table/group_table_view.h', - 'controls/hwnd_view.cc', - 'controls/hwnd_view.h', - 'controls/image_view.cc', - 'controls/image_view.h', - 'controls/label.cc', - 'controls/label.h', - 'layout_manager.cc', - 'layout_manager.h', - 'controls/link.cc', - 'controls/link.h', - 'controls/menu/menu.cc', - 'controls/menu/menu.h', - 'controls/button/menu_button.cc', - 'controls/button/menu_button.h', - 'controls/message_box_view.cc', - 'controls/message_box_view.h', - 'controls/button/native_button.cc', - 'controls/button/native_button.h', - 'controls/native_control.cc', - 'controls/native_control.h', - 'controls/scrollbar/native_scroll_bar.cc', - 'controls/scrollbar/native_scroll_bar.h', - 'painter.cc', - 'painter.h', - '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX', - '$CHROME_DIR/tools/build/win/precompiled_wtl.h', - 'controls/button/radio_button.cc', - 'controls/button/radio_button.h', - 'repeat_controller.cc', - 'repeat_controller.h', - 'resize_corner.cc', - 'resize_corner.h', - 'controls/scrollbar/scroll_bar.cc', - 'controls/scrollbar/scroll_bar.h', - 'controls/scroll_view.cc', - 'controls/scroll_view.h', - 'controls/separator.cc', - 'controls/separator.h', - 'controls/single_split_view.cc', - 'controls/single_split_view.h', - 'controls/tabbed_pane.cc', - 'controls/tabbed_pane.h', - 'controls/table/table_view.cc', - 'controls/table/table_view.h', - 'controls/button/text_button.cc', - 'controls/button/text_button.h', - 'controls/text_field.cc', - 'controls/text_field.h', - 'controls/throbber.cc', - 'controls/throbber.h', - 'controls/tree/tree_model.h', - 'controls/tree/tree_node_iterator.h', - 'controls/tree/tree_node_model.h', - 'controls/tree/tree_view.cc', - 'controls/tree/tree_view.h', - 'view.cc', - 'view.h', - 'view_constants.cc', - 'view_constants.h', - 'controls/menu/view_menu_delegate.h', - 'widget/accelerator_handler.cc', - 'widget/accelerator_handler.h', - 'widget/aero_tooltip_manager.cc', - 'widget/aero_tooltip_manager.h', - 'widget/hwnd_notification_source.h', - 'widget/root_view.cc', - 'widget/root_view.h', - 'widget/root_view_drop_target.cc', - 'widget/root_view_drop_target.h', - 'widget/tooltip_manager.cc', - 'widget/tooltip_manager.h', - 'widget/widget.h', - 'widget/widget_win.cc', - 'widget/widget_win.h', - 'window/app_modal_dialog_delegate.h', - 'window/client_view.cc', - 'window/client_view.h', - 'window/custom_frame_view.cc', - 'window/custom_frame_view.h', - 'window/dialog_client_view.cc', - 'window/dialog_client_view.h', - 'window/dialog_delegate.cc', - 'window/dialog_delegate.h', - 'window/native_frame_view.cc', - 'window/native_frame_view.h', - 'window/non_client_view.cc', - 'window/non_client_view.h', - 'window/window.h', - 'window/window_delegate.cc', - 'window/window_delegate.h', - 'window/window_resources.h', -]) - -if not env.Bit('windows'): - # Windows-specific. - input_files.Remove( - '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX', - '$CHROME_DIR/tools/build/win/precompiled_wtl.h', - ) - -if env.Bit('windows'): - input_files += [ - "view_win.cc", - "widget/root_view_win.cc" - ] - -if env.Bit('linux'): - input_files += [ - 'event_gtk.cc', - 'view_gtk.cc', - 'widget/root_view_gtk.cc', - 'widget/widget_gtk.cc' - ] - # TODO(port?): Incomplete and undecided Views stuff. These compile but aren't - # currently needed, and they break the shared build due to missing symbols - # (from files that aren't yet ported). - # - # TOD(erg): Commenting this section out because we're trying to get views to - # compile under Linux again. -# input_files.Remove( -# 'background.cc', -# 'border.cc', -# 'focus/external_focus_tracker.cc', -# 'focus/view_storage.cc', -# 'grid_layout.cc', -# 'controls/image_view.cc', -# 'controls/label.cc', -# 'layout_manager.cc', -# 'painter.cc', -# 'repeat_controller.cc', -# 'controls/scrollbar/scroll_bar.cc', -# 'controls/scroll_view.cc', -# 'controls/throbber.cc', -# 'view.cc', -# 'widget/root_view.cc', -# ) - - # TODO(port): Port to Linux. - input_files.Remove( - 'accelerator.cc', - 'accessibility/accessible_wrapper.cc', - 'accessibility/view_accessibility.cc', - 'controls/scrollbar/bitmap_scroll_bar.cc', - 'controls/button/image_button.cc', - 'controls/button/button_dropdown.cc', - 'controls/button/checkbox.cc', - 'controls/menu/chrome_menu.cc', - 'controls/combo_box.cc', - 'focus/focus_manager.cc', - 'controls/table/group_table_view.cc', - 'controls/hwnd_view.cc', - 'controls/link.cc', - 'controls/menu/menu.cc', - 'controls/button/menu_button.cc', - 'controls/message_box_view.cc', - 'controls/button/native_button.cc', - 'controls/native_control.cc', - 'controls/scrollbar/native_scroll_bar.cc', - 'controls/button/radio_button.cc', - 'resize_corner.cc', - 'controls/separator.cc', - 'controls/single_split_view.cc', - 'controls/tabbed_pane.cc', - 'controls/table/table_view.cc', - 'controls/text_field.cc', - 'controls/tree/tree_view.cc', - 'widget/accelerator_handler.cc', - 'widget/aero_tooltip_manager.cc', - 'widget/root_view_drop_target.cc', - 'widget/tooltip_manager.cc', - 'widget/widget_win.cc', - 'window/client_view.cc', - 'window/custom_frame_view.cc', - 'window/dialog_delegate.cc', - 'window/dialog_client_view.cc', - 'window/native_frame_view.cc', - 'window/non_client_view.cc', - 'window/window_delegate.cc', - 'window/window_win.cc', - ) - -env.ChromeLibrary('views', input_files) - -p = env.ChromeMSVSProject('views.vcproj', - dest='$CHROME_SRC_DIR/chrome/views/views.vcproj', - guid='{6F9258E5-294F-47B2-919D-17FFE7A8B751}', - keyword='Win32Proj', - dependencies = [ - '$CHROME_DIR/app/generated_resources.vcproj', - ], - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - root_namespace = 'Views', - relative_path_prefix='./', - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - 'VCLibrarianTool', - 'VCALinkTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCPostBuildEventTool', - ], - ConfigurationType='4') - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - './views.vsprops', - '$(SolutionDir)../build/debug.vsprops', - '../tools/build/win/precompiled_wtl.vsprops', - '../../third_party/icu38/build/using_icu.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - './views.vsprops', - '$(SolutionDir)../build/release.vsprops', - '../../third_party/icu38/build/using_icu.vsprops', - ]) - -p.AddFileConfig('../tools/build/win/precompiled_wtl.cc', - 'Debug|Win32', - tools=[ - MSVSTool('VCCLCompilerTool', - UsePrecompiledHeader='1'), - ]) diff --git a/chrome/worker/worker.scons b/chrome/worker/worker.scons deleted file mode 100644 index fe4aaa2..0000000 --- a/chrome/worker/worker.scons +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright (c) 2009 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.SConscript([ -# '$NPAPI_DIR/using_npapi.scons', -# '$SKIA_DIR/using_skia.scons', -], {'env':env}) - -env.Prepend( - CPPPATH = [ - '$CHROME_SRC_DIR', - ], -) - -if env.Bit('windows'): - env.Prepend( - CPPPATH = [ - '$CHROME_DIR/tools/build/win', - ], - ) - -input_files = ChromeFileList([ - 'webworkerclient_proxy.cc', - 'webworkerclient_proxy.h', - 'worker_main.cc', - 'worker_thread.cc', - 'worker_thread.h', - 'worker_webkitclient_impl.cc', - 'worker_webkitclient_impl.h', - '$CHROME_DIR/tools/build/win/precompiled$OBJSUFFIX', - '$CHROME_DIR/tools/build/win/precompiled.h', -]) - -if not env.Bit('windows'): - input_files.Remove( - '$CHROME_DIR/tools/build/win/precompiled$OBJSUFFIX', - ) - -if env.Bit('posix'): - # TODO(port) - input_files.Remove( - 'webworker.cc', - 'worker_main.cc', - 'worker_thread.cc', - 'worker_webkitclient_impl.cc', - ) - -env.ChromeLibrary('worker', input_files) - -p = env.ChromeMSVSProject('worker.vcproj', - dest='$CHROME_SRC_DIR/chrome/worker/worker.vcproj', - guid='{C78D02D0-A366-4ec6-A248-AA8E64C4BA18}', - keyword='Win32Proj', - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - local_directory_prefix='./', - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - 'VCLibrarianTool', - 'VCALinkTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCPostBuildEventTool', - ], - ConfigurationType='4') - - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/debug.vsprops', - '../tools/build/win/precompiled.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/release.vsprops', - ]) - -p.AddFileConfig('../tools/build/win/precompiled.cc', - 'Debug|Win32', - tools=[ - MSVSTool('VCCLCompilerTool', - UsePrecompiledHeader='1'), - ]) |