Commit 193d2872 authored by hausmann@webkit.org's avatar hausmann@webkit.org

[Qt] Automate the use of AllInOne files in the Qt build

https://bugs.webkit.org/show_bug.cgi?id=95837

Reviewed by Tor Arne Vestbø.

Source/WebCore:

Replace the manual use of SVGAllInOne.cpp with automated use through
the ALL_IN_ONE_SOURCES variable. This adds a few more all-in-one sources
to the build and leaves out some that do not compile yet due to various
platform-dependant pre-processor macro issues.

* Target.pri:

Tools:

New feature file that implements the all-in-one file automation by
adding the requested all-in-one files to SOURCES and removing the files
it includes from SOURCES.

* qmake/mkspecs/features/use_all_in_one_files.prf: Added.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@127576 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent ddb89e65
2012-09-05 Simon Hausmann <simon.hausmann@nokia.com>
[Qt] Automate the use of AllInOne files in the Qt build
https://bugs.webkit.org/show_bug.cgi?id=95837
Reviewed by Tor Arne Vestbø.
Replace the manual use of SVGAllInOne.cpp with automated use through
the ALL_IN_ONE_SOURCES variable. This adds a few more all-in-one sources
to the build and leaves out some that do not compile yet due to various
platform-dependant pre-processor macro issues.
* Target.pri:
2012-09-05 Benjamin Poulain <bpoulain@apple.com>
Fix the uses of String::operator+=() for Mac
This diff is collapsed.
2012-09-05 Simon Hausmann <simon.hausmann@nokia.com>
[Qt] Automate the use of AllInOne files in the Qt build
https://bugs.webkit.org/show_bug.cgi?id=95837
Reviewed by Tor Arne Vestbø.
New feature file that implements the all-in-one file automation by
adding the requested all-in-one files to SOURCES and removing the files
it includes from SOURCES.
* qmake/mkspecs/features/use_all_in_one_files.prf: Added.
2012-09-04 Tim Horton <timothy_horton@apple.com>
Have NRWT log more output when crash logs are missing
......
# -------------------------------------------------------------------
# This feature enables the use of AllInOne.cpp files by adding them
# to SOURCES and removing the sources the corresponding files include
# from SOURCES, to avoid duplicated compilation units.
#
# See 'Tools/qmake/README' for an overview of the build system
# -------------------------------------------------------------------
# Globbing all does not work yet, not all AllInOne files build reliably yet.
# So instead we select them manually.
#collection = $$files($$_PRO_FILE_PWD_/*AllInOne.cpp, true)
collection = $$ALL_IN_ONE_SOURCES
for(collectionFile, collection) {
lines = $$cat($$_PRO_FILE_PWD_/$$collectionFile, lines)
for(line, lines) {
line = $$find(line, "^.+include \"(.*)\"")
isEmpty(line): next()
line ~= s/^.+include \"(.*)\"/\\1/
source = $$dirname(collectionFile)/$$line
contains(SOURCES, $$source) {
SOURCES -= $$source
tookFromSources = true
}
}
!isEmpty(tookFromSources): SOURCES *= $$collectionFile
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment