[Xcode] Opt out of the New Build System
authormitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 7 Jun 2018 05:09:23 +0000 (05:09 +0000)
committermitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 7 Jun 2018 05:09:23 +0000 (05:09 +0000)
https://bugs.webkit.org/show_bug.cgi?id=186380

Reviewed by Alexey Proskuryakov.

.:

* WebKit.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings: Use the Legacy Build System.

Tools:

* Scripts/webkitdirs.pm:
(XcodeOptions): Have -UseNewBuildSystem=NO passed to xcodebuild.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@232573 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
Tools/ChangeLog
Tools/Scripts/webkitdirs.pm
WebKit.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

index 2fd8d2f..4c8eae7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2018-06-06  Dan Bernstein  <mitz@apple.com>
 
+        [Xcode] Opt out of the New Build System
+        https://bugs.webkit.org/show_bug.cgi?id=186380
+
+        Reviewed by Alexey Proskuryakov.
+
+        * WebKit.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings: Use the Legacy Build System.
+
+2018-06-06  Dan Bernstein  <mitz@apple.com>
+
         Check in a file created by the Xcode 10 beta.
 
         * WebKit.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist: Added.
index 58ce70f..44ef181 100644 (file)
@@ -1,3 +1,13 @@
+2018-06-06  Dan Bernstein  <mitz@apple.com>
+
+        [Xcode] Opt out of the New Build System
+        https://bugs.webkit.org/show_bug.cgi?id=186380
+
+        Reviewed by Alexey Proskuryakov.
+
+        * Scripts/webkitdirs.pm:
+        (XcodeOptions): Have -UseNewBuildSystem=NO passed to xcodebuild.
+
 2018-06-06  Antoine Quint  <graouts@apple.com>
 
         Rename color-filter to -apple-color-filter and do not expose it to Web content
index 30700b6..5896a2c 100755 (executable)
@@ -850,6 +850,7 @@ sub XcodeOptions
     determineXcodeSDK();
 
     my @options;
+    push @options, "-UseNewBuildSystem=NO";
     push @options, "-UseSanitizedBuildSystemEnvironment=YES";
     push @options, ("-configuration", $configuration);
     push @options, ("-xcconfig", sourceDir() . "/Tools/asan/asan.xcconfig", "ASAN_IGNORE=" . sourceDir() . "/Tools/asan/webkit-asan-ignore.txt") if $asanIsEnabled;
index 08de0be..a3f43a8 100644 (file)
@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+       <key>BuildSystemType</key>
+       <string>Original</string>
        <key>IDEWorkspaceSharedSettings_AutocreateContextsIfNeeded</key>
        <false/>
 </dict>