Snapshotting progress.

Got app and unit_tests linking with gyp under windows.
Still missing pieces (things don't run).

Review URL: http://codereview.chromium.org/39319

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

3 files changed, 86 insertions, 52 deletions

diff --git a/webkit/default_plugin/default_plugin.gyp b/webkit/default_plugin/default_plugin.gyp
index a3a9a7c..ba37b61 100644
--- a/webkit/default_plugin/default_plugin.gyp
+++ b/webkit/default_plugin/default_plugin.gyp
@@ -7,41 +7,48 @@
     '../../build/common.gypi',
   ],
   'targets': [
-    {
-      'target_name': 'default_plugin',
-      'type': 'static_library',
-      'dependencies': [
-        '../../third_party/libxml/libxml.gyp:libxml',
-        '../../third_party/icu38/icu38.gyp:icui18n',
-        '../../third_party/icu38/icu38.gyp:icuuc',
-        '../../third_party/npapi/npapi.gyp:npapi',
-        '../../net/net.gyp:net_resources',
-      ],
-      'include_dirs': [
-        '../..',
-        # TODO(bradnelson): this should fall out of the dependencies.
-        '<(SHARED_INTERMEDIATE_DIR)/webkit',
-      ],
-      'sources': [
-        'activex_installer.cc',
-        'activex_installer.h',
-        'default_plugin.cc',
-        'default_plugin_resources.h',
-        'default_plugin_shared.h',
-        'install_dialog.cc',
-        'install_dialog.h',
-        'plugin_database_handler.cc',
-        'plugin_database_handler.h',
-        'plugin_impl_win.cc',
-        'plugin_impl_win.h',
-        'plugin_install_job_monitor.cc',
-        'plugin_install_job_monitor.h',
-        'plugin_main.cc',
-        'plugin_main.h',
+  ],
+  'conditions': [
+    ['OS=="win"', {
+      'targets': [
+        {
+          'target_name': 'default_plugin',
+          'type': 'static_library',
+          'dependencies': [
+            '../../third_party/libxml/libxml.gyp:libxml',
+            '../../third_party/icu38/icu38.gyp:icui18n',
+            '../../third_party/icu38/icu38.gyp:icuuc',
+            '../../third_party/npapi/npapi.gyp:npapi',
+            '../webkit.gyp:webkit_resources',
+            '../../net/net.gyp:net_resources',
+          ],
+          'include_dirs': [
+            '../..',
+            # TODO(bradnelson): this should fall out of the dependencies.
+            '<(SHARED_INTERMEDIATE_DIR)/webkit',
+          ],
+          'sources': [
+            'activex_installer.cc',
+            'activex_installer.h',
+            'default_plugin.cc',
+            'default_plugin_resources.h',
+            'default_plugin_shared.h',
+            'install_dialog.cc',
+            'install_dialog.h',
+            'plugin_database_handler.cc',
+            'plugin_database_handler.h',
+            'plugin_impl_win.cc',
+            'plugin_impl_win.h',
+            'plugin_install_job_monitor.cc',
+            'plugin_install_job_monitor.h',
+            'plugin_main.cc',
+            'plugin_main.h',
+          ],
+          'link_settings': {
+            'libraries': ['-lUrlmon.lib'],
+          },
+        },
       ],
-      'link_settings': {
-        'libraries': ['-lUrlmon.lib'],
-      },
-    },
+    },],
   ],
 }
diff --git a/webkit/tools/test_shell/test_shell.gyp b/webkit/tools/test_shell/test_shell.gyp
index b18c695..f520a93 100644
--- a/webkit/tools/test_shell/test_shell.gyp
+++ b/webkit/tools/test_shell/test_shell.gyp
@@ -115,6 +115,7 @@
           },
           'dependencies': [
             '../../../breakpad/breakpad.gyp:breakpad_handler',
+            '../../default_plugin/default_plugin.gyp:default_plugin',
           ],
         }, {  # else: OS!=win
           'sources/': [
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp
index 77c2b62..de36f17 100644
--- a/webkit/webkit.gyp
+++ b/webkit/webkit.gyp
@@ -4113,12 +4113,45 @@
       ],
     },
     {
+      'target_name': 'webkit_resources',
+      'type': 'none',
+      'dependencies': [
+        'webcore',
+        'webkit',
+        '../net/net.gyp:net',
+      ],
+      'rules': [
+        {
+          'rule_name': 'grit',
+          'extension': 'grd',
+          'inputs': [
+            '../tools/grit/grit.py',
+          ],
+          'outputs': [
+            '<(SHARED_INTERMEDIATE_DIR)/webkit/grit/<(RULE_INPUT_ROOT).h',
+          ],
+          'action': ['python', '<@(_inputs)', '-i', '<(RULE_INPUT_PATH)', 'build', '-o', '<(SHARED_INTERMEDIATE_DIR)/webkit'],
+        },
+      ],
+      'sources': [
+        # grit rule
+        'glue/webkit_resources.grd',
+        'glue/webkit_strings.grd',
+      ],
+      'direct_dependent_settings': {
+        'include_dirs': [
+          '<(SHARED_INTERMEDIATE_DIR)/webkit',
+        ],
+      },
+    },
+    {
       'target_name': 'glue',
       'type': 'static_library',
       'dependencies': [
         'webcore',
         'webkit',
         '../net/net.gyp:net',
+        'webkit_resources',
       ],
       'actions': [
         {
@@ -4133,19 +4166,6 @@
           'action': ['python', '<@(_inputs)', '<(INTERMEDIATE_DIR)'],
         },
       ],
-      'rules': [
-        {
-          'rule_name': 'grit',
-          'extension': 'grd',
-          'inputs': [
-            '../tools/grit/grit.py',
-          ],
-          'outputs': [
-            '<(SHARED_INTERMEDIATE_DIR)/webkit/grit/<(RULE_INPUT_ROOT).h',
-          ],
-          'action': ['python', '<@(_inputs)', '-i', '<(RULE_INPUT_PATH)', 'build', '-o', '<(SHARED_INTERMEDIATE_DIR)/webkit'],
-        },
-      ],
       'include_dirs': [
         '<(INTERMEDIATE_DIR)',
       ],
@@ -4153,10 +4173,6 @@
         # webkit_version rule
         '../third_party/WebKit/WebCore/Configurations/Version.xcconfig',
 
-        # grit rule
-        'glue/webkit_resources.grd',
-        'glue/webkit_strings.grd',
-
         # This list contains all .h, .cc, and .mm files in glue except for
         # those in the test subdirectory and those with unittest in in their
         # names.
@@ -4342,6 +4358,11 @@
         'glue/webwidget_delegate.h',
         'glue/webwidget_impl.cc',
         'glue/webwidget_impl.h',
+        'glue/webworker.h',
+        'glue/webworker_impl.cc',
+        'glue/webworker_impl.h',
+        'glue/webworkerclient_impl.cc',
+        'glue/webworkerclient_impl.h',
         'glue/window_open_disposition.h',
         'pending/AccessibleBase.cpp',
         'pending/AccessibleBase.h',
@@ -4381,6 +4402,11 @@
             'glue/plugins/webplugin_delegate_impl.cc',
             'glue/glue_accessibility.cc',
             'glue/webdropdata.cc',
+            'glue/webworker.h',
+            'glue/webworker_impl.cc',
+            'glue/webworker_impl.h',
+            'glue/webworkerclient_impl.cc',
+            'glue/webworkerclient_impl.h',
             'pending/AccessibleBase.cpp',
             'pending/AccessibleDocument.cpp',
           ],