From 4c19a340f0c16d2042bfc8829b88ba08a0a22699 Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: Tue, 15 Nov 2011 15:29:21 +0200
Subject: 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
---
 config.profiles/symbian/qtconfig.flm | 19 +++++++++++++++----
 1 file 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)"; \
-- 
cgit v0.12