Title: [197886] trunk
Revision
197886
Author
[email protected]
Date
2016-03-09 13:50:04 -0800 (Wed, 09 Mar 2016)

Log Message

[cmake] Fixed All-in-One build.
https://bugs.webkit.org/show_bug.cgi?id=155241

Patch by Konstantin Tokarev <[email protected]> on 2016-03-09
Reviewed by Csaba Osztrogonác.

.:

* Source/cmake/WebKitMacros.cmake: Last item of WebCore_SOURCES was
not removed in PROCESS_ALLINONE_FILE.

Source/WebCore:

No new tests needed.

* bindings/js/JSBindingsAllInOne.cpp: Should not include generated
file.

Modified Paths

Diff

Modified: trunk/ChangeLog (197885 => 197886)


--- trunk/ChangeLog	2016-03-09 21:49:59 UTC (rev 197885)
+++ trunk/ChangeLog	2016-03-09 21:50:04 UTC (rev 197886)
@@ -1,3 +1,13 @@
+2016-03-09  Konstantin Tokarev  <[email protected]>
+
+        [cmake] Fixed All-in-One build.
+        https://bugs.webkit.org/show_bug.cgi?id=155241
+
+        Reviewed by Csaba Osztrogonác.
+
+        * Source/cmake/WebKitMacros.cmake: Last item of WebCore_SOURCES was
+        not removed in PROCESS_ALLINONE_FILE.
+
 2016-03-08  Myles C. Maxfield  <[email protected]>
 
         [EFL] Enable the SVG -> OTF Font Converter

Modified: trunk/Source/WebCore/ChangeLog (197885 => 197886)


--- trunk/Source/WebCore/ChangeLog	2016-03-09 21:49:59 UTC (rev 197885)
+++ trunk/Source/WebCore/ChangeLog	2016-03-09 21:50:04 UTC (rev 197886)
@@ -1,3 +1,15 @@
+2016-03-09  Konstantin Tokarev  <[email protected]>
+
+        [cmake] Fixed All-in-One build.
+        https://bugs.webkit.org/show_bug.cgi?id=155241
+
+        Reviewed by Csaba Osztrogonác.
+
+        No new tests needed.
+
+        * bindings/js/JSBindingsAllInOne.cpp: Should not include generated
+        file.
+
 2016-03-09  Chris Dumez  <[email protected]>
 
         Unreviewed, rebaseline bindings tests after r197874.

Modified: trunk/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp (197885 => 197886)


--- trunk/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp	2016-03-09 21:49:59 UTC (rev 197885)
+++ trunk/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp	2016-03-09 21:50:04 UTC (rev 197886)
@@ -138,7 +138,6 @@
 #include "JSWorkerCustom.cpp"
 #include "JSWorkerGlobalScopeBase.cpp"
 #include "JSWorkerGlobalScopeCustom.cpp"
-#include "JSXMLDocument.cpp"
 #include "JSXMLHttpRequestCustom.cpp"
 #include "JSXPathResultCustom.cpp"
 #include "JSXSLTProcessorCustom.cpp"

Modified: trunk/Source/cmake/WebKitMacros.cmake (197885 => 197886)


--- trunk/Source/cmake/WebKitMacros.cmake	2016-03-09 21:49:59 UTC (rev 197885)
+++ trunk/Source/cmake/WebKitMacros.cmake	2016-03-09 21:50:04 UTC (rev 197886)
@@ -368,7 +368,7 @@
     endforeach ()
 
     foreach (_allin ${_allins})
-        string(REGEX REPLACE ";[^;]*/${_allin};" ";" _new_result "${${_result_file_list}}")
+        string(REGEX REPLACE ";[^;]*/${_allin};" ";" _new_result "${${_result_file_list}};")
         set(${_result_file_list} ${_new_result})
     endforeach ()
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to