Changeset 58306 in webkit


Ignore:
Timestamp:
Apr 27, 2010 6:55:36 AM (14 years ago)
Author:
jocelyn.turcotte@nokia.com
Message:

[Qt] Fix Mac build break.

Reviewed by Tor Arne Vestbø.

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

  • Make sure JavaScriptCore's debug_and_release config follows that of WebCore.
  • Use different name for JavaScriptCore target in debug and release since they might be written in the same path at the same time on parallel builds
  • Consolidate the DESTDIR determination logic in JavaScriptCore.pri
Location:
trunk/JavaScriptCore
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/JavaScriptCore/ChangeLog

    r58305 r58306  
     12010-04-15  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
     2
     3        Reviewed by Tor Arne Vestbø.
     4
     5        [Qt] Fix Mac build break.
     6
     7        https://bugs.webkit.org/show_bug.cgi?id=37867
     8        - Make sure JavaScriptCore's debug_and_release config follows that
     9          of WebCore.
     10        - Use different name for JavaScriptCore target in debug and release
     11          since they might be written in the same path at the same time on
     12          parallel builds
     13        - Consolidate the DESTDIR determination logic in JavaScriptCore.pri
     14
     15        * JavaScriptCore.pri:
     16        * JavaScriptCore.pro:
     17
    1182010-04-21  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
    219

  • trunk/JavaScriptCore/JavaScriptCore.pri

    r58104 r58306  
    11# JavaScriptCore - Qt4 build info
    22VPATH += $$PWD
    3 JAVASCRIPTCORE_TARGET = jscore
    4 
     3CONFIG(debug, debug|release) {
     4    # Output in JavaScriptCore/<config>
     5    JAVASCRIPTCORE_DESTDIR = debug
     6    # Use a config-specific target to prevent parallel builds file clashes on Mac
     7    JAVASCRIPTCORE_TARGET = jscored
     8} else {
     9    JAVASCRIPTCORE_DESTDIR = release
     10    JAVASCRIPTCORE_TARGET = jscore
     11}
    512CONFIG(standalone_package) {
    613    isEmpty(JSC_GENERATED_SOURCES_DIR):JSC_GENERATED_SOURCES_DIR = $$PWD/generated
    … …  
    6673
    6774defineTest(addJavaScriptCoreLib) {
    68     pathToJavaScriptCoreOutput = $$ARGS
    69     CONFIG(debug_and_release):CONFIG(debug, debug|release): pathToJavaScriptCoreOutput = $$pathToJavaScriptCoreOutput/debug
    70     CONFIG(debug_and_release):CONFIG(release, debug|release): pathToJavaScriptCoreOutput = $$pathToJavaScriptCoreOutput/release
     75    # Argument is the relative path to JavaScriptCore.pro's qmake output
     76    pathToJavaScriptCoreOutput = $$ARGS/$$JAVASCRIPTCORE_DESTDIR
    7177
    7278    win32-msvc*|wince* {

  • trunk/JavaScriptCore/JavaScriptCore.pro

    r58305 r58306  
    99# which already exists as a directory
    1010TARGET = $$JAVASCRIPTCORE_TARGET
     11DESTDIR = $$JAVASCRIPTCORE_DESTDIR
    1112QT += core
    1213QT -= gui
    … …  
    1617contains(QT_CONFIG, embedded):CONFIG += embedded
    1718
    18 CONFIG(debug_and_release):CONFIG(debug, debug|release): DESTDIR = debug
    19 CONFIG(debug_and_release):CONFIG(release, debug|release): DESTDIR = release
    20 
    21 !CONFIG(QTDIR_build) {
     19CONFIG(QTDIR_build) {
     20    # Make sure we compile both debug and release on mac when inside Qt.
     21    # This line was extracted from qbase.pri instead of including the whole file
     22    win32|mac:!macx-xcode:CONFIG += debug_and_release
     23} else {
    2224    CONFIG(debug, debug|release) {
    2325        OBJECTS_DIR = obj/debug
Note: See TracChangeset for help on using the changeset viewer.