Title: [110199] trunk
- Revision
- 110199
- Author
- [email protected]
- Date
- 2012-03-08 13:49:16 -0800 (Thu, 08 Mar 2012)
Log Message
[Qt] Prospective Windows build fix
Don't assume that windows-builds will always run inside a cmd.exe shell.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (110198 => 110199)
--- trunk/Source/WebCore/ChangeLog 2012-03-08 21:40:32 UTC (rev 110198)
+++ trunk/Source/WebCore/ChangeLog 2012-03-08 21:49:16 UTC (rev 110199)
@@ -1,3 +1,11 @@
+2012-03-08 Tor Arne Vestbø <[email protected]>
+
+ [Qt] Prospective Windows build fix
+
+ Don't assume that windows-builds will always run inside a cmd.exe shell.
+
+ * DerivedSources.pri:
+
2012-03-08 Vivek Galatage <[email protected]>
Web Inspector: Creating a selector for class names with trailing spaces results with two dots instead of one
Modified: trunk/Source/WebCore/DerivedSources.pri (110198 => 110199)
--- trunk/Source/WebCore/DerivedSources.pri 2012-03-08 21:40:32 UTC (rev 110198)
+++ trunk/Source/WebCore/DerivedSources.pri 2012-03-08 21:49:16 UTC (rev 110199)
@@ -672,8 +672,8 @@
preprocessIdls.script = $$PREPROCESS_IDLS_SCRIPT
# FIXME : We need to use only perl at some point.
EOC = $$escape_expand(\\n\\t)
-unix: preprocessIdls.commands = echo -n > $$IDL_FILES_TMP $$EOC
-else: preprocessIdls.commands = type nul > $$IDL_FILES_TMP $$EOC
+win_cmd_shell: preprocessIdls.commands = type nul > $$IDL_FILES_TMP $$EOC
+else: preprocessIdls.commands = echo -n > $$IDL_FILES_TMP $$EOC
for(binding, IDL_BINDINGS) {
preprocessIdls.commands += echo $$binding >> $$IDL_FILES_TMP $$EOC
}
Modified: trunk/Tools/ChangeLog (110198 => 110199)
--- trunk/Tools/ChangeLog 2012-03-08 21:40:32 UTC (rev 110198)
+++ trunk/Tools/ChangeLog 2012-03-08 21:49:16 UTC (rev 110199)
@@ -1,3 +1,11 @@
+2012-03-08 Tor Arne Vestbø <[email protected]>
+
+ [Qt] Prospective Windows build fix
+
+ Don't assume that windows-builds will always run inside a cmd.exe shell.
+
+ * qmake/mkspecs/features/default_pre.prf:
+
2012-03-08 Dan Bernstein <[email protected]>
<rdar://problem/10981173> Dashboard regions should not be in device space
Modified: trunk/Tools/qmake/mkspecs/features/default_pre.prf (110198 => 110199)
--- trunk/Tools/qmake/mkspecs/features/default_pre.prf 2012-03-08 21:40:32 UTC (rev 110198)
+++ trunk/Tools/qmake/mkspecs/features/default_pre.prf 2012-03-08 21:49:16 UTC (rev 110199)
@@ -53,31 +53,25 @@
BUILD_ROOT_RELATIVE_TO_OUT_PWD = $$join(BUILD_ROOT_RELATIVE_TO_OUT_PWD, $${QMAKE_DIR_SEP})
}
-# Make sure QMAKEPATH is set for recursive targets
+# Try to detect if we're running under Windows cmd.exe or not
win32* {
pwd = $$(PWD) # Normally empty for cmd.exe
- is_building_under_cygwin = $$find(pwd, ^/)
- !isEmpty(is_building_under_cygwin) {
- QMAKE_QMAKE = QMAKEPATH=$$(QMAKEPATH) $$QMAKE_QMAKE
- } else {
- QMAKE_QMAKE = \(set QMAKEPATH=$$(QMAKEPATH)\) && $$QMAKE_QMAKE
- }
-} else {
- QMAKE_QMAKE = QMAKEPATH=$$(QMAKEPATH) $$QMAKE_QMAKE
+ pwd_starts_with_slash = $$find(pwd, ^/)
+ isEmpty(pwd_starts_with_slash): CONFIG += win_cmd_shell
}
+# Make sure QMAKEPATH is set for recursive targets
+win_cmd_shell: QMAKE_QMAKE = \(set QMAKEPATH=$$(QMAKEPATH)\) && $$QMAKE_QMAKE
+else: QMAKE_QMAKE = QMAKEPATH=$$(QMAKEPATH) $$QMAKE_QMAKE
+
# Default location of generated sources
GENERATED_SOURCES_DESTDIR = generated
QUOTE = ""
DOUBLE_ESCAPED_QUOTE = ""
ESCAPE = ""
-win32-msvc* {
+win_cmd_shell {
ESCAPE = "^"
-} else:win32-g++*:isEmpty(QMAKE_SH) {
- # MinGW's make will run makefile commands using sh, even if make
- # was run from the Windows shell, if it finds sh in the path.
- ESCAPE = "^"
} else {
QUOTE = "\'"
DOUBLE_ESCAPED_QUOTE = "\\\'"
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
