[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 67700787480174975f5f6ac3ed8a0e648e58c9cd
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Aug 14 16:34:26 2010 +0000

    2010-08-14  Patrick Gansterer  <paroga at paroga.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [CMake] Add preprocessor detection for generator scripts
            https://bugs.webkit.org/show_bug.cgi?id=43984
    
            * cmake/OptionsCommon.cmake:
    2010-08-14  Patrick Gansterer  <paroga at paroga.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [CMake] Add preprocessor detection for generator scripts
            https://bugs.webkit.org/show_bug.cgi?id=43984
    
            * CMakeLists.txt:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65369 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index a3ccbf1..e9f3b78 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-14  Patrick Gansterer  <paroga at paroga.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [CMake] Add preprocessor detection for generator scripts
+        https://bugs.webkit.org/show_bug.cgi?id=43984
+
+        * cmake/OptionsCommon.cmake:
+
 2010-08-14  Adrienne Walker  <enne at google.com>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/JavaScriptCore/CMakeLists.txt b/JavaScriptCore/CMakeLists.txt
index 4a84dec..f69cede 100644
--- a/JavaScriptCore/CMakeLists.txt
+++ b/JavaScriptCore/CMakeLists.txt
@@ -203,13 +203,10 @@ GENERATE_HASH_LUT(${JAVASCRIPTCORE_DIR}/parser/Keywords.table ${DERIVED_SOURCES_
 LIST(APPEND JavaScriptCore_HEADERS ${DERIVED_SOURCES_DIR}/Lexer.lut.h)
 
 # GENERATOR: "chartables.c": compile and execute the chartables generator (and add it to sources)
-IF (MSVC)
-    SET(JSC_DFTABLES_PREPROCESSOR --preprocessor=cl.exe)
-ENDIF ()
 ADD_CUSTOM_COMMAND(
     OUTPUT ${DERIVED_SOURCES_DIR}/chartables.c
     MAIN_DEPENDENCY ${JAVASCRIPTCORE_DIR}/pcre/dftables
-    COMMAND ${PERL_EXECUTABLE} ${JAVASCRIPTCORE_DIR}/pcre/dftables ${JSC_DFTABLES_PREPROCESSOR} ${DERIVED_SOURCES_DIR}/chartables.c
+    COMMAND ${PERL_EXECUTABLE} ${JAVASCRIPTCORE_DIR}/pcre/dftables --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" ${DERIVED_SOURCES_DIR}/chartables.c
     VERBATIM)
 ADD_SOURCE_DEPENDENCIES(${JAVASCRIPTCORE_DIR}/pcre/pcre_tables.cpp ${DERIVED_SOURCES_DIR}/chartables.c)
 
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index fa48da0..7418c38 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -2,6 +2,15 @@
 
         Reviewed by Kenneth Rohde Christiansen.
 
+        [CMake] Add preprocessor detection for generator scripts
+        https://bugs.webkit.org/show_bug.cgi?id=43984
+
+        * CMakeLists.txt:
+
+2010-08-14  Patrick Gansterer  <paroga at paroga.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
         [CMake] Set target properties only if available
         https://bugs.webkit.org/show_bug.cgi?id=43978
 
diff --git a/cmake/OptionsCommon.cmake b/cmake/OptionsCommon.cmake
index b0d0375..8b0b9c3 100644
--- a/cmake/OptionsCommon.cmake
+++ b/cmake/OptionsCommon.cmake
@@ -16,3 +16,9 @@ SET(WTF_INCLUDE_DIRECTORIES
 IF (WTF_OS_UNIX)
     ADD_DEFINITIONS(-DXP_UNIX)
 ENDIF (WTF_OS_UNIX)
+
+IF (MSVC)
+    SET(CODE_GENERATOR_PREPROCESSOR "cl.exe /nologo /EP")
+ELSE ()
+    SET(CODE_GENERATOR_PREPROCESSOR "cpp")
+ENDIF ()

-- 
WebKit Debian packaging