Reviewed by Stephanie.

xeenon · xeenon · commit 997c29e68417 · 2006-10-31T01:33:04.000Z
Add a special case for the Internal makefiles, so it can find the OepnSource. * Scripts/webkitdirs.pm: Canonical link: https://commits.webkit.org/14675@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@17458 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
@@ -1,3 +1,11 @@
+2006-10-30  Timothy Hatcher  <timothy@apple.com>
+
+        Reviewed by Stephanie.
+
+        Add a special case for the Internal makefiles, so it can find the OepnSource.
+
+        * Scripts/webkitdirs.pm:
+
 2006-10-30  Stephanie Lewis  <slewis@apple.com>
 
         Reviewed by Darin.
diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm
@@ -60,12 +60,14 @@ sub determineSourceDir
     
     # walks up path checking each directory to see if it is the main WebKit project dir, 
     # defined by containing JavaScriptCore, WebCore, and WebKit
-    until (-d "$sourceDir/JavaScriptCore" && -d "$sourceDir/WebCore" && -d "$sourceDir/WebKit")
+    until ((-d "$sourceDir/JavaScriptCore" && -d "$sourceDir/WebCore" && -d "$sourceDir/WebKit") || (-d "$sourceDir/Internal" && -d "$sourceDir/OpenSource"))
     {
         if ($sourceDir !~ s|/[^/]+$||) {
             die "Could not find top level webkit directory above source directory using FindBin.\n";
         }
     }
+
+    $sourceDir = "$sourceDir/OpenSource" if -d "$sourceDir/OpenSource";
 }
 
 # used for scripts which are stored in a non-standard location

Original file line number	Diff line number	Diff line change
`@@ -60,12 +60,14 @@ sub determineSourceDir`
`60`	`60`
`61`	`61`	`# walks up path checking each directory to see if it is the main WebKit project dir,`
`62`	`62`	`# defined by containing JavaScriptCore, WebCore, and WebKit`
`63`		`- until (-d "$sourceDir/JavaScriptCore" && -d "$sourceDir/WebCore" && -d "$sourceDir/WebKit")`
	`63`	`+ until ((-d "$sourceDir/JavaScriptCore" && -d "$sourceDir/WebCore" && -d "$sourceDir/WebKit") \|\| (-d "$sourceDir/Internal" && -d "$sourceDir/OpenSource"))`
`64`	`64`	`{`
`65`	`65`	`if ($sourceDir !~ s\|/[^/]+$\|\|) {`
`66`	`66`	`die "Could not find top level webkit directory above source directory using FindBin.\n";`
`67`	`67`	`}`
`68`	`68`	`}`
	`69`	`+`
	`70`	`+ $sourceDir = "$sourceDir/OpenSource" if -d "$sourceDir/OpenSource";`
`69`	`71`	`}`
`70`	`72`
`71`	`73`	`# used for scripts which are stored in a non-standard location`