Title: [220563] trunk/Tools
- Revision
- 220563
- Author
- m...@apple.com
- Date
- 2017-08-10 16:57:47 -0700 (Thu, 10 Aug 2017)
Log Message
[Xcode] With Xcode 9 developer beta, everything rebuilds when switching between command-line and IDE
https://bugs.webkit.org/show_bug.cgi?id=173223
Reviewed by Tim Horton.
The rebuilds were happening due to a difference in the compiler options that the IDE and
xcodebuild were specifying. Only the IDE was passing the -index-store-path option. To make
xcodebuild pass that option, too, set INDEX_ENABLE_DATA_STORE to YES and
INDEX_DATA_STORE_DIR to the Index Datastore path specified in Xcode Locations preferences >
Advanced when a Custom Absolute path is selected.
* Scripts/webkitdirs.pm:
(determineBaseProductDir):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (220562 => 220563)
--- trunk/Tools/ChangeLog 2017-08-10 23:42:14 UTC (rev 220562)
+++ trunk/Tools/ChangeLog 2017-08-10 23:57:47 UTC (rev 220563)
@@ -1,3 +1,19 @@
+2017-08-10 Dan Bernstein <m...@apple.com>
+
+ [Xcode] With Xcode 9 developer beta, everything rebuilds when switching between command-line and IDE
+ https://bugs.webkit.org/show_bug.cgi?id=173223
+
+ Reviewed by Tim Horton.
+
+ The rebuilds were happening due to a difference in the compiler options that the IDE and
+ xcodebuild were specifying. Only the IDE was passing the -index-store-path option. To make
+ xcodebuild pass that option, too, set INDEX_ENABLE_DATA_STORE to YES and
+ INDEX_DATA_STORE_DIR to the Index Datastore path specified in Xcode Locations preferences >
+ Advanced when a Custom Absolute path is selected.
+
+ * Scripts/webkitdirs.pm:
+ (determineBaseProductDir):
+
2017-08-10 Yusuke Suzuki <utatane....@gmail.com>
Run more WTF tests
Modified: trunk/Tools/Scripts/webkitdirs.pm (220562 => 220563)
--- trunk/Tools/Scripts/webkitdirs.pm 2017-08-10 23:42:14 UTC (rev 220562)
+++ trunk/Tools/Scripts/webkitdirs.pm 2017-08-10 23:57:47 UTC (rev 220563)
@@ -230,6 +230,7 @@
determineSourceDir();
my $setSharedPrecompsDir;
+ my $indexDataStoreDir;
$baseProductDir = $ENV{"WEBKIT_OUTPUTDIR"};
if (!defined($baseProductDir) and isAppleCocoaWebKit()) {
@@ -247,7 +248,10 @@
if ($buildLocationStyle eq "Custom") {
my $buildLocationType = join '', readXcodeUserDefault("IDECustomBuildLocationType");
# FIXME: Read CustomBuildIntermediatesPath and set OBJROOT accordingly.
- $baseProductDir = readXcodeUserDefault("IDECustomBuildProductsPath") if $buildLocationType eq "Absolute";
+ if ($buildLocationType eq "Absolute") {
+ $baseProductDir = readXcodeUserDefault("IDECustomBuildProductsPath");
+ $indexDataStoreDir = readXcodeUserDefault("IDECustomIndexStorePath");
+ }
}
# DeterminedByTargets corresponds to a setting of "Legacy" in Xcode.
@@ -280,6 +284,7 @@
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;
+ push(@baseProductDirOption, "INDEX_ENABLE_DATA_STORE=YES", "INDEX_DATA_STORE_DIR=${indexDataStoreDir}") if $indexDataStoreDir;
}
if (isCygwin()) {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
