From caeb7a0ca33ec99cd3dc68e95ca23ca4aa7e8068 Mon Sep 17 00:00:00 2001 From: "sgk@google.com" Date: Sat, 17 Jan 2009 02:25:22 +0000 Subject: Generate all chrome .vcproj files: * Path name translation (/ to \) of various MSVSTool attributes. * Explicit keyword= arguments to MSVSProject. This will likely go away eventually in favor of uniform behavior. * Add a relative_path_substitutions array that can be used to substitute in Visual Studio variable like $(OutDir). * Add a local_directory_prefix that can be set to './' to only affect files in the current directory. * Additional Keyword ordering in Tool attributes to continue to match the default order Visual Studio generates. * Add a Derived() proxy class that can wrap a File node to tell the .vcproj generation that we want the derived file, not its source(s), in the file list. * In the individual *.scons files, add the necessary files (mostly .h files) to file lists, and update MSVSProject() calls with the additional necessary information. Result is identical .vcproj files modulo the following differences: * Four locales .vcproj files (da, en-US, he and zh-TW) with source file orders that don't match the other locale .vcproj files have re-ordered file lists to match the rest. * Cosmetic XML changes (white space, ending tags) in: chrome/app/chrome_dll.vcproj chrome/app/generated_resources.vcproj net/build/net_resources.vcproj * Removal or addition of ./ prefixes from various files that don't match the other file specifications within their individual .vcproj files: chrome/installer/util/util.vcproj net/build/net.vcproj net/build/net_unittests.vcproj * Add missing empty sections (, , ) for consistency with other .vcproj files: chrome/tools/test/image_diff/image_diff.vcproj third_party/libpng/libpng.vcproj third_party/zlib/zlib.vcproj * Add missing RootNameSpace attribute: chrome/test/automation/automation.vcproj testing/gtest.vcproj * Use && instead of \r\n as a command separator, to sidestep XML-generation problems: chrome/app/chrome_exe.vcproj * Remove unnecessary (?) duplicate files in the file list: chrome/browser/views/browser_views.vcproj (event_utils.cc and event_utils.h were duplicated) Review URL: http://codereview.chromium.org/17603 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8253 0039d316-1c4b-4281-b951-d872f2087c98 --- .../activex_test_control.scons | 65 ++++++++++++++++++++-- 1 file changed, 60 insertions(+), 5 deletions(-) (limited to 'chrome/test/activex_test_control') diff --git a/chrome/test/activex_test_control/activex_test_control.scons b/chrome/test/activex_test_control/activex_test_control.scons index bfbbbcf..15ce4ef 100644 --- a/chrome/test/activex_test_control/activex_test_control.scons +++ b/chrome/test/activex_test_control/activex_test_control.scons @@ -40,16 +40,71 @@ if env.Bit('windows'): if env.Bit('windows'): env.TypeLibrary('activex_test_control.idl') -input_files = [ +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) -env.ChromeMSVSProject(('$CHROME_DIR/test/activex_test_control/' + - 'activex_test_control.vcproj'), - guid='{414D4D24-5D65-498B-A33F-3A29AD3CDEDC}') +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', + ]) -- cgit v1.1