From 68d0819a38a6013965ae5b0d7e322020a738533e Mon Sep 17 00:00:00 2001 From: "mitz@apple.com" Date: Sat, 24 Dec 2011 21:01:17 +0000 Subject: [PATCH] Set SHARED_PRECOMPS_DIR when Xcode is set to use a custom build product path. Reviewed by Anders Carlsson. * Scripts/webkitdirs.pm: (determineBaseProductDir): git-svn-id: https://svn.webkit.org/repository/webkit/trunk@103662 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Tools/ChangeLog | 9 +++++++++ Tools/Scripts/webkitdirs.pm | 5 +++++ 2 files changed, 14 insertions(+) diff --git a/Tools/ChangeLog b/Tools/ChangeLog index 072dbcd19949..63cc2d88c71d 100644 --- a/Tools/ChangeLog +++ b/Tools/ChangeLog @@ -1,3 +1,12 @@ +2011-12-24 Dan Bernstein + + 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 Make build-webkit aware of additional Xcode build location defaults. diff --git a/Tools/Scripts/webkitdirs.pm b/Tools/Scripts/webkitdirs.pm index 5dfa20b130df..1888b07b3e1a 100755 --- a/Tools/Scripts/webkitdirs.pm +++ b/Tools/Scripts/webkitdirs.pm @@ -176,6 +176,7 @@ sub determineBaseProductDir return if defined $baseProductDir; determineSourceDir(); + my $setSharedPrecompsDir; $baseProductDir = $ENV{"WEBKITOUTPUTDIR"}; if (!defined($baseProductDir) and isAppleMacWebKit()) { @@ -195,7 +196,9 @@ sub determineBaseProductDir 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 @@ sub determineBaseProductDir if (!defined($baseProductDir)) { # Port-spesific checks failed, use default $baseProductDir = "$sourceDir/WebKitBuild"; + undef $setSharedPrecompsDir; } if (isBlackBerry()) { @@ -236,6 +240,7 @@ sub determineBaseProductDir 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()) { -- 2.36.0