net_resources unfork

- bring the rules for grit all in align for common style/dir names.
- make the mac build net:net_resource (was win/linux only)
- ripple the mac dep upstream
- merge net_resource into the chrome repack
more work is needed on the mac side, we aren't really using the new resources
  yet, but this is a clean landing point.
Review URL: http://codereview.chromium.org/45001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11438 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 38 insertions, 50 deletions

diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 61a3360..c4431e2 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -334,6 +334,7 @@
         'common',
         'resources',
         '../media/media.gyp:media',
+        '../net/net.gyp:net_resources',
         '../skia/skia.gyp:skia',
         '../third_party/icu38/icu38.gyp:icui18n',
         '../third_party/icu38/icu38.gyp:icuuc',
@@ -1164,9 +1165,6 @@
       ],
       'conditions': [
         ['OS=="linux"', {
-          'dependencies': [
-            '../net/net.gyp:net_resources',
-          ],
           'sources!': [
             # TODO(port):  Port these.
             'browser/debugger/debugger_contents.cc',
@@ -1205,7 +1203,6 @@
             'third_party/wtl/include',
           ],
           'dependencies': [
-            '../net/net.gyp:net_resources',
             '../google_update/google_update.gyp:google_update',
             'installer/util/util.gyp:installer_util',
             '../printing/printing.gyp:printing',
@@ -1503,6 +1500,7 @@
                   '<(SHARED_INTERMEDIATE_DIR)/chrome/debugger_resources.pak',
                   '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.pak',
                   '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.pak',
+                  '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
                   '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak',
                 ],
               },
@@ -1969,10 +1967,10 @@
       ],
     },
   ],
-  # On Mac only, add a project target called "package_app" that only
-  # runs a shell script (package_chrome.sh).
   'conditions': [
     ['OS=="mac"',
+      # On Mac only, add a project target called "package_app" that only
+      # runs a shell script (package_chrome.sh).
       { 'targets': [
         {
           'target_name': 'package_app',
@@ -2251,6 +2249,6 @@
           },
         },
       ]},  # 'targets'
-    ],  # OS=="mac"
+    ],  # OS=="win"
   ],  # 'conditions'
 }
diff --git a/net/net.gyp b/net/net.gyp
index 019555c..dd02f9d 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -23,6 +23,7 @@
         '../third_party/icu38/icu38.gyp:icuuc',
         '../third_party/modp_b64/modp_b64.gyp:modp_b64',
         '../third_party/zlib/zlib.gyp:zlib',
+        'net_resources',
       ],
       'msvs_guid': '326E9795-E760-410A-B69A-3F79DB3F5243',
       'sources': [
@@ -304,7 +305,6 @@
               'base/tcp_client_socket_libevent.cc',
             ],
             'dependencies': [
-              'net_resources',
               'tld_cleanup',
             ],
             'configurations': {
@@ -327,9 +327,6 @@
         ],
         [ 'OS == "linux"', {
             'sources/': [ ['exclude', '_(mac|win)\\.cc$'] ],
-            'dependencies': [
-              'net_resources',
-            ],
           },
           {  # else: OS != "linux"
             'sources!': [
@@ -534,44 +531,37 @@
         'disk_cache/disk_cache_test_util.h',
       ],
     },
-  ],
-  'conditions': [
-    ['OS!="mac"', {
-      'targets': [
+    {
+      'target_name': 'net_resources',
+      'type': 'none',
+      'msvs_guid': '8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942',
+      'rules': [
         {
-          'target_name': 'net_resources',
-          'type': 'none',
-          'msvs_guid': '8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942',
-          'sources': [
-            'base/net_resources.grd',
+          'rule_name': 'grit',
+          'extension': 'grd',
+          'inputs': [
+            '<(DEPTH)/tools/grit/grit.py',
           ],
-          #'msvs_tool_files': ['../tools/grit/build/grit_resources.rules'],
-          # This was orignally in grit_resources.rules
-          # NOTE: this version doesn't mimic the Properties specified there.
-          'rules': [
-            {
-              'rule_name': 'grit',
-              'extension': 'grd',
-              'inputs': [
-                '<(DEPTH)/tools/grit/grit.py',
-              ],
-              'outputs': [
-                '<(SHARED_INTERMEDIATE_DIR)/grit_derived_sources/grit/<(RULE_INPUT_ROOT).h',
-                '<(SHARED_INTERMEDIATE_DIR)/grit_derived_sources/<(RULE_INPUT_ROOT).rc',
-                '<(SHARED_INTERMEDIATE_DIR)/grit_derived_sources/<(RULE_INPUT_ROOT).pak',
-              ],
-              'action':
-                ['python', '<(DEPTH)/tools/grit/grit.py', '-i', '<(RULE_INPUT_PATH)', 'build', '-o', '<(SHARED_INTERMEDIATE_DIR)/grit_derived_sources'],
-            },
+          'outputs': [
+            '<(SHARED_INTERMEDIATE_DIR)/net/grit/<(RULE_INPUT_ROOT).h',
+            '<(SHARED_INTERMEDIATE_DIR)/net/<(RULE_INPUT_ROOT).rc',
+            '<(SHARED_INTERMEDIATE_DIR)/net/<(RULE_INPUT_ROOT).pak',
           ],
-          'direct_dependent_settings': {
-            'include_dirs': [
-              '<(SHARED_INTERMEDIATE_DIR)/grit_derived_sources',
-            ],
-          },
+          'action':
+            ['python', '<@(_inputs)', '-i', '<(RULE_INPUT_PATH)', 'build', '-o', '<(SHARED_INTERMEDIATE_DIR)/net'],
         },
       ],
-    }],
+      'sources': [
+        'base/net_resources.grd',
+      ],
+      'direct_dependent_settings': {
+        'include_dirs': [
+          '<(SHARED_INTERMEDIATE_DIR)/net',
+        ],
+      },
+    },
+  ],
+  'conditions': [
     ['OS=="win"', {
       'targets': [
         {
diff --git a/webkit/tools/test_shell/test_shell.gyp b/webkit/tools/test_shell/test_shell.gyp
index 7d68297..a9ac5aa 100644
--- a/webkit/tools/test_shell/test_shell.gyp
+++ b/webkit/tools/test_shell/test_shell.gyp
@@ -167,8 +167,8 @@
             {
               'action_name': 'test_shell_repack',
               'inputs': [
-                '<(SHARED_INTERMEDIATE_DIR)/grit_derived_sources/net_resources.pak',
-                '<(SHARED_INTERMEDIATE_DIR)/grit_derived_sources/test_shell_resources.pak',
+                '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
+                '<(SHARED_INTERMEDIATE_DIR)/test_shell/test_shell_resources.pak',
                 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak',
                 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak',
               ],
@@ -300,16 +300,16 @@
                 '../../../tools/grit/grit.py',
               ],
               'outputs': [
-                '<(SHARED_INTERMEDIATE_DIR)/grit_derived_sources/grit/<(RULE_INPUT_ROOT).h',
-                '<(SHARED_INTERMEDIATE_DIR)/grit_derived_sources/<(RULE_INPUT_ROOT).pak',
+                '<(SHARED_INTERMEDIATE_DIR)/test_shell/grit/<(RULE_INPUT_ROOT).h',
+                '<(SHARED_INTERMEDIATE_DIR)/test_shell/<(RULE_INPUT_ROOT).pak',
               ],
               'action':
-                ['python', '../tools/grit/grit.py', '-i', '<(RULE_INPUT_PATH)', 'build', '-o', '<(SHARED_INTERMEDIATE_DIR)/grit_derived_sources'],
+                ['python', '<@(_inputs)', '-i', '<(RULE_INPUT_PATH)', 'build', '-o', '<(SHARED_INTERMEDIATE_DIR)/test_shell'],
             },
           ],
           'direct_dependent_settings': {
             'include_dirs': [
-              '<(SHARED_INTERMEDIATE_DIR)/grit_derived_sources',
+              '<(SHARED_INTERMEDIATE_DIR)/test_shell',
             ],
           },
         },