* Scripts/webkitdirs.pm: Recognize all 1.X versions of Xcode as old too,...

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

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 6782c108fe45e6023ec47aabfcea6d1324f69176..567d85b6d0acacef4aa0f2d5ed1edec594c93921 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,7 @@
+2005-06-15  Darin Adler  <darin@apple.com>
+
+        * Scripts/webkitdirs.pm: Recognize all 1.X versions of Xcode as old too, not just 2.0.
+
 2005-06-14  Darin Adler  <darin@apple.com>
 
         Changes by Anders Carlsson.

diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm
index 2b76ef8820bcbcd0250363f1aab7d8143e72c285..bdb13267677c59eb2cade86ac845a4e6ce1250b4 100644 (file)
--- a/WebKitTools/Scripts/webkitdirs.pm
+++ b/WebKitTools/Scripts/webkitdirs.pm
@@ -58,7 +58,7 @@ sub chdirWebKit
     chdir "$FindBin::Bin/../.." or die;
 }
 
-sub determineXCodeVersion
+sub determineXcodeVersion
 {
     return if defined $XcodeVersion;
     # Could use "xcodebuild -version" instead.
@@ -100,11 +100,17 @@ sub determineConfiguration
     }
 }
 
+sub oldXcode
+{
+    determineXcodeVersion();
+    return $XcodeVersion =~ /^1\./ || $XcodeVersion eq "2.0";
+}
+
 sub determineConfigurationProductDir
 {
     determineConfiguration();
-    determineXCodeVersion();
-    if ($XcodeVersion eq "2.0") {
+    determineXcodeVersion();
+    if (oldXcode()) {
         $configurationProductDir = $baseProductDir;
     } else {
         $configurationProductDir = "$baseProductDir/$configuration";
@@ -127,7 +133,9 @@ sub XcodeOptions
 {
     determineBaseProductDir();
     determineConfiguration();
-    return (@baseProductDirOption, "-buildstyle", $configuration);
+    determineXcodeVersion();
+    return (@baseProductDirOption, "-buildstyle", $configuration) if oldXcode();
+    return (@baseProductDirOption, "-configuration", $configuration);
 }
 
 sub passedConfiguration