| Summary: | [Qt] An incremental build bug appeared after r145712. | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Product: | WebKit | Reporter: | Ádám Kallai <kadam> | ||||||
| Component: | Tools / Tests | Assignee: | Nobody <webkit-unassigned> | ||||||
| Status: | RESOLVED FIXED | ||||||||
| Severity: | Normal | CC: | jturcotte, kadam, ossy, zarvai | ||||||
| Priority: | P2 | ||||||||
| Version: | 528+ (Nightly build) | ||||||||
| Hardware: | Unspecified | ||||||||
| OS: | Unspecified | ||||||||
| Attachments: |
|
||||||||
|
Description
Ádám Kallai
2013-03-18 08:45:13 PDT
It was necessary to do clean build after http://trac.webkit.org/changeset/146048. It caused less inspector tests fail than previous revision, but it seems that the problem is the same. The bug is caused by a missing dependency.
Here is the related part of the Makefile:
.rcc/release-shared/qrc_InspectorBackendCommands.cpp: generated/InspectorBackendCommands.qrc
/usr/local/Trolltech/Qt5/Qt-5.0.1/bin/rcc -name InspectorBackendCommands generated/InspectorBackendCommands.qrc -o .rcc/release-shared/qrc_InspectorBackendCommands.cpp
.rcc/release-shared/qrc_InspectorBackendCommands.cpp must depend on InspectorBackendCommands.js too. I'm not sure where is the bug, but
I suspect somewhere in qmake or rcc.
qmake generates dependency with "rcc -list <qrc-file>" command, but
it might be confused because of this relative path: generated/InspectorBackendCommands.qrc
Could you check it on a small example?
Created attachment 195744 [details]
proposed patch
It's a workaround. Ossy, I tried out to your example. I reproduced it successfully. I will able to report this bug. Only I should make a smaller example than I have.
Comment on attachment 195744 [details] proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=195744&action=review > Source/WebCore/DerivedSources.pri:813 > +inspectorBackendCommands.depends = $$INSPECTOR_JSON I'm not sure what this should fix, Inspector.json isn't a dependency of InspectorBackendCommands.qrc Comment on attachment 195744 [details] proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=195744&action=review >> Source/WebCore/DerivedSources.pri:813 >> +inspectorBackendCommands.depends = $$INSPECTOR_JSON > > I'm not sure what this should fix, Inspector.json isn't a dependency of InspectorBackendCommands.qrc I agree, it is incorrect. But adding InspectorBackendCommands.js as dependency can be a good workaround, because touching InspectorBackendCommands.js must force the regeneration of qrc_InspectorBackendCommands.cpp. Created attachment 196137 [details]
For example
I uploaded a smaller example. I reproduced the problem successfully.
The first one was created when I called the qmake from the root. ( qmake foo.pro )
qrc_foo.cpp: build/foo.qrc \
build/foo.txt
/usr/local/Trolltech/Qt5/Qt-5.0.1/bin/rcc -name foo build/foo.qrc -o qrc_foo.cpp
The second one was created when I called the qmake from build/ directory. ( qmake ../foo.pro)
qrc_foo.cpp: foo.qrc
/usr/local/Trolltech/Qt5/Qt-5.0.1/bin/rcc -name foo foo.qrc -o qrc_foo.cpp
You can see that build/foo.txt missing, but it should exist there. So when I change foo.txt content and I call make then it doesn't detect the file changes.
I tracked this bug into qmake. It uses a DEPENDPATH array of path to resolve relative file names which is generated from I'm not too sure what (pass "-d" to qmake to see it at the line "Dependency Directories:"). All-in-all it seems related to a mismatch between the current directory used by qmake and rcc, which is an issue when the qrc is situated in the shadowbuild. It probably have been like that for the last 15 years, so the workaround sounds fine to me if you can use the proper filename. Comment on attachment 195744 [details] proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=195744&action=review >>> Source/WebCore/DerivedSources.pri:813 >>> +inspectorBackendCommands.depends = $$INSPECTOR_JSON >> >> I'm not sure what this should fix, Inspector.json isn't a dependency of InspectorBackendCommands.qrc > > I agree, it is incorrect. But adding InspectorBackendCommands.js as dependency > can be a good workaround, because touching InspectorBackendCommands.js must > force the regeneration of qrc_InspectorBackendCommands.cpp. I see, InspectorBackendCommands.js is generated from Inspector.json, and triggering a copy of the qrc in this case will work around the bug in qmake. The patch looks fine to me after all, this is quite hackish though so it would be nice to have a comment explaining how INSPECTOR_JSON is connected to InspectorBackendCommands.qrc and why we do this. r=me if you add such comment. It was interesting for us. The InspectorBackendCommands.js is generated by CodeGeneratorInspector.py from Inspector.json. The problem was that when the inspector.json is changed and the qrc already exists then the qmake does not realize the changes. Therefore the qrc_InspectorBackendCommands.cpp won't be regenerated. So the copy of qrc should be triggered by inspector.json. I will land it. Committed r152448: <http://trac.webkit.org/changeset/152448> |