[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[paroga at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 8498ce97ef130c119f4bda228dd74a93525f4231
Author: paroga at webkit.org <paroga at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 29 11:35:13 2010 +0000

    2010-12-29  Patrick Gansterer  <paroga at webkit.org>
    
            Unreviewed. Use gcc as default preprocessor.
    
            * Sources/cmake/OptionsCommon.cmake:
    2010-12-29  Patrick Gansterer  <paroga at webkit.org>
    
            Reviewed by Andreas Kling.
    
            [CMake] Remove WebKitGenerators
            https://bugs.webkit.org/show_bug.cgi?id=50445
    
            * CMakeLists.txt: Pass preprocessor to generate-bindings.pl.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74739 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 0668b9c..df482c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-12-29  Patrick Gansterer  <paroga at webkit.org>
+
+        Unreviewed. Use gcc as default preprocessor.
+
+        * Sources/cmake/OptionsCommon.cmake:
+
 2010-12-27  Ryuan Choi  <ryuan.choi at samsung.com>
 
         Reviewed by David Levin.
diff --git a/Sources/cmake/OptionsCommon.cmake b/Sources/cmake/OptionsCommon.cmake
index 3235816..be465fa 100644
--- a/Sources/cmake/OptionsCommon.cmake
+++ b/Sources/cmake/OptionsCommon.cmake
@@ -13,7 +13,7 @@ IF (WTF_OS_UNIX)
 ENDIF (WTF_OS_UNIX)
 
 IF (MSVC)
-    SET(CODE_GENERATOR_PREPROCESSOR "cl.exe /nologo /EP")
+    SET(CODE_GENERATOR_PREPROCESSOR "${CMAKE_CXX_COMPILER} /nologo /EP")
 ELSE ()
-    SET(CODE_GENERATOR_PREPROCESSOR "cpp")
+    SET(CODE_GENERATOR_PREPROCESSOR "${CMAKE_CXX_COMPILER} -E -P -x c++")
 ENDIF ()
diff --git a/WebCore/CMakeLists.txt b/WebCore/CMakeLists.txt
index 7c6e3e5..46912d1 100644
--- a/WebCore/CMakeLists.txt
+++ b/WebCore/CMakeLists.txt
@@ -2074,7 +2074,7 @@ FOREACH (_file ${WebCore_IDL_FILES})
         OUTPUT  ${DERIVED_SOURCES_DIR}/JS${_name}.cpp ${DERIVED_SOURCES_DIR}/JS${_name}.h
         MAIN_DEPENDENCY ${_file}
         DEPENDS ${WEBCORE_DIR}/bindings/scripts/generate-bindings.pl ${SCRIPTS_BINDINGS} ${_file}
-        COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${WEBCORE_DIR}/bindings/scripts/generate-bindings.pl --defines "${FEATURE_DEFINES_JAVASCRIPT}" --generator JS ${IDL_INCLUDES} --outputDir "${DERIVED_SOURCES_DIR}" ${WEBCORE_DIR}/${_file}
+        COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${WEBCORE_DIR}/bindings/scripts/generate-bindings.pl --defines "${FEATURE_DEFINES_JAVASCRIPT}" --generator JS ${IDL_INCLUDES} --outputDir "${DERIVED_SOURCES_DIR}" --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" ${WEBCORE_DIR}/${_file}
         VERBATIM)
     LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_DIR}/JS${_name}.cpp)
 ENDFOREACH ()
@@ -2085,7 +2085,7 @@ ADD_CUSTOM_COMMAND(
     OUTPUT ${DERIVED_SOURCES_DIR}/InspectorBackendDispatcher.cpp ${DERIVED_SOURCES_DIR}/InspectorBackendDispatcher.h ${DERIVED_SOURCES_DIR}/InspectorFrontend.cpp ${DERIVED_SOURCES_DIR}/InspectorFrontend.h
     MAIN_DEPENDENCY inspector/Inspector.idl
     DEPENDS ${WEBCORE_DIR}/bindings/scripts/generate-bindings.pl ${SCRIPTS_BINDINGS} inspector/Inspector.idl
-    COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts -I${WEBCORE_DIR}/inspector ${WEBCORE_DIR}/bindings/scripts/generate-bindings.pl --defines "${FEATURE_DEFINES_JAVASCRIPT}" --generator Inspector ${IDL_INCLUDES} --outputDir "${DERIVED_SOURCES_DIR}" ${WEBCORE_DIR}/inspector/Inspector.idl
+    COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts -I${WEBCORE_DIR}/inspector ${WEBCORE_DIR}/bindings/scripts/generate-bindings.pl --defines "${FEATURE_DEFINES_JAVASCRIPT}" --generator Inspector ${IDL_INCLUDES} --outputDir "${DERIVED_SOURCES_DIR}" --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" ${WEBCORE_DIR}/inspector/Inspector.idl
     VERBATIM)
 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_DIR}/InspectorBackendDispatcher.cpp ${DERIVED_SOURCES_DIR}/InspectorFrontend.cpp)
 
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 20c341f..8e38c28 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-12-29  Patrick Gansterer  <paroga at webkit.org>
+
+        Reviewed by Andreas Kling.
+
+        [CMake] Remove WebKitGenerators
+        https://bugs.webkit.org/show_bug.cgi?id=50445
+
+        * CMakeLists.txt: Pass preprocessor to generate-bindings.pl.
+
 2010-12-28  Pratik Solanki  <psolanki at apple.com>
 
         Reviewed by Eric Seidel.

-- 
WebKit Debian packaging