Changeset 27958 in webkit for trunk/JavaScriptCore

Timestamp:

Nov 22, 2007, 2:10:07 AM (18 years ago)

Author:

Simon Hausmann

Message:

Centralize the setup for all the extra compilers in a addExtraCompiler function.

This allows adding a "generated_files" target that builds all generated files
using "make generated_files". For the build inside Qt we do not generate
actual rules for the extra compilers but instead do the variable substitution
of compiler.output manually and add the generated sources to SOURCES.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• JavaScriptCore.pri (modified) (4 diffs)
• pcre/pcre.pri (modified) (2 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2007-11-22  Simon Hausmann  <[email protected]>
+
+        Reviewed by George.
+
+        Centralize the setup for all the extra compilers in a addExtraCompiler function.
+        
+        This allows adding a "generated_files" target that builds all generated files using "make generated_files".
+        For the build inside Qt we do not generate actual rules for the extra compilers but instead
+        do the variable substitution of compiler.output manually and add the generated sources to SOURCES.
+
+        * JavaScriptCore.pri:
+        * pcre/pcre.pri:
+
 2007-11-20  Mark Rowe  <[email protected]>
 

trunk/JavaScriptCore/JavaScriptCore.pri

@@ -101 +101 @@
     bindings/qt/qt_runtime.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
@@ -108 +117 @@
 lut.input = LUT_FILES
 lut.CONFIG += no_link
-QMAKE_EXTRA_COMPILERS += lut
+addExtraCompiler(lut)
 
 # GENERATOR 1-B: particular LUT creator (for 1 file only)
@@ -116 +125 @@
 keywordlut.input = KEYWORDLUT_FILES
 keywordlut.CONFIG += no_link
-QMAKE_EXTRA_COMPILERS += keywordlut
+addExtraCompiler(keywordlut)
 
 # GENERATOR 2: bison grammar
@@ -127 +136 @@
 kjsbison.CONFIG = target_predeps
 kjsbison.clean = ${QMAKE_FILE_OUT} ${QMAKE_VAR_OBJECTS_DIR_WTR}${QMAKE_FILE_BASE}.h
-QMAKE_EXTRA_COMPILERS += kjsbison
+addExtraCompiler(kjsbison)

trunk/JavaScriptCore/pcre/pcre.pri

@@ -15 +15 @@
     dftables.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: "chartables.c": compile and execute the chartables generator (and add it to sources)
 ctgen.output = tmp/chartables.c
@@ -23 +33 @@
 ctgen.dependency_type = TYPE_C
 ctgen.clean = ${QMAKE_FILE_OUT} ${QMAKE_VAR_OBJECTS_DIR_WTR}${QMAKE_FILE_BASE}
-QMAKE_EXTRA_COMPILERS += ctgen
+addExtraCompiler(ctgen)