Changeset 53187 in webkit for trunk/JavaScriptCore/pcre

Timestamp:

Jan 13, 2010, 8:06:39 AM (15 years ago)

Author:

Simon Hausmann

Message:

[Qt] Split the build process in two different .pro files.
This allows qmake to be run once all source files are available.

Patch by Jocelyn Turcotte <​[email protected]> on 2010-01-13
Reviewed by Simon Hausmann.

.:

• DerivedSources.pro: Added.
• WebKit.pri:

JavaScriptCore:

• DerivedSources.pro: Added.
• JavaScriptCore.pri: Moved source generation to DerivedSources.pro
• pcre/pcre.pri: Moved source generation to DerivedSources.pro

WebCore:

• DerivedSources.pro: Added.
• WebCore.pri: Added. Contains common logic between source generation and compilation.
• WebCore.pro: Moved source generation to DerivedSources.pro.

WebKitTools:

• Scripts/webkitdirs.pm: Add calls to make DerivedSources.pro in JSC and WC.

File:

• trunk/JavaScriptCore/pcre/pcre.pri (modified) (2 diffs)

trunk/JavaScriptCore/pcre/pcre.pri

@@ -3 +3 @@
 INCLUDEPATH += $$PWD $$OUTPUT_DIR/JavaScriptCore/tmp
 DEPENDPATH += $$PWD
-
-isEmpty(GENERATED_SOURCES_DIR):GENERATED_SOURCES_DIR = tmp
 
 SOURCES += \
@@ -13 +11 @@
     pcre_xclass.cpp
 
-!CONFIG(standalone_package) {
-    defineTest(addExtraCompiler) {
-        QMAKE_EXTRA_COMPILERS += $$1
-        generated_files.depends += compiler_$${1}_make_all
-        export(QMAKE_EXTRA_COMPILERS)
-        export(generated_files.depends)
-        return(true)
-    }
-}
-
-# GENERATOR: "chartables.c": compile and execute the chartables generator (and add it to sources)
-win32-msvc*|wince*: PREPROCESSOR = "--preprocessor=\"$$QMAKE_CC /E\""
-DFTABLES = $$PWD/dftables
-ctgen.input = DFTABLES
-ctgen.output = $$GENERATED_SOURCES_DIR/chartables.c
-ctgen.commands = perl $$DFTABLES ${QMAKE_FILE_OUT} $$PREPROCESSOR
-ctgen.CONFIG += target_predeps no_link
-ctgen.variable_out = GENERATED_SOURCES
-ctgen.dependency_type = TYPE_C
-ctgen.clean = ${QMAKE_FILE_OUT} ${QMAKE_VAR_GENERATED_SOURCES_DIR}${QMAKE_FILE_BASE}
-addExtraCompiler(ctgen)