Endeavour to make the windows test bot actually able to run tests.

https://bugs.webkit.org/show_bug.cgi?id=86772

Reviewed by Sam Weinig.

Source/WebCore:

Use WEBKIT_EXPORT to get correct export behaviour on windows, rather than
relying on the .def files.

* bindings/js/JSDOMGlobalObject.h:
(JSDOMGlobalObject):
* bindings/scripts/CodeGeneratorJS.pm:
(GenerateHeader):

Source/WebKit2:

Remove the ClassInfo exports from the .def files as we're now using
WEBKIT_EXPORT declarations to get expected behaviour on windows.

* win/WebKit2.def:
* win/WebKit2CFLite.def:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@117504 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 07b091d..6869e57 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2012-05-17  Oliver Hunt  <oliver@apple.com>
+
+        Endeavour to make the windows test bot actually able to run tests.
+        https://bugs.webkit.org/show_bug.cgi?id=86772
+
+        Reviewed by Sam Weinig.
+
+        Use WEBKIT_EXPORT to get correct export behaviour on windows, rather than
+        relying on the .def files.
+
+        * bindings/js/JSDOMGlobalObject.h:
+        (JSDOMGlobalObject):
+        * bindings/scripts/CodeGeneratorJS.pm:
+        (GenerateHeader):
+
 2012-05-17  Beth Dakin  <bdakin@apple.com>
 
         https://bugs.webkit.org/show_bug.cgi?id=86266

diff --git a/Source/WebCore/bindings/js/JSDOMGlobalObject.h b/Source/WebCore/bindings/js/JSDOMGlobalObject.h
index 74f35b0..bd2773a 100644 (file)
--- a/Source/WebCore/bindings/js/JSDOMGlobalObject.h
+++ b/Source/WebCore/bindings/js/JSDOMGlobalObject.h
@@ -30,6 +30,10 @@
 #include <runtime/JSGlobalObject.h>
 #include <runtime/JSGlobalThis.h>
 
+#ifndef WEBKIT_EXPORTDATA
+#define WEBKIT_EXPORTDATA
+#endif
+
 namespace WebCore {
 
     class Document;
@@ -71,7 +75,7 @@ namespace WebCore {
 
         DOMWrapperWorld* world() { return m_world.get(); }
 
-        static const JSC::ClassInfo s_info;
+        static WEBKIT_EXPORTDATA const JSC::ClassInfo s_info;
 
         static JSC::Structure* createStructure(JSC::JSGlobalData& globalData, JSC::JSValue prototype)
         {

diff --git a/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm b/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm
index e20f2d7..2969e21 100644 (file)
--- a/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm
+++ b/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm
@@ -776,8 +776,11 @@ sub GenerateHeader
     }
 
     # Class info
-    push(@headerContent, "    static const JSC::ClassInfo s_info;\n\n");
-
+    if ($interfaceName eq "Node") {
+        push(@headerContent, "    static WEBKIT_EXPORTDATA const JSC::ClassInfo s_info;\n\n");
+    } else {
+        push(@headerContent, "    static const JSC::ClassInfo s_info;\n\n");
+    }
     # Structure ID
     if ($interfaceName eq "DOMWindow") {
         $structureFlags{"JSC::ImplementsHasInstance"} = 1;

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 352cf2e..9e495d7 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,16 @@
+2012-05-17  Oliver Hunt  <oliver@apple.com>
+
+        Endeavour to make the windows test bot actually able to run tests.
+        https://bugs.webkit.org/show_bug.cgi?id=86772
+
+        Reviewed by Sam Weinig.
+
+        Remove the ClassInfo exports from the .def files as we're now using
+        WEBKIT_EXPORT declarations to get expected behaviour on windows.
+
+        * win/WebKit2.def:
+        * win/WebKit2CFLite.def:
+
 2012-05-17  Timothy Hatcher  <timothy@apple.com>
 
         Make the docked Web Inspector use autoresizing masks so the view doesn't jitter when

diff --git a/Source/WebKit2/win/WebKit2.def b/Source/WebKit2/win/WebKit2.def
index 8e3c2c4..0265b26 100644 (file)
--- a/Source/WebKit2/win/WebKit2.def
+++ b/Source/WebKit2/win/WebKit2.def
@@ -203,8 +203,6 @@ EXPORTS
         ?remove@String@WTF@@QAEXIH@Z
         ?reverseFind@StringImpl@WTF@@QAEI_WI@Z
         ?s_frontendCounter@InspectorInstrumentation@WebCore@@0HA
-        ?s_info@JSNode@WebCore@@2UClassInfo@JSC@@B
-        ?s_info@JSDOMGlobalObject@WebCore@@2UClassInfo@JSC@@B
         ?scriptExecutionContext@JSDOMGlobalObject@WebCore@@QBEPAVScriptExecutionContext@2@XZ
         ?scriptNameToCode@WebCore@@YA?AW4UScriptCode@@ABVString@WTF@@@Z
         ?scrollElementToRect@FrameView@WebCore@@QAEXPAVElement@2@ABVIntRect@2@@Z

diff --git a/Source/WebKit2/win/WebKit2CFLite.def b/Source/WebKit2/win/WebKit2CFLite.def
index e7d27f0..7a8e842 100644 (file)
--- a/Source/WebKit2/win/WebKit2CFLite.def
+++ b/Source/WebKit2/win/WebKit2CFLite.def
@@ -196,8 +196,6 @@ EXPORTS
         ?remove@String@WTF@@QAEXIH@Z
         ?reverseFind@StringImpl@WTF@@QAEI_WI@Z
         ?s_frontendCounter@InspectorInstrumentation@WebCore@@0HA
-        ?s_info@JSNode@WebCore@@2UClassInfo@JSC@@B
-        ?s_info@JSDOMGlobalObject@WebCore@@2UClassInfo@JSC@@B
         ?scriptExecutionContext@JSDOMGlobalObject@WebCore@@QBEPAVScriptExecutionContext@2@XZ
         ?scriptNameToCode@WebCore@@YA?AW4UScriptCode@@ABVString@WTF@@@Z
         ?scrollElementToRect@FrameView@WebCore@@QAEXPAVElement@2@ABVIntRect@2@@Z