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

9 files changed, 36 insertions, 60 deletions

diff --git a/net/crash_cache.scons b/net/crash_cache.scons
index 834cb51..9bb5124 100644
--- a/net/crash_cache.scons
+++ b/net/crash_cache.scons
@@ -36,6 +36,7 @@ if not env.AnyBits('linux', 'mac'):
   env.ChromeTestProgram('crash_cache', input_files)
 
 p = env.ChromeMSVSProject('$NET_DIR/build/crash_cache.vcproj',
+                          dest='$CHROME_SRC_DIR/net/build/crash_cache.vcproj',
                           guid='{B0EE0599-2913-46A0-A847-A3EC813658D3}',
                           dependencies = [
                               '$BASE_DIR/build/base.vcproj',
@@ -81,9 +82,3 @@ p.AddConfig('Release|Win32',
                 '$(SolutionDir)../build/common.vsprops',
                 '$(SolutionDir)../build/release.vsprops',
             ])
-
-env.AlwaysBuild(p)
-
-i = env.Command('$CHROME_SRC_DIR/net/build/crash_cache.vcproj', p,
-                Copy('$TARGET', '$SOURCE'))
-Alias('msvs', i)
diff --git a/net/dump_cache.scons b/net/dump_cache.scons
index 75231bb..57852f7 100644
--- a/net/dump_cache.scons
+++ b/net/dump_cache.scons
@@ -35,11 +35,12 @@ if env.Bit('windows'):
   env.ChromeTestProgram('dump_cache', input_files)
 
 p = env.ChromeMSVSProject('$NET_DIR/build/dump_cache.vcproj',
+                          dest='$CHROME_SRC_DIR/net/build/dump_cache.vcproj',
                           guid='{4A14E455-2B7C-4C0F-BCC2-35A9666C186F}',
                           dependencies = [
                               '$BASE_DIR/build/base.vcproj',
-                              '$ICU38_DIR/build/icu.vcproj',
                               '$NET_DIR/build/net.vcproj',
+                              '$ICU38_DIR/build/icu.vcproj',
                           ],
                           # TODO: restore when we can derive all info,
                           # on all platforms, from the windows build targets.
@@ -80,9 +81,3 @@ p.AddConfig('Release|Win32',
                 '$(SolutionDir)../build/common.vsprops',
                 '$(SolutionDir)../build/release.vsprops',
             ])
-
-env.AlwaysBuild(p)
-
-i = env.Command('$CHROME_SRC_DIR/net/build/dump_cache.vcproj', p,
-                Copy('$TARGET', '$SOURCE'))
-Alias('msvs', i)
diff --git a/net/net_lib.scons b/net/net_lib.scons
index 5f0bf0f..5631198 100644
--- a/net/net_lib.scons
+++ b/net/net_lib.scons
@@ -341,9 +341,11 @@ if env.Bit('windows'):
 lib = env.ChromeLibrary('net', input_files)
 
 p = env.ChromeMSVSProject('$NET_DIR/build/net.vcproj',
+                          dest='$CHROME_SRC_DIR/net/build/net.vcproj',
                           guid='{326E9795-E760-410A-B69A-3F79DB3F5243}',
                           dependencies = [
-                              '$NET_DIR/build/tld_cleanup.vcproj'
+                              '$NET_DIR/build/net_resources.vcproj',
+                              '$NET_DIR/build/tld_cleanup.vcproj',
                           ],
                           # TODO: restore when we can derive all info,
                           # on all platforms, from the windows build targets.
@@ -355,12 +357,8 @@ p.AddToolFile('build/convert_tld_data.rules')
 
 p.AddConfig('Debug|Win32',
             InheritedPropertySheets=[
-                '$(SolutionDir)../build/common.vsprops',
                 '$(SolutionDir)../build/debug.vsprops',
-                '$(SolutionDir)../third_party/icu38/build/using_icu.vsprops',
-                '$(SolutionDir)../third_party/zlib/using_zlib.vsprops',
-                '$(SolutionDir)../sdch/using_sdch.vsprops',
-                '$(SolutionDir)../tools/grit/build/using_generated_resources.vsprops',
+                './net.vsprops',
             ],
             tools=[
                 'VCPreBuildEventTool',
@@ -386,12 +384,8 @@ p.AddConfig('Debug|Win32',
 
 p.AddConfig('Release|Win32',
             InheritedPropertySheets=[
-                '$(SolutionDir)../build/common.vsprops',
                 '$(SolutionDir)../build/release.vsprops',
-                '$(SolutionDir)../third_party/icu38/build/using_icu.vsprops',
-                '$(SolutionDir)../third_party/zlib/using_zlib.vsprops',
-                '$(SolutionDir)../sdch/using_sdch.vsprops',
-                '$(SolutionDir)../tools/grit/build/using_generated_resources.vsprops',
+                './net.vsprops',
             ],
             tools=[
                 'VCPreBuildEventTool',
@@ -427,9 +421,3 @@ p.AddFileConfig('build/precompiled_net.cc',
                 tools=[
                     'VCCLCompilerTool',
                 ])
-
-env.AlwaysBuild(p)
-
-i = env.Command('$CHROME_SRC_DIR/net/build/net.vcproj', p,
-                Copy('$TARGET', '$SOURCE'))
-Alias('msvs', i)
diff --git a/net/net_perftests.scons b/net/net_perftests.scons
index 5f0529a..6cbe6d9 100644
--- a/net/net_perftests.scons
+++ b/net/net_perftests.scons
@@ -61,6 +61,7 @@ env.ChromeMSVSProject('$NET_DIR/build/net_perftests.vcproj',
 # TODO########################################################################
 
 p = env.ChromeMSVSProject('$NET_DIR/build/net_perftests.vcproj',
+                          dest='$CHROME_SRC_DIR/net/build/net_perftests.vcproj',
                           guid='{AAC78796-B9A2-4CD9-BF89-09B03E92BF73}',
                           dependencies = [
                               '$BASE_DIR/build/base.vcproj',
@@ -113,9 +114,3 @@ p.AddConfig('Release|Win32',
                 '$(SolutionDir)../build/release.vsprops',
                 '$(SolutionDir)../testing/using_gtest.vsprops',
             ])
-
-env.AlwaysBuild(p)
-
-i = env.Command('$CHROME_SRC_DIR/net/build/net_perftests.vcproj', p,
-                Copy('$TARGET', '$SOURCE'))
-Alias('msvs', i)
diff --git a/net/net_resources.scons b/net/net_resources.scons
index 6120e0c..a9d8143 100644
--- a/net/net_resources.scons
+++ b/net/net_resources.scons
@@ -37,6 +37,28 @@ if env.Bit('windows'):
       ],
   )
 
+  net_resources = []
   for g in [g for g in generated if str(g).endswith('.rc')]:
     net_res = env.RES(g)
+    net_resources.extend(net_res)
     env.Depends(net_res, tld_names_clean)
+
+  p = env.ChromeMSVSProject('build/net_resources.vcproj',
+                            dest='$CHROME_SRC_DIR/net/build/net_resources.vcproj',
+                            guid='{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}',
+                            buildtargets=net_resources,
+                            ConfigurationType='10')
+
+  p.AddToolFile('../tools/grit/build/grit_resources.rules')
+
+  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/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)
diff --git a/net/net_unittests.scons b/net/net_unittests.scons
index 2b3911e..17c75ef 100644
--- a/net/net_unittests.scons
+++ b/net/net_unittests.scons
@@ -144,6 +144,7 @@ if env.Bit('mac'):
 net_unittests = env.ChromeTestProgram('net_unittests', input_files)
 
 p = env.ChromeMSVSProject('$NET_DIR/build/net_unittests.vcproj',
+                          dest='$CHROME_SRC_DIR/net/build/net_unittests.vcproj',
                           dependencies = [
                               '$BASE_DIR/build/base.vcproj',
                               '$BZIP2_DIR/bzip2.vcproj',
@@ -236,9 +237,3 @@ p.AddFileConfig('build/precompiled_net.cc',
                 tools=[
                     'VCCLCompilerTool',
                 ])
-
-env.AlwaysBuild(p)
-
-i = env.Command('$CHROME_SRC_DIR/net/build/net_unittests.vcproj', p,
-                Copy('$TARGET', '$SOURCE'))
-Alias('msvs', i)
diff --git a/net/stress_cache.scons b/net/stress_cache.scons
index 9f926e4..fba9d09 100644
--- a/net/stress_cache.scons
+++ b/net/stress_cache.scons
@@ -45,6 +45,7 @@ if not env.Bit('mac'):
   env.ChromeTestProgram('stress_cache', input_files)
 
 p = env.ChromeMSVSProject('$NET_DIR/build/stress_cache.vcproj',
+                          dest='$CHROME_SRC_DIR/net/build/stress_cache.vcproj',
                           guid='{B491C3A1-DE5F-4843-A1BB-AB8C4337187B}',
                           dependencies = [
                               '$BASE_DIR/build/base.vcproj',
@@ -91,9 +92,3 @@ p.AddConfig('Release|Win32',
                 '$(SolutionDir)../build/common.vsprops',
                 '$(SolutionDir)../build/release.vsprops',
             ])
-
-env.AlwaysBuild(p)
-
-i = env.Command('$CHROME_SRC_DIR/net/build/stress_cache.vcproj', p,
-                Copy('$TARGET', '$SOURCE'))
-Alias('msvs', i)
diff --git a/net/tools/tld_cleanup/tld_cleanup.scons b/net/tools/tld_cleanup/tld_cleanup.scons
index 5f366c4..4ab9066 100644
--- a/net/tools/tld_cleanup/tld_cleanup.scons
+++ b/net/tools/tld_cleanup/tld_cleanup.scons
@@ -30,6 +30,7 @@ input_files = ChromeFileList([
 env.ChromeProgram('tld_cleanup', input_files)
 
 p = env.ChromeMSVSProject('$NET_DIR/build/tld_cleanup.vcproj',
+                          dest='$CHROME_SRC_DIR/net/build/tld_cleanup.vcproj',
                           guid='{E13045CD-7E1F-4A41-9B18-8D288B2E7B41}',
                           dependencies = [
                               '$BASE_DIR/build/base.vcproj',
@@ -75,9 +76,3 @@ p.AddConfig('Release|Win32',
                 '$(SolutionDir)../build/common.vsprops',
                 '$(SolutionDir)../build/release.vsprops',
             ])
-
-env.AlwaysBuild(p)
-
-i = env.Command('$CHROME_SRC_DIR/net/build/tld_cleanup.vcproj', p,
-                Copy('$TARGET', '$SOURCE'))
-Alias('msvs', i)