Changeset 27959 in webkit for trunk/JavaScriptCore

Timestamp:

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

Author:

Simon Hausmann

Message:

Make the directory of where to put the generated sources configurable through the GENERATED_SOURCE_DIR variable

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.
+
+        Make the directory of where to put the generated sources configurable through the GENERATED_SOURCE_DIR variable
+
+        * JavaScriptCore.pri:
+        * pcre/pcre.pri:
+
 2007-11-22  Simon Hausmann  <[email protected]>
 

trunk/JavaScriptCore/JavaScriptCore.pri

@@ -11 +11 @@
 
 win32-msvc*: INCLUDEPATH += $$PWD/os-win32
+
+isEmpty(GENERATED_SOURCES_DIR):GENERATED_SOURCES_DIR = tmp
 
 include(pcre/pcre.pri)
@@ -112 +114 @@
 
 # GENERATOR 1-A: LUT creator
-lut.output = tmp/${QMAKE_FILE_BASE}.lut.h
+lut.output = $$GENERATED_SOURCES_DIR/${QMAKE_FILE_BASE}.lut.h
 lut.commands = perl $$PWD/kjs/create_hash_table ${QMAKE_FILE_NAME} -i > ${QMAKE_FILE_OUT}
 lut.depend = ${QMAKE_FILE_NAME}
@@ -120 +122 @@
 
 # GENERATOR 1-B: particular LUT creator (for 1 file only)
-keywordlut.output = tmp/lexer.lut.h
+keywordlut.output = $$GENERATED_SOURCES_DIR/lexer.lut.h
 keywordlut.commands = perl $$PWD/kjs/create_hash_table ${QMAKE_FILE_NAME} -i > ${QMAKE_FILE_OUT}
 keywordlut.depend = ${QMAKE_FILE_NAME}
@@ -128 +130 @@
 
 # GENERATOR 2: bison grammar
-kjsbison.output = tmp/${QMAKE_FILE_BASE}.cpp
-kjsbison.commands = bison -d -p kjsyy ${QMAKE_FILE_NAME} -o ${QMAKE_FILE_BASE}.tab.c && $(MOVE) ${QMAKE_FILE_BASE}.tab.c ${QMAKE_FILE_OUT} && $(MOVE) ${QMAKE_FILE_BASE}.tab.h tmp/${QMAKE_FILE_BASE}.h
+kjsbison.output = $$GENERATED_SOURCES_DIR/${QMAKE_FILE_BASE}.cpp
+kjsbison.commands = bison -d -p kjsyy ${QMAKE_FILE_NAME} -o ${QMAKE_FILE_BASE}.tab.c && $(MOVE) ${QMAKE_FILE_BASE}.tab.c ${QMAKE_FILE_OUT} && $(MOVE) ${QMAKE_FILE_BASE}.tab.h $$GENERATED_SOURCES_DIR/${QMAKE_FILE_BASE}.h
 kjsbison.depend = ${QMAKE_FILE_NAME}
 kjsbison.input = KJSBISON

trunk/JavaScriptCore/pcre/pcre.pri

@@ -3 +3 @@
 INCLUDEPATH += $$PWD $$OUTPUT_DIR/JavaScriptCore/kjs/tmp
 DEPENDPATH += $$PWD
+
+isEmpty(GENERATED_SOURCES_DIR):GENERATED_SOURCES_DIR = tmp
 
 SOURCES += \
@@ -26 +28 @@
 
 # GENERATOR: "chartables.c": compile and execute the chartables generator (and add it to sources)
-ctgen.output = tmp/chartables.c
+ctgen.output = $$GENERATED_SOURCES_DIR/chartables.c
 ctgen.commands = $$OUTPUT_DIR/JavaScriptCore/pcre/tmp/dftables ${QMAKE_FILE_OUT}
 ctgen.input = CTGENFILE