Commit 2d4f54de authored by hausmann's avatar hausmann
Browse files

When constructing the absolute path when searching for IDL files in the list...

When constructing the absolute path when searching for IDL files in the list of search paths don't prepend a slash if $SOURCEROOT as environment variable is not set. In the Qt build we pass absolute search paths already and we don't set SOURCEROOT. Under Unix that gives a double slash for the directory which works fine, under Windows we get /c:\webkit\foo which of course does not work.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@24681 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent b6ecde4e
2007-07-27 Simon Hausmann <hausmann@kde.org>
Done with and reviewed by Lars and Zack.
When constructing the absolute path when searching for IDL files in the list of search paths don't prepend a slash if $SOURCEROOT as environment variable is not set. In the Qt build we pass absolute search paths already and we don't set SOURCEROOT. Under Unix that gives a double slash for the directory which works fine, under Windows we get /c:\webkit\foo which of course does not work.
* bindings/scripts/CodeGenerator.pm:
2007-07-27 Simon Hausmann <hausmann@kde.org>
 
Done with and reviewed by Lars and Zack.
......@@ -236,8 +236,12 @@ sub ScanDirectory
return if ($endCondition eq 1) and ($reportAllFiles eq 0);
my $sourceRoot = $ENV{SOURCE_ROOT} || "";
$thisDir = "$sourceRoot/$directory";
my $sourceRoot = $ENV{SOURCE_ROOT};
if ($sourceRoot) {
$thisDir = "$sourceRoot/$directory";
} else {
$thisDir = "$directory";
}
opendir(DIR, $thisDir) or die "[ERROR] Can't open directory $thisDir: \"$!\"\n";
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment