Commit 5037ce75 authored by vestbo@webkit.org's avatar vestbo@webkit.org

[Qt/Mac] Use CONFIG+=build_all only when building libraries

Reviewed by Ariya Hidayat.

If no configuration is specified when building WebKit we pass the
debug_and_release option to QMake which results in Makefiles for
both configurations being generated.

Previously we built both of these configurations by default, for
all targets (both the QtWebKit framework/dyldlib and the various
executables such as QtLauncher and tests). This makes sense for
the libraries, which get the _debug suffix and can be loaded on
demand by setting the DYLD_IMAGE_SUFFIX, but for executables we
ended up building the same executable twice.

We now only build one instance of each executable, and since this
is a developer build we build the debug-version. Passing either
--debug or --release to build-webkit will override this, and
even in the default case the release version can still be built
by running 'make release' in the the build directory of each
target.

* WebCore.pro:
* DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro:
* Scripts/webkitdirs.pm:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@47743 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent c0008db2
2009-08-25 Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
Reviewed by Ariya Hidayat.
[Qt/Mac] Use CONFIG+=build_all only when building libraries
If no configuration is specified when building WebKit we pass the
debug_and_release option to QMake which results in Makefiles for
both configurations being generated.
Previously we built both of these configurations by default, for
all targets (both the QtWebKit framework/dyldlib and the various
executables such as QtLauncher and tests). This makes sense for
the libraries, which get the _debug suffix and can be loaded on
demand by setting the DYLD_IMAGE_SUFFIX, but for executables we
ended up building the same executable twice.
We now only build one instance of each executable, and since this
is a developer build we build the debug-version. Passing either
--debug or --release to build-webkit will override this, and
even in the default case the release version can still be built
by running 'make release' in the the build directory of each
target.
* WebCore.pro:
2009-08-25 Xan Lopez <xlopez@igalia.com>
Reviewed by Jan Alonzo.
......@@ -3247,10 +3247,10 @@ HEADERS += $$WEBKIT_API_HEADERS
!build_pass {
message("Building QtWebKit as a framework, as that's how Qt was built. You can")
message("override this by passing CONFIG+=webkit_no_framework to build-webkit.")
CONFIG += build_all
} else {
debug_and_release:CONFIG(debug, debug|release) {
TARGET = $$qtLibraryTarget($$TARGET)
}
debug_and_release:TARGET = $$qtLibraryTarget($$TARGET)
}
CONFIG += lib_bundle qt_no_framework_direct_includes qt_framework
......
2009-08-25 Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
Reviewed by Ariya Hidayat.
[Qt/Mac] Use CONFIG+=build_all only when building libraries
If no configuration is specified when building WebKit we pass the
debug_and_release option to QMake which results in Makefiles for
both configurations being generated.
Previously we built both of these configurations by default, for
all targets (both the QtWebKit framework/dyldlib and the various
executables such as QtLauncher and tests). This makes sense for
the libraries, which get the _debug suffix and can be loaded on
demand by setting the DYLD_IMAGE_SUFFIX, but for executables we
ended up building the same executable twice.
We now only build one instance of each executable, and since this
is a developer build we build the debug-version. Passing either
--debug or --release to build-webkit will override this, and
even in the default case the release version can still be built
by running 'make release' in the the build directory of each
target.
* DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro:
* Scripts/webkitdirs.pm:
2009-08-24 Hironori Bono <hbono@chromium.org>
Reviewed by Adam Barth.
......
......@@ -13,9 +13,8 @@ mac {
QMAKE_PLUGIN_BUNDLE_NAME = $$TARGET
QMAKE_BUNDLE_LOCATION += "Contents/MacOS"
debug_and_release:CONFIG(debug, debug|release) {
TARGET = $$qtLibraryTarget($$TARGET)
}
!build_pass:CONFIG += build_all
debug_and_release:TARGET = $$qtLibraryTarget($$TARGET)
}
INCLUDEPATH += ../../../../JavaScriptCore \
......
......@@ -1185,13 +1185,13 @@ sub buildQMakeProject($@)
push @buildArgs, "CONFIG-=release";
push @buildArgs, "CONFIG+=debug";
} else {
push @buildArgs, "CONFIG+=release";
my $passedConfig = passedConfiguration() || "";
if (!isDarwin() || $passedConfig =~ m/release/i) {
push @buildArgs, "CONFIG+=release";
push @buildArgs, "CONFIG-=debug";
} else {
push @buildArgs, "CONFIG+=debug";
push @buildArgs, "CONFIG+=debug_and_release";
push @buildArgs, "CONFIG+=build_all";
}
}
......
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