Changeset 220563 in webkit

Timestamp:

Aug 10, 2017 4:57:47 PM (7 years ago)

Author:

mitz@apple.com

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):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitdirs.pm (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2017-08-10  Dan Bernstein  <mitz@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.tea@gmail.com>
 

trunk/Tools/Scripts/webkitdirs.pm

@@ -231 +231 @@
 
     my $setSharedPrecompsDir;
+    my $indexDataStoreDir;
     $baseProductDir = $ENV{"WEBKIT_OUTPUTDIR"};
 
@@ -248 +249 @@
             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");
+            }
         }
 
@@ -281 +285 @@
         @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;
     }