Title: [103662] trunk/Tools
- Revision
- 103662
- Author
- [email protected]
- Date
- 2011-12-24 13:01:17 -0800 (Sat, 24 Dec 2011)
Log Message
Set SHARED_PRECOMPS_DIR when Xcode is set to use a custom build product path.
Reviewed by Anders Carlsson.
* Scripts/webkitdirs.pm:
(determineBaseProductDir):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (103661 => 103662)
--- trunk/Tools/ChangeLog 2011-12-24 20:29:30 UTC (rev 103661)
+++ trunk/Tools/ChangeLog 2011-12-24 21:01:17 UTC (rev 103662)
@@ -1,5 +1,14 @@
2011-12-24 Dan Bernstein <[email protected]>
+ Set SHARED_PRECOMPS_DIR when Xcode is set to use a custom build product path.
+
+ Reviewed by Anders Carlsson.
+
+ * Scripts/webkitdirs.pm:
+ (determineBaseProductDir):
+
+2011-12-24 Dan Bernstein <[email protected]>
+
Make build-webkit aware of additional Xcode build location defaults.
Reviewed by Anders Carlsson.
Modified: trunk/Tools/Scripts/webkitdirs.pm (103661 => 103662)
--- trunk/Tools/Scripts/webkitdirs.pm 2011-12-24 20:29:30 UTC (rev 103661)
+++ trunk/Tools/Scripts/webkitdirs.pm 2011-12-24 21:01:17 UTC (rev 103662)
@@ -176,6 +176,7 @@
return if defined $baseProductDir;
determineSourceDir();
+ my $setSharedPrecompsDir;
$baseProductDir = $ENV{"WEBKITOUTPUTDIR"};
if (!defined($baseProductDir) and isAppleMacWebKit()) {
@@ -195,7 +196,9 @@
my $buildLocationStyle = join '', readXcodeUserDefault("BuildLocationStyle");
if ($buildLocationStyle eq "Custom") {
my $buildLocationType = join '', readXcodeUserDefault("CustomBuildLocationType");
+ # FIXME: Read CustomBuildIntermediatesPath and set OBJROOT accordingly.
$baseProductDir = readXcodeUserDefault("CustomBuildProductsPath") if $buildLocationType eq "Absolute";
+ $setSharedPrecompsDir = 1;
}
}
@@ -217,6 +220,7 @@
if (!defined($baseProductDir)) { # Port-spesific checks failed, use default
$baseProductDir = "$sourceDir/WebKitBuild";
+ undef $setSharedPrecompsDir;
}
if (isBlackBerry()) {
@@ -236,6 +240,7 @@
die "Can't handle Xcode product directory with a ~ in it.\n" if $baseProductDir =~ /~/;
die "Can't handle Xcode product directory with a variable in it.\n" if $baseProductDir =~ /\$/;
@baseProductDirOption = ("SYMROOT=$baseProductDir", "OBJROOT=$baseProductDir");
+ push(@baseProductDirOption, "SHARED_PRECOMPS_DIR=${baseProductDir}/PrecompiledHeaders") if $setSharedPrecompsDir;
}
if (isCygwin()) {
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
