Title: [128304] trunk/Tools
- Revision
- 128304
- Author
- ves...@webkit.org
- Date
- 2012-09-12 07:10:42 -0700 (Wed, 12 Sep 2012)
Log Message
[Qt] Teach addStrictSubdirOrderBetween to handle more than two targets
By hard-coding the names of the targets we defined we ended up just
redefining the previous target when using addStrictSubdirOrderBetween
more than once in a single project file.
We now embed the two base targets into the target names.
Reviewed by Simon Hausmann.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (128303 => 128304)
--- trunk/Tools/ChangeLog 2012-09-12 13:51:02 UTC (rev 128303)
+++ trunk/Tools/ChangeLog 2012-09-12 14:10:42 UTC (rev 128304)
@@ -1,3 +1,17 @@
+2012-09-12 Tor Arne Vestbø <tor.arne.ves...@nokia.com>
+
+ [Qt] Teach addStrictSubdirOrderBetween to handle more than two targets
+
+ By hard-coding the names of the targets we defined we ended up just
+ redefining the previous target when using addStrictSubdirOrderBetween
+ more than once in a single project file.
+
+ We now embed the two base targets into the target names.
+
+ Reviewed by Simon Hausmann.
+
+ * qmake/mkspecs/features/functions.prf:
+
2012-09-12 Philippe Liard <pli...@google.com>
Depend on {base,net} GYP targets rather than {base,net}_java.
Modified: trunk/Tools/qmake/mkspecs/features/functions.prf (128303 => 128304)
--- trunk/Tools/qmake/mkspecs/features/functions.prf 2012-09-12 13:51:02 UTC (rev 128303)
+++ trunk/Tools/qmake/mkspecs/features/functions.prf 2012-09-12 14:10:42 UTC (rev 128304)
@@ -142,18 +142,18 @@
# with the qmake-run of the -qmake_all target, and we end up with a race
# and potentially half-written makefiles. The custom target depends explicitly
# on -qmake_all, to ensure that we have a makefile, and then calls make.
- derived_make_for_qmake.target = $${first_base_target}-make_for_qmake
- derived_make_for_qmake.depends = $${first_base_target}-qmake_all
- derived_make_for_qmake.commands = $(MAKE) -f $$eval($${firstSubdir}.makefile)
- QMAKE_EXTRA_TARGETS += derived_make_for_qmake
+ derived_make_for_qmake = $${first_base_target}-make_for_qmake
+ eval($${derived_make_for_qmake}.depends = $${first_base_target}-qmake_all)
+ eval($${derived_make_for_qmake}.commands = $(MAKE) -f $$eval($${firstSubdir}.makefile))
+ QMAKE_EXTRA_TARGETS += $${derived_make_for_qmake}
# This target ensures that running "make qmake_all" will force both qmake and make
# to be run on the derived sources before running qmake on the target, so that
# qmake can pick up the right dependencies for the target based on the derived
# sources that were generated.
- target_make_qmake.target = $${second_base_target}-qmake_all
- target_make_qmake.depends = $${derived_make_for_qmake.target}
- QMAKE_EXTRA_TARGETS += target_make_qmake
+ target_make_qmake = $${second_base_target}-qmake_all
+ eval($${target_make_qmake}.depends = $${derived_make_for_qmake})
+ QMAKE_EXTRA_TARGETS += $${target_make_qmake}
# Make things work even if qmake -r is used.
CONFIG += dont_recurse
@@ -161,13 +161,10 @@
export(SUBDIRS)
export(NO_RECURSIVE_QMAKE_SUBDIRS)
export(CONFIG)
- export(target_make_qmake.target)
- export(target_make_qmake.depends)
- export(derived_make_for_qmake.target)
- export(derived_make_for_qmake.depends)
- export(derived_make_for_qmake.commands)
- export(target_make.target)
- export(target_make.depends)
+ export($${target_make_qmake}.target)
+ export($${target_make_qmake}.depends)
+ export($${derived_make_for_qmake}.depends)
+ export($${derived_make_for_qmake}.commands)
export(QMAKE_EXTRA_TARGETS)
return(true)
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
