[webkit-changes] [108280] trunk/Tools

Mon, 20 Feb 2012 18:15:51 -0800

Title: [108280] trunk/Tools
Revision
108280
Author
[email protected]
Date
2012-02-20 18:16:13 -0800 (Mon, 20 Feb 2012)

Log Message

[GTK] [Qt] Move the unix forwarding headers for TestNetscapePlugin to the TestNetscapePlugin directory
https://bugs.webkit.org/show_bug.cgi?id=78935

Patch by Martin Robinson <[email protected]> on 2012-02-20
Reviewed by Gustavo Noronha Silva.

Move the TestNetscapePlugin headers to a more appropriate directory and update
the build files to match.

* DumpRenderTree/TestNetscapePlugIn/unix/ForwardingHeaders/WebKit/npapi.h: Renamed from Tools/DumpRenderTree/unix/TestNetscapePlugin/ForwardingHeaders/WebKit/npapi.h.
* DumpRenderTree/TestNetscapePlugIn/unix/ForwardingHeaders/WebKit/npfunctions.h: Renamed from Tools/DumpRenderTree/unix/TestNetscapePlugin/ForwardingHeaders/WebKit/npfunctions.h.
* DumpRenderTree/TestNetscapePlugIn/unix/ForwardingHeaders/WebKit/npruntime.h: Renamed from Tools/DumpRenderTree/unix/TestNetscapePlugin/ForwardingHeaders/WebKit/npruntime.h.
* DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro: Update build.
* GNUmakefile.am: Ditto.

Modified Paths

Added Paths

Removed Paths

Diff

Modified: trunk/Tools/ChangeLog (108279 => 108280)


--- trunk/Tools/ChangeLog	2012-02-21 02:12:24 UTC (rev 108279)
+++ trunk/Tools/ChangeLog	2012-02-21 02:16:13 UTC (rev 108280)
@@ -1,3 +1,19 @@
+2012-02-20  Martin Robinson  <[email protected]>
+
+        [GTK] [Qt] Move the unix forwarding headers for TestNetscapePlugin to the TestNetscapePlugin directory
+        https://bugs.webkit.org/show_bug.cgi?id=78935
+
+        Reviewed by Gustavo Noronha Silva.
+
+        Move the TestNetscapePlugin headers to a more appropriate directory and update
+        the build files to match.
+
+        * DumpRenderTree/TestNetscapePlugIn/unix/ForwardingHeaders/WebKit/npapi.h: Renamed from Tools/DumpRenderTree/unix/TestNetscapePlugin/ForwardingHeaders/WebKit/npapi.h.
+        * DumpRenderTree/TestNetscapePlugIn/unix/ForwardingHeaders/WebKit/npfunctions.h: Renamed from Tools/DumpRenderTree/unix/TestNetscapePlugin/ForwardingHeaders/WebKit/npfunctions.h.
+        * DumpRenderTree/TestNetscapePlugIn/unix/ForwardingHeaders/WebKit/npruntime.h: Renamed from Tools/DumpRenderTree/unix/TestNetscapePlugin/ForwardingHeaders/WebKit/npruntime.h.
+        * DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro: Update build.
+        * GNUmakefile.am: Ditto.
+
 2012-02-20  Kihong Kwon  <[email protected]>
 
         Add a new API for the Vibration API(W3C).

Copied: trunk/Tools/DumpRenderTree/TestNetscapePlugIn/unix/ForwardingHeaders/WebKit/npapi.h (from rev 108279, trunk/Tools/DumpRenderTree/unix/TestNetscapePlugin/ForwardingHeaders/WebKit/npapi.h) (0 => 108280)


--- trunk/Tools/DumpRenderTree/TestNetscapePlugIn/unix/ForwardingHeaders/WebKit/npapi.h	                        (rev 0)
+++ trunk/Tools/DumpRenderTree/TestNetscapePlugIn/unix/ForwardingHeaders/WebKit/npapi.h	2012-02-21 02:16:13 UTC (rev 108280)
@@ -0,0 +1 @@
+#include <plugins/npapi.h>

Copied: trunk/Tools/DumpRenderTree/TestNetscapePlugIn/unix/ForwardingHeaders/WebKit/npfunctions.h (from rev 108279, trunk/Tools/DumpRenderTree/unix/TestNetscapePlugin/ForwardingHeaders/WebKit/npfunctions.h) (0 => 108280)


--- trunk/Tools/DumpRenderTree/TestNetscapePlugIn/unix/ForwardingHeaders/WebKit/npfunctions.h	                        (rev 0)
+++ trunk/Tools/DumpRenderTree/TestNetscapePlugIn/unix/ForwardingHeaders/WebKit/npfunctions.h	2012-02-21 02:16:13 UTC (rev 108280)
@@ -0,0 +1 @@
+#include <plugins/npfunctions.h>

Copied: trunk/Tools/DumpRenderTree/TestNetscapePlugIn/unix/ForwardingHeaders/WebKit/npruntime.h (from rev 108279, trunk/Tools/DumpRenderTree/unix/TestNetscapePlugin/ForwardingHeaders/WebKit/npruntime.h) (0 => 108280)


--- trunk/Tools/DumpRenderTree/TestNetscapePlugIn/unix/ForwardingHeaders/WebKit/npruntime.h	                        (rev 0)
+++ trunk/Tools/DumpRenderTree/TestNetscapePlugIn/unix/ForwardingHeaders/WebKit/npruntime.h	2012-02-21 02:16:13 UTC (rev 108280)
@@ -0,0 +1 @@
+#include <plugins/npruntime.h>

Modified: trunk/Tools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro (108279 => 108280)


--- trunk/Tools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro	2012-02-21 02:12:24 UTC (rev 108279)
+++ trunk/Tools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro	2012-02-21 02:16:13 UTC (rev 108280)
@@ -36,8 +36,8 @@
 
 
 INCLUDEPATH += \
-    ../../unix/TestNetscapePlugin/ForwardingHeaders \
-    ../../unix/TestNetscapePlugin/ForwardingHeaders/WebKit \
+    ../../TestNetscapePlugIn/unix/ForwardingHeaders \
+    ../../TestNetscapePlugIn/unix/ForwardingHeaders/WebKit \
     ../../TestNetscapePlugIn
 
 DESTDIR = $${ROOT_BUILD_DIR}/lib/plugins

Deleted: trunk/Tools/DumpRenderTree/unix/TestNetscapePlugin/ForwardingHeaders/WebKit/npapi.h (108279 => 108280)


--- trunk/Tools/DumpRenderTree/unix/TestNetscapePlugin/ForwardingHeaders/WebKit/npapi.h	2012-02-21 02:12:24 UTC (rev 108279)
+++ trunk/Tools/DumpRenderTree/unix/TestNetscapePlugin/ForwardingHeaders/WebKit/npapi.h	2012-02-21 02:16:13 UTC (rev 108280)
@@ -1 +0,0 @@
-#include <plugins/npapi.h>

Deleted: trunk/Tools/DumpRenderTree/unix/TestNetscapePlugin/ForwardingHeaders/WebKit/npfunctions.h (108279 => 108280)


--- trunk/Tools/DumpRenderTree/unix/TestNetscapePlugin/ForwardingHeaders/WebKit/npfunctions.h	2012-02-21 02:12:24 UTC (rev 108279)
+++ trunk/Tools/DumpRenderTree/unix/TestNetscapePlugin/ForwardingHeaders/WebKit/npfunctions.h	2012-02-21 02:16:13 UTC (rev 108280)
@@ -1 +0,0 @@
-#include <plugins/npfunctions.h>

Deleted: trunk/Tools/DumpRenderTree/unix/TestNetscapePlugin/ForwardingHeaders/WebKit/npruntime.h (108279 => 108280)


--- trunk/Tools/DumpRenderTree/unix/TestNetscapePlugin/ForwardingHeaders/WebKit/npruntime.h	2012-02-21 02:12:24 UTC (rev 108279)
+++ trunk/Tools/DumpRenderTree/unix/TestNetscapePlugin/ForwardingHeaders/WebKit/npruntime.h	2012-02-21 02:16:13 UTC (rev 108280)
@@ -1 +0,0 @@
-#include <plugins/npruntime.h>

Modified: trunk/Tools/GNUmakefile.am (108279 => 108280)


--- trunk/Tools/GNUmakefile.am	2012-02-21 02:12:24 UTC (rev 108279)
+++ trunk/Tools/GNUmakefile.am	2012-02-21 02:16:13 UTC (rev 108280)
@@ -188,11 +188,11 @@
 
 TestNetscapePlugin_libtestnetscapeplugin_la_CPPFLAGS = \
 	-I$(srcdir)/Tools/DumpRenderTree \
-	-I$(srcdir)/Tools/DumpRenderTree/unix/TestNetscapePlugin/ForwardingHeaders \
 	-I$(srcdir)/Source/WebCore \
 	-I$(srcdir)/Source/WebCore/bridge \
 	-I$(srcdir)/Source/WebCore/plugins \
 	-I$(srcdir)/Tools/DumpRenderTree/TestNetscapePlugIn \
+	-I$(srcdir)/Tools/DumpRenderTree/TestNetscapePlugIn/unix/ForwardingHeaders \
 	$(global_cppflags) \
 	$(_javascript_core_cppflags)
 
@@ -202,9 +202,6 @@
 endif
 
 TestNetscapePlugin_libtestnetscapeplugin_la_SOURCES = \
-	Tools/DumpRenderTree/unix/TestNetscapePlugin/ForwardingHeaders/WebKit/npapi.h \
-	Tools/DumpRenderTree/unix/TestNetscapePlugin/ForwardingHeaders/WebKit/npfunctions.h \
-	Tools/DumpRenderTree/unix/TestNetscapePlugin/ForwardingHeaders/WebKit/npruntime.h \
 	Tools/DumpRenderTree/TestNetscapePlugIn/Tests/DocumentOpenInDestroyStream.cpp \
 	Tools/DumpRenderTree/TestNetscapePlugIn/Tests/EvaluateJSAfterRemovingPluginElement.cpp \
 	Tools/DumpRenderTree/TestNetscapePlugIn/Tests/FormValue.cpp \
@@ -227,7 +224,10 @@
 	Tools/DumpRenderTree/TestNetscapePlugIn/PluginObject.h \
 	Tools/DumpRenderTree/TestNetscapePlugIn/TestObject.cpp \
 	Tools/DumpRenderTree/TestNetscapePlugIn/TestObject.h \
-	Tools/DumpRenderTree/TestNetscapePlugIn/main.cpp
+	Tools/DumpRenderTree/TestNetscapePlugIn/main.cpp \
+	Tools/DumpRenderTree/TestNetscapePlugin/unix/ForwardingHeaders/WebKit/npapi.h \
+	Tools/DumpRenderTree/TestNetscapePlugin/unix/ForwardingHeaders/WebKit/npfunctions.h \
+	Tools/DumpRenderTree/TestNetscapePlugin/unix/ForwardingHeaders/WebKit/npruntime.h
 
 TestNetscapePlugin_libtestnetscapeplugin_la_LDFLAGS = \
 	-rpath ${shell pwd}/$(top_builddir)/../unix/TestNetscapePlugin/.libs \

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to