Changeset 45032 in webkit

Timestamp:

Jun 23, 2009 6:50:20 PM (15 years ago)

Author:

eric@webkit.org

Message:

2009-06-23 Takeshi Yoshino <​tyoshino@google.com>

Reviewed by Mark Rowe.

Bug 26537: Builds from command-line fail if custom build product directory is set and ~/Library/Preferences/xcodebuild.plist exists
​https://bugs.webkit.org/show_bug.cgi?id=26537

Let determineBaseProductDir subroutine remove
~/Library/Preferences/xcodebuild.plist. It can prevent xcodebuild from
respecting global settings such as a custom build products directory
(<rdar://problem/5585899>).

• Scripts/webkitdirs.pm:

Location:

trunk/WebKitTools

Files:

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

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-06-23  Takeshi Yoshino  <tyoshino@google.com>
+
+        Reviewed by Mark Rowe.
+
+        Bug 26537: Builds from command-line fail if custom build product directory is set and ~/Library/Preferences/xcodebuild.plist exists
+        https://bugs.webkit.org/show_bug.cgi?id=26537
+
+        Let determineBaseProductDir subroutine remove
+        ~/Library/Preferences/xcodebuild.plist. It can prevent xcodebuild from
+        respecting global settings such as a custom build products directory
+        (<rdar://problem/5585899>).
+
+        * Scripts/webkitdirs.pm:
+
 2009-06-23  Eric Seidel  <eric@webkit.org>
 

trunk/WebKitTools/Scripts/webkitdirs.pm

@@ -95 +95 @@
     determineSourceDir();
     if (isAppleMacWebKit()) {
+        # Silently remove ~/Library/Preferences/xcodebuild.plist which can
+        # cause build failure. The presence of
+        # ~/Library/Preferences/xcodebuild.plist can prevent xcodebuild from
+        # respecting global settings such as a custom build products directory
+        # (<rdar://problem/5585899>).
+        my $personalPlistFile = $ENV{HOME} . "/Library/Preferences/xcodebuild.plist";
+        if (-e $personalPlistFile) {
+            unlink($personalPlistFile) || die "Could not delete $personalPlistFile: $!";
+        }
+
         open PRODUCT, "defaults read com.apple.Xcode PBXApplicationwideBuildSettings 2> /dev/null |" or die;
         $baseProductDir = join '', <PRODUCT>;