Bug 52891 - [Qt] Move project files into Source
Summary: [Qt] Move project files into Source
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: Tools / Tests (show other bugs)
Version: 528+ (Nightly build)
Hardware: All Linux
: P2 Normal
Assignee: Andras Becsi
URL:
Keywords: Qt
Depends on:
Blocks: 51339
  Show dependency treegraph
 
Reported: 2011-01-21 07:22 PST by Andras Becsi
Modified: 2011-01-27 04:31 PST (History)
9 users (show)

See Also:


Attachments
proposed patch (40.04 KB, patch)
2011-01-21 09:09 PST, Andras Becsi
no flags Details | Formatted Diff | Diff
Fix for Symbian (2.76 KB, patch)
2011-01-26 20:19 PST, Laszlo Gombos
no flags Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Andras Becsi 2011-01-21 07:22:09 PST
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).
Comment 1 Andras Becsi 2011-01-21 09:09:24 PST
Created attachment 79745 [details]
proposed patch

This most certainly needs a clean build, so not setting cq?
Comment 2 Early Warning System Bot 2011-01-21 09:25:35 PST
Attachment 79745 [details] did not build on qt:
Build output: http://queues.webkit.org/results/7643005
Comment 3 Csaba Osztrogonác 2011-01-21 17:13:08 PST
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:
Comment 4 Csaba Osztrogonác 2011-01-21 17:14:24 PST
(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 :)
Comment 5 WebKit Review Bot 2011-01-24 03:23:02 PST
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
Comment 6 Csaba Osztrogonác 2011-01-24 03:34:55 PST
patch landed: http://trac.webkit.org/changeset/76496
fix landed: http://trac.webkit.org/changeset/76499
Comment 7 Csaba Osztrogonác 2011-01-24 03:35:48 PST
(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.
Comment 8 Csaba Osztrogonác 2011-01-24 03:38:34 PST
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.)
Comment 9 Csaba Osztrogonác 2011-01-24 03:39:43 PST
(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.
Comment 10 Andras Becsi 2011-01-24 04:20:33 PST
Comment on attachment 79745 [details]
proposed patch

Thanks Ossy for fixing the issues.
Comment 11 William Siegrist 2011-01-24 10:43:50 PST
Buildbot master updated.
Comment 12 Laszlo Gombos 2011-01-24 13:31:06 PST
Reopened as this broke the Symbian build - patch will follow.
Comment 13 Adam Barth 2011-01-24 16:23:15 PST
Thanks!
Comment 14 Laszlo Gombos 2011-01-26 20:19:12 PST
Created attachment 80291 [details]
Fix for Symbian
Comment 15 Csaba Osztrogonác 2011-01-26 23:19:35 PST
Comment on attachment 80291 [details]
Fix for Symbian

rs=me. Sorry for the build break.
Comment 16 Csaba Osztrogonác 2011-01-27 04:31:39 PST
Landed in http://trac.webkit.org/changeset/76785