[Qt] Move project files into Source

• Component: Tools / Tests
• Status: RESOLVED FIXED

[Andras Becsi]

After all the sources have been moved into the Source directory, the project files in the root can also be moved into the Source directory. To make this possible Tools needs separate project files (Tools.pro and DerivedSources.pro).

[Andras Becsi]

Created attachment 79745 [details]
proposed patch

This most certainly needs a clean build, so not setting cq?

[Early Warning System Bot]

Attachment 79745 [details] did not build on qt:
Build output: http://queues.webkit.org/results/7643005

[Csaba Osztrogonác]

Comment on attachment 79745 [details]
proposed patch

View in context: https://bugs.webkit.org/attachment.cgi?id=79745&action=review

Great work! r=me with some minor reflections. Please fix 
them and make a force clean build on our buildbots when you.

( Just a good advice: Next time use git diff -M if you rename
or move files. It will make the patch more easily reviewable. )

Fix run-javascriptore-tests (webkitdirs.pm in sub jscProductDir):
-    $productDir .= "/Source/JavaScriptCore" if isQt();
+    $productDir .= "/JavaScriptCore" if isQt();

> Source/WebKit2/DerivedSources.pro:44
> -SRC_ROOT_DIR = $$replace(PWD, /Source/WebKit2, /)
> +SRC_ROOT_DIR = $$replace(PWD, /Source/WebKit2, "")

> Source/WebKit2/DerivedSources.pro:114
> -message_header_generator.commands = $${PYTHON} $${SRC_ROOT_DIR}Source/WebKit2/Scripts/generate-messages-header.py ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
> +message_header_generator.commands = $${PYTHON} $${SRC_ROOT_DIR}/Source/WebKit2/Scripts/generate-messages-header.py ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
...

Nice catch. ;)

> Tools/Scripts/webkitdirs.pm:1591
> +    # FIXME Iterate over different source directories manually to workaround a problem with qmake+extraTargets+s60

s/FIXME/FIXME:

[Csaba Osztrogonác]

(In reply to comment #3)
> Great work! r=me with some minor reflections. Please fix 
> them and make a force clean build on our buildbots when you.

s/when you/when you land the patch :)

[WebKit Review Bot]

http://trac.webkit.org/changeset/76496 might have broken Qt Linux Release
The following tests are not passing:
inspector/debugger-autocontinue-on-syntax-error.html
inspector/debugger-scripts.html
inspector/storage-panel-dom-storage.html
inspector/styles-add-blank-property.html

[Csaba Osztrogonác]

patch landed: http://trac.webkit.org/changeset/76496
fix landed: http://trac.webkit.org/changeset/76499

[Csaba Osztrogonác]

(In reply to comment #5)
> http://trac.webkit.org/changeset/76496 might have broken Qt Linux Release
> The following tests are not passing:
> inspector/debugger-autocontinue-on-syntax-error.html
> inspector/debugger-scripts.html
> inspector/storage-panel-dom-storage.html
> inspector/styles-add-blank-property.html

http://trac.webkit.org/changeset/76497 is the culprit.

[Csaba Osztrogonác]

Bill, could you run a reconigure on the buildmaster, please? (because of r76497)
(It isn't so important, because it works with a local symlink now.)

[Csaba Osztrogonác]

(In reply to comment #8)
> Bill, could you run a reconigure on the buildmaster, please? (because of r76497)
> (It isn't so important, because it works with a local symlink now.)

I meant r76499.

[Andras Becsi]

Comment on attachment 79745 [details]
proposed patch

Thanks Ossy for fixing the issues.

[William Siegrist]

Buildbot master updated.

[Laszlo Gombos]

Reopened as this broke the Symbian build - patch will follow.

[Adam Barth]

Thanks!

[Laszlo Gombos]

Created attachment 80291 [details]
Fix for Symbian

[Csaba Osztrogonác]

Comment on attachment 80291 [details]
Fix for Symbian

rs=me. Sorry for the build break.

[Csaba Osztrogonác]

Landed in http://trac.webkit.org/changeset/76785