Title: [128307] trunk
- Revision
- 128307
- Author
- commit-qu...@webkit.org
- Date
- 2012-09-12 07:26:31 -0700 (Wed, 12 Sep 2012)
Log Message
[Qt] Drastically shorten length of commandline needed for JS bindings generator
https://bugs.webkit.org/show_bug.cgi?id=96266
Patch by Simon Hausmann <simon.hausm...@nokia.com> on 2012-09-12
Reviewed by Tor Arne Vestbø.
The generate-bindings script supports the SOURCE_ROOT environment variable for IDL include file
lookups, which allows specifying relative include search directories.
* DerivedSources.pri:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (128306 => 128307)
--- trunk/Source/WebCore/ChangeLog 2012-09-12 14:14:54 UTC (rev 128306)
+++ trunk/Source/WebCore/ChangeLog 2012-09-12 14:26:31 UTC (rev 128307)
@@ -1,3 +1,15 @@
+2012-09-12 Simon Hausmann <simon.hausm...@nokia.com>
+
+ [Qt] Drastically shorten length of commandline needed for JS bindings generator
+ https://bugs.webkit.org/show_bug.cgi?id=96266
+
+ Reviewed by Tor Arne Vestbø.
+
+ The generate-bindings script supports the SOURCE_ROOT environment variable for IDL include file
+ lookups, which allows specifying relative include search directories.
+
+ * DerivedSources.pri:
+
2012-09-12 Patrick Gansterer <par...@webkit.org>
Remove last call to numberToString() from WebCore code
Modified: trunk/Source/WebCore/DerivedSources.pri (128306 => 128307)
--- trunk/Source/WebCore/DerivedSources.pri 2012-09-12 14:14:54 UTC (rev 128306)
+++ trunk/Source/WebCore/DerivedSources.pri 2012-09-12 14:26:31 UTC (rev 128307)
@@ -721,35 +721,35 @@
# GENERATOR 1: Generate .h and .cpp from IDLs
generateBindings.input = IDL_BINDINGS
generateBindings.script = $$PWD/bindings/scripts/generate-bindings.pl
-generateBindings.commands = perl -I$$PWD/bindings/scripts $$generateBindings.script \
+generateBindings.commands = $$setEnvironmentVariable(SOURCE_ROOT, $$toSystemPath($$PWD)) && perl -I$$PWD/bindings/scripts $$generateBindings.script \
--defines \"$$_javascript_FeatureDefines()\" \
--generator JS \
- --include $$PWD/Modules/filesystem \
- --include $$PWD/Modules/geolocation \
- --include $$PWD/Modules/indexeddb \
- --include $$PWD/Modules/mediasource \
- --include $$PWD/Modules/notifications \
- --include $$PWD/Modules/quota \
- --include $$PWD/Modules/webaudio \
- --include $$PWD/Modules/webdatabase \
- --include $$PWD/Modules/websockets \
- --include $$PWD/css \
- --include $$PWD/dom \
- --include $$PWD/editing \
- --include $$PWD/fileapi \
- --include $$PWD/html \
- --include $$PWD/html/canvas \
- --include $$PWD/html/shadow \
- --include $$PWD/html/track \
- --include $$PWD/inspector \
- --include $$PWD/loader/appcache \
- --include $$PWD/page \
- --include $$PWD/plugins \
- --include $$PWD/storage \
- --include $$PWD/svg \
- --include $$PWD/testing \
- --include $$PWD/workers \
- --include $$PWD/xml \
+ --include Modules/filesystem \
+ --include Modules/geolocation \
+ --include Modules/indexeddb \
+ --include Modules/mediasource \
+ --include Modules/notifications \
+ --include Modules/quota \
+ --include Modules/webaudio \
+ --include Modules/webdatabase \
+ --include Modules/websockets \
+ --include css \
+ --include dom \
+ --include editing \
+ --include fileapi \
+ --include html \
+ --include html/canvas \
+ --include html/shadow \
+ --include html/track \
+ --include inspector \
+ --include loader/appcache \
+ --include page \
+ --include plugins \
+ --include storage \
+ --include svg \
+ --include testing \
+ --include workers \
+ --include xml \
--outputDir ${QMAKE_FUNC_FILE_OUT_PATH} \
--supplementalDependencyFile ${QMAKE_FUNC_FILE_OUT_PATH}/$$SUPPLEMENTAL_DEPENDENCY_FILE \
--preprocessor \"$${QMAKE_MOC} -E\" ${QMAKE_FILE_NAME}
Modified: trunk/Tools/qmake/mkspecs/features/functions.prf (128306 => 128307)
--- trunk/Tools/qmake/mkspecs/features/functions.prf 2012-09-12 14:14:54 UTC (rev 128306)
+++ trunk/Tools/qmake/mkspecs/features/functions.prf 2012-09-12 14:26:31 UTC (rev 128307)
@@ -375,3 +375,12 @@
defines = LANGUAGE_JAVASCRIPT=1 $$configDefines(enable)
return($$defines)
}
+
+defineReplace(setEnvironmentVariable) {
+ variable = $$1
+ value = $$2
+ win32 {
+ return((set \"$$variable=$$value\"))
+ }
+ return(export \"$$variable=$$value\")
+}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
