Title: [217506] trunk
- Revision
- 217506
- Author
- [email protected]
- Date
- 2017-05-26 14:28:35 -0700 (Fri, 26 May 2017)
Log Message
[CMake] Wrap CODE_GENERATOR_PREPROCESSOR_EXECUTABLE on Windows hosts
https://bugs.webkit.org/show_bug.cgi?id=172553
Patch by Don Olmstead <[email protected]> on 2017-05-26
Reviewed by Brent Fulgham.
.:
* Source/cmake/OptionsCommon.cmake:
Source/WebCore:
No new tests. No change in behavior.
* bindings/scripts/preprocessor.pm:
(applyPreprocessor): Use shellwords() instead of splitting
preprocessor command by space. Combine it back in open3() call on
Windows to work around Cygwin-specific issue.
Modified Paths
Diff
Modified: trunk/ChangeLog (217505 => 217506)
--- trunk/ChangeLog 2017-05-26 21:14:31 UTC (rev 217505)
+++ trunk/ChangeLog 2017-05-26 21:28:35 UTC (rev 217506)
@@ -1,3 +1,12 @@
+2017-05-26 Don Olmstead <[email protected]>
+
+ [CMake] Wrap CODE_GENERATOR_PREPROCESSOR_EXECUTABLE on Windows hosts
+ https://bugs.webkit.org/show_bug.cgi?id=172553
+
+ Reviewed by Brent Fulgham.
+
+ * Source/cmake/OptionsCommon.cmake:
+
2017-05-26 Adrian Perez de Castro <[email protected]>
[CMake] Pass -fdiagnostics-color=always to GCC when building with Ninja
Modified: trunk/Source/WebCore/ChangeLog (217505 => 217506)
--- trunk/Source/WebCore/ChangeLog 2017-05-26 21:14:31 UTC (rev 217505)
+++ trunk/Source/WebCore/ChangeLog 2017-05-26 21:28:35 UTC (rev 217506)
@@ -1,3 +1,17 @@
+2017-05-26 Don Olmstead <[email protected]>
+
+ [CMake] Wrap CODE_GENERATOR_PREPROCESSOR_EXECUTABLE on Windows hosts
+ https://bugs.webkit.org/show_bug.cgi?id=172553
+
+ Reviewed by Brent Fulgham.
+
+ No new tests. No change in behavior.
+
+ * bindings/scripts/preprocessor.pm:
+ (applyPreprocessor): Use shellwords() instead of splitting
+ preprocessor command by space. Combine it back in open3() call on
+ Windows to work around Cygwin-specific issue.
+
2017-05-26 Wenson Hsieh <[email protected]>
Unreviewed, fix the build using the latest SDK
Modified: trunk/Source/WebCore/bindings/scripts/preprocessor.pm (217505 => 217506)
--- trunk/Source/WebCore/bindings/scripts/preprocessor.pm 2017-05-26 21:14:31 UTC (rev 217505)
+++ trunk/Source/WebCore/bindings/scripts/preprocessor.pm 2017-05-26 21:28:35 UTC (rev 217506)
@@ -24,6 +24,7 @@
use Config;
use IPC::Open2;
use IPC::Open3;
+use Text::ParseWords;
BEGIN {
use Exporter ();
@@ -104,7 +105,7 @@
use Symbol 'gensym'; my $err = gensym;
$pid = open3(\*PP_IN, \*PP_OUT, $err, $preprocessor, @args, @macros, $fileName);
} else {
- $pid = open2(\*PP_OUT, \*PP_IN, split(' ', $preprocessor), @args, @macros, $fileName);
+ $pid = open2(\*PP_OUT, \*PP_IN, shellwords($preprocessor), @args, @macros, $fileName);
}
close PP_IN;
my @documentContent = <PP_OUT>;
Modified: trunk/Source/cmake/OptionsCommon.cmake (217505 => 217506)
--- trunk/Source/cmake/OptionsCommon.cmake 2017-05-26 21:14:31 UTC (rev 217505)
+++ trunk/Source/cmake/OptionsCommon.cmake 2017-05-26 21:28:35 UTC (rev 217506)
@@ -6,23 +6,16 @@
# WebCore. Investigating whether make_names.pl should be changed instead is left as an exercise to
# the reader.
if (MSVC)
- # FIXME: Some codegenerators don't support paths with spaces. So use the executable name only.
- get_filename_component(CODE_GENERATOR_PREPROCESSOR_EXECUTABLE ${CMAKE_CXX_COMPILER} ABSOLUTE)
-
set(CODE_GENERATOR_PREPROCESSOR_ARGUMENTS "/nologo /EP /TP")
- set(CODE_GENERATOR_PREPROCESSOR "\"${CODE_GENERATOR_PREPROCESSOR_EXECUTABLE}\" ${CODE_GENERATOR_PREPROCESSOR_ARGUMENTS}")
-
- set(CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS ${CODE_GENERATOR_PREPROCESSOR})
+ set(CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS_ARGUMENTS ${CODE_GENERATOR_PREPROCESSOR_ARGUMENTS})
else ()
- set(CODE_GENERATOR_PREPROCESSOR_EXECUTABLE ${CMAKE_CXX_COMPILER})
-
set(CODE_GENERATOR_PREPROCESSOR_ARGUMENTS "-E -P -x c++")
- set(CODE_GENERATOR_PREPROCESSOR "${CODE_GENERATOR_PREPROCESSOR_EXECUTABLE} ${CODE_GENERATOR_PREPROCESSOR_ARGUMENTS}")
-
set(CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS_ARGUMENTS "-E -x c++")
- set(CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS "${CODE_GENERATOR_PREPROCESSOR_EXECUTABLE} ${CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS_ARGUMENTS}")
endif ()
+set(CODE_GENERATOR_PREPROCESSOR "\"${CMAKE_CXX_COMPILER}\" ${CODE_GENERATOR_PREPROCESSOR_ARGUMENTS}")
+set(CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS "\"${CMAKE_CXX_COMPILER}\" ${CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS_ARGUMENTS}")
+
option(USE_THIN_ARCHIVES "Produce all static libraries as thin archives" ON)
if (USE_THIN_ARCHIVES)
execute_process(COMMAND ${CMAKE_AR} -V OUTPUT_VARIABLE AR_VERSION)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes