| Index: chrome/test/mini_installer_test/mini_installer_test.scons
|
| ===================================================================
|
| --- chrome/test/mini_installer_test/mini_installer_test.scons (revision 8251)
|
| +++ chrome/test/mini_installer_test/mini_installer_test.scons (working copy)
|
| @@ -57,23 +57,99 @@
|
| ],
|
| )
|
|
|
| -input_files = [
|
| - '$CHROME_DIR/installer/setup/setup_constants$OBJSUFFIX',
|
| - '$CHROME_DIR/installer/util/run_all_unittests$OBJSUFFIX',
|
| +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)
|
|
|
| -env.ChromeMSVSProject('$CHROME_DIR/test/mini_installer_test/mini_installer_test.vcproj',
|
| - dependencies = [
|
| - '$BASE_DIR/build/base.vcproj',
|
| - '$ICU38_DIR/build/icu.vcproj',
|
| - '$TESTING_DIR/gtest.vcproj',
|
| - '$CHROME_DIR/installer/util/util.vcproj',
|
| - ],
|
| - guid='{4B6E199A-034A-49BD-AB93-458DD37E45B1}')
|
| +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',
|
| + ])
|
|
|