summaryrefslogtreecommitdiffstats
path: root/chrome/installer/util
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/installer/util')
-rw-r--r--chrome/installer/util/installer_unittests.scons136
-rw-r--r--chrome/installer/util/util.scons191
2 files changed, 0 insertions, 327 deletions
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',
- ])
generated by cgit v1.1 at 2025-02-11 14:14:53 +0000