Changeset 101089 in webkit

Timestamp:

Nov 23, 2011, 10:19:18 AM (13 years ago)

Author:

vestbo@webkit.org

Message:

[Qt] Re-generate QtWebKit API forwarding headers when API changes

The forwarding headers are generated by syncqt, and syncqt is run by qmake,
so we need sync.profile to live in the same directory as the project file
that will be touched when adding/removing API (api.pri in our case).

Since the WebKit2 APIs live in a separate static library, we have to
add the project file for WebKit2 as a dependency of the api.pri file
as well, so that any changes to the WebKit2 API will still trigger a
run of qmake (and then syncqt).

Lastly, we use the new QMAKE_SYNCQT_OUTDIR variable in Qt 5 to ensure
that the forwarding headers are still generated in the root build dir,
not in the Source dir along with the internal forwarding headers.

Reviewed by Andreas Kling.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/QtWebKit.pro (modified) (1 diff)
• Source/api.pri (modified) (2 diffs)
• Source/sync.profile (moved) (moved from trunk/sync.profile ) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/qmake/mkspecs/features/default_pre.prf (modified) (2 diffs)
• Tools/qmake/mkspecs/features/functions.prf (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2011-11-23  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
+
+        [Qt] Re-generate QtWebKit API forwarding headers when API changes
+
+        The forwarding headers are generated by syncqt, and syncqt is run by qmake,
+        so we need sync.profile to live in the same directory as the project file
+        that will be touched when adding/removing API (api.pri in our case).
+
+        Since the WebKit2 APIs live in a separate static library, we have to
+        add the project file for WebKit2 as a dependency of the api.pri file
+        as well, so that any changes to the WebKit2 API will still trigger a
+        run of qmake (and then syncqt).
+
+        Lastly, we use the new QMAKE_SYNCQT_OUTDIR variable in Qt 5 to ensure
+        that the forwarding headers are still generated in the root build dir,
+        not in the Source dir along with the internal forwarding headers.
+
+        Reviewed by Andreas Kling.
+
+        * Source/QtWebKit.pro:
+        * Source/api.pri:
+        * Source/sync.profile: Renamed from sync.profile.
+
 2011-11-23  Halton Huo  <halton.huo@intel.com>
 

trunk/Source/QtWebKit.pro

@@ -30 +30 @@
 SUBDIRS += examples
 
-haveQt(4):!build_pass {
-    # Use our own copy of syncqt from Qt 4.8 to generate forwarding headers
-    syncqt = $$toSystemPath($${ROOT_WEBKIT_DIR}/Tools/qmake/syncqt-4.8)
-    command = $$syncqt
-    win32-msvc*: command = $$command -windows
-
-    outdir = $$toSystemPath($${ROOT_BUILD_DIR})
-
-    # The module root has to be the same as directory of the pro-file that generates
-    # the install rules (api.pri), otherwise the relative paths in the generated
-    # headers.pri will be incorrect.
-    module_rootdir = $$toSystemPath($${_PRO_FILE_PWD_})
-
-    module = $${TARGET}$${DIRLIST_SEPARATOR}$${module_rootdir}$${DIRLIST_SEPARATOR}$$toSystemPath(WebKit/qt/Api)
-    fwheader_generator.commands = perl $${command} -outdir $${outdir} -separate-module $${module}
-    fwheader_generator.depends = $${syncqt}
-
-    variables = $$computeSubdirVariables(api)
-
-    api_qmake.target = $$eval($${variables}.target)-qmake_all
-    api_qmake.depends = fwheader_generator
-
-    api_makefile.target = $$eval($${variables}.makefile)
-    api_makefile.depends = fwheader_generator
-
-    QMAKE_EXTRA_TARGETS += fwheader_generator api_qmake api_makefile
-}

trunk/Source/api.pri

@@ -10 +10 @@
 DESTDIR = $${ROOT_BUILD_DIR}/lib
 
+runSyncQt() # Generate forwarding headers for the QtWebKit API
+
 load(features)
 
@@ -21 +23 @@
     CONFIG += webkit2
     QT += declarative
+
+    # Ensure that changes to the WebKit2 API will trigger a qmake of this
+    # file, which in turn runs syncqt to update the forwarding headers.
+    QMAKE_INTERNAL_INCLUDED_FILES *= WebKit2/Target.pri
 }
 

trunk/Source/sync.profile

@@ -1 +1 @@
 %modules = ( # path to module name map
-    # Has to be the same directory as the pro file that generates install rules,
-    # otherwise the relative paths in headers.pri will not be correct.
-    "QtWebKit" => "$basedir/Source"
+    "QtWebKit" => "$basedir"
 );
 %moduleheaders = ( # restrict the module headers to those found in relative path
@@ -16 +14 @@
 );
 %modulepris = (
-    "QtWebKit" => "$basedir/Tools/qmake/mkspecs/modules/qt_webkit.pri",
+    "QtWebKit" => "$basedir/../Tools/qmake/mkspecs/modules/qt_webkit.pri",
 );
 @ignore_for_master_contents = ( "qwebscriptworld.h" );

trunk/Tools/ChangeLog

@@ +1 @@
+2011-11-23  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
+
+        [Qt] Re-generate QtWebKit API forwarding headers when API changes
+
+        The forwarding headers are generated by syncqt, and syncqt is run by qmake,
+        so we need sync.profile to live in the same directory as the project file
+        that will be touched when adding/removing API (api.pri in our case).
+
+        Since the WebKit2 APIs live in a separate static library, we have to
+        add the project file for WebKit2 as a dependency of the api.pri file
+        as well, so that any changes to the WebKit2 API will still trigger a
+        run of qmake (and then syncqt).
+
+        Lastly, we use the new QMAKE_SYNCQT_OUTDIR variable in Qt 5 to ensure
+        that the forwarding headers are still generated in the root build dir,
+        not in the Source dir along with the internal forwarding headers.
+
+        Reviewed by Andreas Kling.
+
+        * qmake/mkspecs/features/default_pre.prf:
+        * qmake/mkspecs/features/functions.prf:
+
 2011-11-23  Johnny Ding  <jnd@chromium.org>
 

trunk/Tools/qmake/mkspecs/features/default_pre.prf

@@ -6 +6 @@
 # -------------------------------------------------------------------
 
-load(default_pre) # Load Qt's defaults
 load(functions)
 
@@ -45 +44 @@
 
 BUILD_SUBDIR = $$join(BUILD_SUBDIR, $${QMAKE_DIR_SEP})
+
+# We want the QtWebKit API forwarding includes to live in the root build dir,
+# except when we are running the config.tests in Tools/qmake.
+pro_file_name = $$basename(_PRO_FILE_)
+!equals(pro_file_name, configure.pro): QMAKE_SYNCQT_OUTDIR = $$ROOT_BUILD_DIR
+
+load(default_pre) # Load Qt's defaults after we've resolved the build directory
 
 equals(OUT_PWD, $${ROOT_BUILD_DIR}) {

trunk/Tools/qmake/mkspecs/features/functions.prf

@@ -281 +281 @@
     return(true)
 }
+
+defineTest(runSyncQt) {
+
+    build_pass:return(true)
+
+    haveQt(5) {
+        # Qt 5 will run synqt as part of defaults_pre, so no need to do anything
+    } else {
+        # Use our own copy of syncqt from Qt 4.8 to generate forwarding headers
+        syncqt = $$toSystemPath($${ROOT_WEBKIT_DIR}/Tools/qmake/syncqt-4.8)
+        command = $$syncqt
+        win32-msvc*: command = $$command -windows
+
+        outdir = $$toSystemPath($${ROOT_BUILD_DIR})
+
+        # The module root has to be the same as directory of the pro-file that generates
+        # the install rules (api.pri), otherwise the relative paths in the generated
+        # headers.pri will be incorrect.
+        module_rootdir = $$toSystemPath($${_PRO_FILE_PWD_})
+
+        module = $${TARGET}$${DIRLIST_SEPARATOR}$${module_rootdir}$${DIRLIST_SEPARATOR}$$toSystemPath(WebKit/qt/Api)
+        command = perl $${command} -outdir $${outdir} -separate-module $${module}
+        message(Running $$command)
+        !system($$command) {
+            error(Failed to run $${command})
+        }
+    }
+
+    return(true)
+}