Changeset 35335 in webkit for trunk/JavaScriptCore/JavaScriptCore.pri

Timestamp:

Jul 25, 2008, 3:55:33 AM (17 years ago)

Author:

Simon Hausmann

Message:

2008-07-25 Simon Hausmann <Simon Hausmann>

Discussed with and rubber-stamped by Lars.

Fix the build system for the Qt port.

Recent JavaScriptCore changes require the addition of JavaScriptCore/API to the
include search path. With a build process that combines JavaScriptCore and
WebCore in one build process/Makefile the existance of
JavaScriptCore/API/Node.h and WebCore/dom/Node.h causes include conflicts.

This commit solves this by introducing a separate build of JavaScriptCore into
a static library.

As a result of the split-up a race-condition due to broken dependencies of
regular source files to header files of generated sources showed up very
frequently when doing parallel builds (which the buildbot does). This commit at
the same time tries to address the dependency problem by making the
addExtraCompiler() function also generate a pseudo extra compiler that
represents the header file output, so that qmake is aware of the creation of
the header file for dependency calculation.

At the same time I removed a lot of cruft from the pro files to ease maintenance.

File:

• trunk/JavaScriptCore/JavaScriptCore.pri (modified) (3 diffs)

trunk/JavaScriptCore/JavaScriptCore.pri

@@ -3 +3 @@
 
 INCLUDEPATH += tmp
-INCLUDEPATH += $$PWD $$PWD/kjs $$PWD/wtf $$PWD/wtf/unicode $$PWD/VM $$PWD/profiler
-DEPENDPATH += $$PWD $$PWD/kjs $$PWD/wtf $$PWD/wtf/unicode $$PWD/VM $$PWD/profiler
-DEFINES -= KJS_IDENTIFIER_HIDE_GLOBALS 
+INCLUDEPATH += $$PWD $$PWD/kjs $$PWD/wtf $$PWD/wtf/unicode $$PWD/VM $$PWD/profiler $$PWD/API $$PWD/.. \
+               $$PWD/ForwardingHeaders
 DEFINES += BUILDING_QT__
 
-win32-msvc*: INCLUDEPATH += $$PWD/os-win32
+isEmpty(GENERATED_SOURCES_DIR):GENERATED_SOURCES_DIR = tmp
+GENERATED_SOURCES_DIR_SLASH = $$GENERATED_SOURCES_DIR/
+win32-*: GENERATED_SOURCES_DIR_SLASH ~= s|/|\|
 
-isEmpty(GENERATED_SOURCES_DIR):GENERATED_SOURCES_DIR = tmp
 
 include(pcre/pcre.pri)
@@ -143 +143 @@
     wtf/qt/MainThreadQt.cpp
 
-!CONFIG(QTDIR_build) {
-    defineTest(addExtraCompiler) {
-        QMAKE_EXTRA_COMPILERS += $$1
-        generated_files.depends += compiler_$${1}_make_all
-        export(QMAKE_EXTRA_COMPILERS)
-        export(generated_files.depends)
-        return(true)
-    }
-}
-
 # GENERATOR 1-A: LUT creator
 lut.output = $$GENERATED_SOURCES_DIR/${QMAKE_FILE_BASE}.lut.h
@@ -177 +167 @@
 kjsbison.dependency_type = TYPE_C
 kjsbison.CONFIG = target_predeps
-kjsbison.clean = ${QMAKE_FILE_OUT} ${QMAKE_VAR_GENERATED_SOURCES_DIR}${QMAKE_FILE_BASE}.h
-addExtraCompiler(kjsbison)
+addExtraCompilerWithHeader(kjsbison)