Title: [121422] trunk/Tools
- Revision
- 121422
- Author
- [email protected]
- Date
- 2012-06-28 02:30:28 -0700 (Thu, 28 Jun 2012)
Log Message
<http://webkit.org/b/90096> Building within Xcode sometimes does a full rebuild after building via build-webkit
We need to ensure that build-webkit uses the same setting for SHARED_PRECOMPS_DIR
as what Xcode itself will use when building, otherwise switching between the two
can result in the precompiled headers being rebuilt and thus the entire world
rebuilding.
Reviewed by Dan Bernstein.
* Scripts/webkitdirs.pm:
(determineBaseProductDir):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (121421 => 121422)
--- trunk/Tools/ChangeLog 2012-06-28 08:51:58 UTC (rev 121421)
+++ trunk/Tools/ChangeLog 2012-06-28 09:30:28 UTC (rev 121422)
@@ -1,3 +1,17 @@
+2012-06-27 Mark Rowe <[email protected]>
+
+ <http://webkit.org/b/90096> Building within Xcode sometimes does a full rebuild after building via build-webkit
+
+ We need to ensure that build-webkit uses the same setting for SHARED_PRECOMPS_DIR
+ as what Xcode itself will use when building, otherwise switching between the two
+ can result in the precompiled headers being rebuilt and thus the entire world
+ rebuilding.
+
+ Reviewed by Dan Bernstein.
+
+ * Scripts/webkitdirs.pm:
+ (determineBaseProductDir):
+
2012-06-27 Sheriff Bot <[email protected]>
Unreviewed, rolling out r121363, r121367, r121384, and
Modified: trunk/Tools/Scripts/webkitdirs.pm (121421 => 121422)
--- trunk/Tools/Scripts/webkitdirs.pm 2012-06-28 08:51:58 UTC (rev 121421)
+++ trunk/Tools/Scripts/webkitdirs.pm 2012-06-28 09:30:28 UTC (rev 121422)
@@ -206,8 +206,12 @@
my $buildLocationType = join '', readXcodeUserDefault("CustomBuildLocationType");
# FIXME: Read CustomBuildIntermediatesPath and set OBJROOT accordingly.
$baseProductDir = readXcodeUserDefault("CustomBuildProductsPath") if $buildLocationType eq "Absolute";
- $setSharedPrecompsDir = 1;
}
+
+ # DeterminedByTargets corresponds to a setting of "Legacy" in Xcode.
+ # It is the only build location style for which SHARED_PRECOMPS_DIR is not
+ # overridden when building from within Xcode.
+ $setSharedPrecompsDir = 1 if $buildLocationStyle ne "DeterminedByTargets";
}
if (!defined($baseProductDir)) {
@@ -226,9 +230,8 @@
}
}
- if (!defined($baseProductDir)) { # Port-spesific checks failed, use default
+ if (!defined($baseProductDir)) { # Port-specific checks failed, use default
$baseProductDir = "$sourceDir/WebKitBuild";
- undef $setSharedPrecompsDir;
}
if (isBlackBerry()) {
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
