Changeset 128054 in webkit

Timestamp:

Sep 10, 2012 6:30:04 AM (12 years ago)

Author:

commit-queue@webkit.org

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.hausmann@nokia.com> on 2012-09-10
Reviewed by Kenneth Rohde Christiansen.

The generate-bindings script supports the SOURCE_ROOT environment variable for IDL include file
lookups, which allows specifying relative include search directories.

• DerivedSources.pri:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• DerivedSources.pri (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-09-10  Simon Hausmann  <simon.hausmann@nokia.com>
+
+        [Qt] Drastically shorten length of commandline needed for JS bindings generator
+        https://bugs.webkit.org/show_bug.cgi?id=96266
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        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-10  Kevin Funk  <kevin.funk@kdab.com>
 

trunk/Source/WebCore/DerivedSources.pri

@@ -720 +720 @@
 GENERATORS += preprocessIdls
 
+win32 {
+    env_export = set
+} else {
+    env_export = export
+}
+
 # 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 = $$env_export \"SOURCE_ROOT=$$toSystemPath($$PWD)\" && perl -I$$PWD/bindings/scripts $$generateBindings.script \
                             --defines \"$${FEATURE_DEFINES_JAVASCRIPT}\" \
                             --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 \