diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-15 15:13:08 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-15 15:13:08 (GMT) |
| commit | c0048682ff11958dee49cb2f59e6f86d9e96ee80 (patch) | |
| tree | 46e88a883a91b72ce1d581362a34c92200ebbf63 | |
| parent | fb6bafcc06ad39280a5067085f7b8040b31835ed (diff) | |
| parent | 4c19a340f0c16d2042bfc8829b88ba08a0a22699 (diff) | |
| download | Qt-c0048682ff11958dee49cb2f59e6f86d9e96ee80.zip Qt-c0048682ff11958dee49cb2f59e6f86d9e96ee80.tar.gz Qt-c0048682ff11958dee49cb2f59e6f86d9e96ee80.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team:
Minor improvements to whatlog generation in Symbian tools2 builds.
| -rw-r--r-- | config.profiles/symbian/qtconfig.flm | 19 |
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)"; \ |