Changeset 1381

Show
Ignore:
Timestamp:
02/19/10 09:30:11 (5 months ago)
Author:
gbertal
Message:

Fixed up command line arguments passed to 'make_names.pl'. The '--extraDefines' option used to be passed twice, the latter overriding the former thereby causing improper HTML tag names definition
w/ regards to selected build options.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/WebCore/CMakeLists.txt

    r1378 r1381  
    7474 
    7575if(ENABLE_VIDEO) 
    76     list(APPEND HTML_FEATURES --extraDefines ENABLE_VIDEO=1) 
    7776    list(APPEND USER_AGENT_STYLE_SHEETS 
    7877        ${OWB_SOURCE_DIR}/WebCore/css/mediaControls.css 
    …… 
    183182add_custom_command( 
    184183    OUTPUT ${WEBCORE_GENERATED_DIR}/html/HTMLNames.cpp ${WEBCORE_GENERATED_DIR}/html/HTMLNames.h ${WEBCORE_GENERATED_DIR}/html/JSHTMLElementWrapperFactory.cpp ${WEBCORE_GENERATED_DIR}/html/JSHTMLElementWrapperFactory.h ${WEBCORE_GENERATED_DIR}/html/HTMLElementFactory.h ${WEBCORE_GENERATED_DIR}/html/HTMLElementFactory.cpp 
    185     COMMAND ${PERL_EXECUTABLE} -I${OWB_SOURCE_DIR}/WebCore/bindings/scripts ${CMAKE_SOURCE_DIR}/WebCore/dom/make_names.pl --tags ${OWB_SOURCE_DIR}/WebCore/html/HTMLTagNames.in --extraDefines ${EXTRA_DEFINES} --attrs ${OWB_SOURCE_DIR}/WebCore/html/HTMLAttributeNames.in ${DAE_EXTENSIONS} ${CEHTML_EXTENSIONS} ${HTML_FEATURES} --factory --wrapperFactory --outputDir ${WEBCORE_GENERATED_DIR}/html 
     184    COMMAND ${PERL_EXECUTABLE} -I${OWB_SOURCE_DIR}/WebCore/bindings/scripts ${CMAKE_SOURCE_DIR}/WebCore/dom/make_names.pl --tags ${OWB_SOURCE_DIR}/WebCore/html/HTMLTagNames.in --extraDefines ${EXTRA_DEFINES} --attrs ${OWB_SOURCE_DIR}/WebCore/html/HTMLAttributeNames.in ${DAE_EXTENSIONS} ${CEHTML_EXTENSIONS} --factory --wrapperFactory --outputDir ${WEBCORE_GENERATED_DIR}/html 
    186185    WORKING_DIRECTORY ${OWB_BINARY_DIR} 
    187186    DEPENDS ${OWB_SOURCE_DIR}/WebCore/dom/make_names.pl ${OWB_SOURCE_DIR}/WebCore/html/HTMLTagNames.in ${OWB_SOURCE_DIR}/WebCore/html/HTMLAttributeNames.in ${DAE_FILE} ${CEHTML_FILE}