Title: [143326] trunk/Tools
- Revision
- 143326
- Author
- [email protected]
- Date
- 2013-02-19 06:43:09 -0800 (Tue, 19 Feb 2013)
Log Message
[Qt] Skip the build with a warning if certain tools cannot be found in the PATH
https://bugs.webkit.org/show_bug.cgi?id=110215
Reviewed by Tor Arne Vestbø.
Check that gperf, python, ruby, perl, bison and flex are in the PATH before
continuing the build. Otherwise skip with an error message explaining which
programs are missing from the build.
* qmake/mkspecs/features/configure.prf:
* qmake/mkspecs/features/functions.prf:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (143325 => 143326)
--- trunk/Tools/ChangeLog 2013-02-19 14:31:43 UTC (rev 143325)
+++ trunk/Tools/ChangeLog 2013-02-19 14:43:09 UTC (rev 143326)
@@ -1,3 +1,17 @@
+2013-02-19 Simon Hausmann <[email protected]>
+
+ [Qt] Skip the build with a warning if certain tools cannot be found in the PATH
+ https://bugs.webkit.org/show_bug.cgi?id=110215
+
+ Reviewed by Tor Arne Vestbø.
+
+ Check that gperf, python, ruby, perl, bison and flex are in the PATH before
+ continuing the build. Otherwise skip with an error message explaining which
+ programs are missing from the build.
+
+ * qmake/mkspecs/features/configure.prf:
+ * qmake/mkspecs/features/functions.prf:
+
2013-02-19 Sheriff Bot <[email protected]>
Unreviewed, rolling out r143319.
Modified: trunk/Tools/qmake/mkspecs/features/configure.prf (143325 => 143326)
--- trunk/Tools/qmake/mkspecs/features/configure.prf 2013-02-19 14:31:43 UTC (rev 143325)
+++ trunk/Tools/qmake/mkspecs/features/configure.prf 2013-02-19 14:43:09 UTC (rev 143326)
@@ -111,11 +111,15 @@
# Sanity checks that would prevent us from building the whole project altogether.
!mac:!contains(QT_CONFIG,icu) {
- skipBuildReason = "ICU is required. To build QtWebKit with Qt 5 you need to build Qt 5 with libICU support. Check for ICU support being mentioned in qtbase/config.summary.")
+ addReasonForSkippingBuild("ICU is required. To build QtWebKit with Qt 5 you need to build Qt 5 with libICU support. Check for ICU support being mentioned in qtbase/config.summary.")
}
production_build:blackberry {
- skipBuildReason = "Build not supported on BB10 yet."
+ addReasonForSkippingBuild("Build not supported on BB10 yet.")
}
+ requiredPrograms = gperf python perl bison ruby flex
+ for(program, requiredPrograms): \
+ !programExistsInPath($$program): \
+ addReasonForSkippingBuild("Missing $$program from PATH")
# Detect changes to the configuration. Changes need a clean build.
webkit_configured {
@@ -233,7 +237,7 @@
}
!isEmpty(skipBuildReason) {
- log("$${EOL}WebKit build disabled: " $$skipBuildReason "$${EOL}$${EOL}")
+ log("$${EOL}The WebKit build was disabled for the following reasons: $$skipBuildReason $${EOL}$${EOL}")
SUBDIRS=
export(SUBDIRS)
} else {
Modified: trunk/Tools/qmake/mkspecs/features/functions.prf (143325 => 143326)
--- trunk/Tools/qmake/mkspecs/features/functions.prf 2013-02-19 14:31:43 UTC (rev 143325)
+++ trunk/Tools/qmake/mkspecs/features/functions.prf 2013-02-19 14:43:09 UTC (rev 143326)
@@ -203,6 +203,25 @@
return(false)
}
+defineTest(programExistsInPath) {
+ win_cmd_shell: program = $${1}.exe
+ else: program = $$1
+
+ PATH = "$$(PATH)"
+ paths=$$split(PATH, $$QMAKE_DIRLIST_SEP)
+
+ GNUTOOLS_DIR=$$[QT_HOST_DATA]/../gnuwin32/bin
+ exists($$GNUTOOLS_DIR): paths += $$GNUTOOLS_DIR
+
+ for(p, paths): exists($$p/$$program):return(true)
+ return(false)
+}
+
+defineTest(addReasonForSkippingBuild) {
+ skipBuildReason = "$$skipBuildReason$${EOL} * $$1"
+ export(skipBuildReason)
+}
+
defineTest(prependEach) {
unset(variable)
unset(prefix)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
