summaryrefslogtreecommitdiffstats
path: root/config.profiles/symbian
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2011-11-15 13:29:21 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2011-11-15 13:54:03 (GMT)
commit4c19a340f0c16d2042bfc8829b88ba08a0a22699 (patch)
tree46e88a883a91b72ce1d581362a34c92200ebbf63 /config.profiles/symbian
parentd33a6d7f2d18aa1e627bedd4bbba5eed350ef783 (diff)
downloadQt-4c19a340f0c16d2042bfc8829b88ba08a0a22699.zip
Qt-4c19a340f0c16d2042bfc8829b88ba08a0a22699.tar.gz
Qt-4c19a340f0c16d2042bfc8829b88ba08a0a22699.tar.bz2
Minor improvements to whatlog generation in Symbian tools2 builds.
- Generate temporary whatlog file under epoc32/build rather than the source directory. - Remove depenedency to qmake building from WHAT target to ensure nothing is built if "sbs -c tools2 --what" command is issued as that is supposed to just list what was built. Reviewed-by: Sami Merila
Diffstat (limited to 'config.profiles/symbian')
-rw-r--r--config.profiles/symbian/qtconfig.flm19
1 files changed, 15 insertions, 4 deletions
diff --git a/config.profiles/symbian/qtconfig.flm b/config.profiles/symbian/qtconfig.flm
index 7a31c66..2689d03 100644
--- a/config.profiles/symbian/qtconfig.flm
+++ b/config.profiles/symbian/qtconfig.flm
@@ -60,18 +60,29 @@ $(SOURCEDIR)/qmake$(DOTEXE): $(EXTENSION_ROOT)/$(QT_ROOT)/$(CONFIGURE_APP)
$(call endrule,qtconf)
$(call startrule,headerexport) \
cd $(EXTENSION_ROOT)/$(QT_ROOT)/config.profiles/symbian && \
- perl headerexport -base-dir $(EXTENSION_ROOT)/$(QT_ROOT) -outdir $(EPOCROOT)/epoc32/include/ -what $(SOURCEDIR)/qtconfig_what.log
+ perl headerexport -base-dir $(EXTENSION_ROOT)/$(QT_ROOT) -outdir $(EPOCROOT)/epoc32/include/ -what $(EPOCBLD)/qtconfig_what.log
$(call endrule,headerexport)
$(call startrule,mkspecexport) \
$(GNUCP) -R -L $(EXTENSION_ROOT)/$(QT_ROOT)/mkspecs $(MKSPECDIR)
$(GNUFIND) $(EXTENSION_ROOT)/$(QT_ROOT)/mkspecs -type f | \
- $(GNUSED) 's!$(EXTENSION_ROOT)/$(QT_ROOT)/!$(MKSPECDIR)/!' >> $(SOURCEDIR)/qtconfig_what.log \
+ $(GNUSED) 's!$(EXTENSION_ROOT)/$(QT_ROOT)/!$(MKSPECDIR)/!' >> $(EPOCBLD)/qtconfig_what.log \
$(call endrule,mkspecexport)
+ $(call startrawoutput) \
+ echo "$(call whatLogOpen)"; \
+ $(GNUCAT) $(EPOCBLD)/qtconfig_what.log | \
+ (read -r LINE; \
+ while [ $$$$? -eq 0 ]; do \
+ echo "$(call whatLogItem,,$$$$LINE)"; \
+ read -r LINE; \
+ done; \
+ ); \
+ echo "$(call whatLogClose)" \
+ $(call endrawoutput)
-FINAL WHAT:: $(SOURCEDIR)/qmake$(DOTEXE)
+WHAT::
$(call startrawoutput) \
echo "$(call whatLogOpen)"; \
- $(GNUCAT) $(SOURCEDIR)/qtconfig_what.log | \
+ $(GNUCAT) $(EPOCBLD)/qtconfig_what.log | \
(read -r LINE; \
while [ $$$$? -eq 0 ]; do \
echo "$(call whatLogItem,,$$$$LINE)"; \