Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1672)

Unified Diff: Source/core/scripts/make_names.pl

Issue 14456006: Fixes to make scripts generate includes with paths. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Updated Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/scripts/make_names.pl
diff --git a/Source/core/scripts/make_names.pl b/Source/core/scripts/make_names.pl
index 6bd66359d9bbd7666b6142452567441ed18ef12e..7c60192b15bbc4af5a8be58c0707ec9df4c7b925 100755
--- a/Source/core/scripts/make_names.pl
+++ b/Source/core/scripts/make_names.pl
@@ -39,6 +39,11 @@ use File::Spec;
use IO::File;
use InFilesParser;
+use FindBin; # locate this script
+use lib "$FindBin::Bin/../../../../../third_party/WebKit/Source/bindings/scripts"; # use the binding generator directory.
+#use lib "$FindBin::Bin/../bindings/scripts"; # use the binding generator directory.
+use idltopath;
+
sub readTags($$);
sub readAttrs($$);
@@ -612,7 +617,7 @@ sub printNamesHeaderFile
open F, ">$headerPath";
printLicenseHeader($F);
- printHeaderHead($F, "DOM", $parameters{namespace}, "#include \"QualifiedName.h\"");
+ printHeaderHead($F, "DOM", $parameters{namespace}, "#include \"core/dom/QualifiedName.h\"");
my $lowerNamespace = lc($parameters{namespacePrefix});
print F "// Namespace\n";
@@ -725,9 +730,10 @@ sub printJSElementIncludes
}
$tagsSeen{$JSInterfaceName} = 1;
- print F "#include \"V8${JSInterfaceName}.h\"\n";
+ # V8HTMLElementWrapperFactory.cpp that uses this code is generated into "webkit" and for instance V8HTMLAnchorElement.h is in "webkit/bindings"
+ print F "#include \"bindings/V8${JSInterfaceName}.h\"\n";
}
- print F "#include \"V8$parameters{fallbackInterfaceName}.h\"\n";
+ print F "#include \"bindings/V8$parameters{fallbackInterfaceName}.h\"\n";
}
sub printElementIncludes
@@ -744,7 +750,8 @@ sub printElementIncludes
}
$tagsSeen{$interfaceName} = 1;
- print F "#include \"${interfaceName}.h\"\n";
+ my $includepath = idl_to_path($interfaceName);
+ print F "#include \"$includepath${interfaceName}.h\"\n";
}
print F "#include \"$parameters{fallbackInterfaceName}.h\"\n";
}
@@ -838,10 +845,10 @@ printConditionalElementIncludes($F);
print F <<END
-#include "ContextFeatures.h"
-#include "Document.h"
-#include "RuntimeEnabledFeatures.h"
-#include "Settings.h"
+#include "core/dom/ContextFeatures.h"
+#include "core/dom/Document.h"
+#include "core/page/RuntimeEnabledFeatures.h"
+#include "core/page/Settings.h"
#if ENABLE(CUSTOM_ELEMENTS)
#include "CustomElementConstructor.h"
@@ -1107,15 +1114,15 @@ sub printWrapperFactoryCppFile
print F <<END
-#include "ContextFeatures.h"
-#include "Document.h"
-#include "RuntimeEnabledFeatures.h"
-#include "Settings.h"
+#include "core/dom/ContextFeatures.h"
+#include "core/dom/Document.h"
+#include "core/page/RuntimeEnabledFeatures.h"
+#include "core/page/Settings.h"
#include "V8$parameters{namespace}Element.h"
#if ENABLE(CUSTOM_ELEMENTS)
-#include "CustomElementHelpers.h"
+#include "bindings/v8/CustomElementHelpers.h"
#endif
#include <v8.h>
@@ -1249,8 +1256,8 @@ sub printWrapperFactoryHeaderFile
print F "#if $parameters{guardFactoryWith}\n" if $parameters{guardFactoryWith};
print F <<END
-#include <V8$parameters{namespace}Element.h>
-#include <V8$parameters{fallbackInterfaceName}.h>
+#include "bindings/V8$parameters{namespace}Element.h"
+#include "bindings/V8$parameters{fallbackInterfaceName}.h"
#include <v8.h>
namespace WebCore {
« Source/core/scripts/InFilesCompiler.pm ('K') | « Source/core/scripts/make_event_factory.pl ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698