From a7ad74b14339ca330c491631ba27e0aaffbe6429 Mon Sep 17 00:00:00 2001 From: "sgk@google.com" Date: Sat, 10 Jan 2009 22:22:33 +0000 Subject: Updates to Visual Studio project generation to accomodate recent changes and get rid of cut-and-paste: * Add generation of the new net_resource.vcproj file. * Accomodate the net\net.vsprops file. * New base.vcproj dependency in activex_shim_dll.vcproj. * New tld_cleanup.vcproj dependency in net.vcproj. * New ondemand_updates.vcproj dependencies in gcapi_{dll,lib}.vcproj. * Re-order dump_cache.vcproj dependencies to match new checked-in solutions. * New input file directory layout in zlib (minizip folder) and testing\gtest (hierarchy). * Use a new dest= argument to ChromeMSVSSolution() and ChromeMSVSProject() to get rid of cut-and-pste installation code, and provide a central point for controlling when/whether we want to generate the files only under the build directory, or drop them in place for checking in. * Comment out an unnecessarily verbose warning if the buildtarget is executed with an action that we don't map to specific Visual Studio settings. Sometimes this is normal and okay, but the warning should get restored at some point when we work out the precise conditions under which it makes sense. Review URL: http://codereview.chromium.org/17602 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7856 0039d316-1c4b-4281-b951-d872f2087c98 --- net/net_sln.scons | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'net/net_sln.scons') diff --git a/net/net_sln.scons b/net/net_sln.scons index b262b60..7b7def1 100644 --- a/net/net_sln.scons +++ b/net/net_sln.scons @@ -40,6 +40,7 @@ env.ChromeMSVSFolder('net tools', solution = env.ChromeMSVSSolution('net.sln', + dest='$CHROME_SRC_DIR/net/net.sln', entries = [ 'net dependencies', '$GOOGLEURL_DIR/build/googleurl.vcproj', @@ -60,15 +61,10 @@ solution = env.ChromeMSVSSolution('net.sln', '$TESTING_DIR/gtest.vcproj', '$SDCH_DIR/sdch.vcproj', '$NET_DIR/build/dump_cache.vcproj', + '$NET_DIR/build/net_resources.vcproj', ], variants = [ 'Debug|Win32', 'Release|Win32', ]) - -env.AlwaysBuild(solution) - -i = env.Command('$CHROME_SRC_DIR/net/net.sln', solution, - Copy('$TARGET', '$SOURCE')) -Alias('msvs', i) -- cgit v1.1