Changeset 132636 in webkit for trunk/Source/JavaScriptCore/DerivedSources.pri

Timestamp:

Oct 26, 2012, 5:48:36 AM (13 years ago)

Author:

[email protected]

Message:

[Qt] Fix the LLInt build on Windows
​https://bugs.webkit.org/show_bug.cgi?id=97648

Patch by Simon Hausmann <​[email protected]> on 2012-10-26
Reviewed by Tor Arne Vestbø.

Source/JavaScriptCore:

The main change for the port on Windows is changing the way offsets are extracted
and the LLIntAssembly.h is generated to accomodate release and debug configurations.

Firstly the LLIntOffsetsExtractor binary is now built as-is (no DESTDIR set) and
placed into debug\LLIntOffsetsExtractor.exe and release\LLIntOffsetsExtractor.exe
on Windows debug_and_release builds. On other patforms it remainds in the regular
out directory.

Secondly the LLIntAssembly.h files must be different for different build types,
so the LLIntAssembly.h generator in DerivedSources.pri operates no on the extractor
binary files as input. Using a simple exists() check we verify the presence of either
a regular, a debug\LLIntOffsetsExtractor and a release\LLIntOffsetsExtractor binary
and process all of them. The resulting assembly files consequently end up in
generated\debug\LLIntAssembly.h and generated\release\LLIntAssembly.h.

In Target.pri we have to also make sure that those directories are in the include
path according to the release or debug configuration.

Lastly a small tweak - swapping WTF.pri and JSC.pri inclusions - in the
LLIntOffsetsExtractor build was needed to make sure that we include
JavaScriptCore/config.h instead of WTF/config.h, required to fix the
build issues originally pasted in bug #97648.

• DerivedSources.pri:
• JavaScriptCore.pro:
• LLIntOffsetsExtractor.pro:
• Target.pri:

Tools:

Added BIN_EXTENSION variable - similar to automake - that expands to .exe as suffix for
executable programs on Windows. Empty otherwise. Also added support for force_build_all
to allow overriding us disabling build_all for TEMPLATE = app.

• qmake/mkspecs/features/default_pre.prf:

File:

• trunk/Source/JavaScriptCore/DerivedSources.pri (modified) (2 diffs)

trunk/Source/JavaScriptCore/DerivedSources.pri

@@ -34 +34 @@
     jit/JITStubs.cpp
 
-LLINT_FILES = \
-    llint/LowLevelInterpreter.asm
+LLINT_ASSEMBLER = $$PWD/llint/LowLevelInterpreter.asm
 
 LLINT_DEPENDENCY = \
     $$PWD/llint/LowLevelInterpreter32_64.asm \
-    $$PWD/llint/LowLevelInterpreter64.asm
+    $$PWD/llint/LowLevelInterpreter64.asm \
+    $$LLINT_ASSEMBLER
 
 DISASSEMBLER_FILES = \
@@ -96 +96 @@
 GENERATORS += klgen
 
-linux-*:!equals(QT_ARCH, "arm") {
+EXTRACTOR_BINARY = LLIntOffsetsExtractor$$BIN_EXTENSION
+DIRS = $$OUT_PWD $$OUT_PWD/debug $$OUT_PWD/release
+for(dir, DIRS) {
+    file = $$dir/$$EXTRACTOR_BINARY
+    exists($$file): LLINT_FILES += $$file
+}
+
+if(linux-*|win32):!equals(QT_ARCH, "arm") {
     #GENERATOR: LLInt
-    llint.output = LLIntAssembly.h
+    llint.output = ${QMAKE_FILE_IN_PATH}$${QMAKE_DIR_SEP}LLIntAssembly.h
     llint.script = $$PWD/offlineasm/asm.rb
     llint.input = LLINT_FILES
-    llint.depends = LLIntOffsetsExtractor $$LLINT_DEPENDENCY
-    llint.commands = ruby $$llint.script ${QMAKE_FILE_NAME} LLIntOffsetsExtractor ${QMAKE_FILE_OUT}
+    llint.depends = $$LLINT_DEPENDENCY
+    llint.commands = ruby $$llint.script $$LLINT_ASSEMBLER ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
     GENERATORS += llint
 }