From a213c1828f1e9a7c9c5594e70e1e91f90744bb59 Mon Sep 17 00:00:00 2001
From: Dominik Riebeling <Dominik.Riebeling@gmail.com>
Date: Mon, 18 May 2015 22:44:36 +0200
Subject: [PATCH] Extend project file message output and always run lrelease.

Check for lrelease and always try to run it if found. If not found show a
warning. This avoids build problems for certain setups which previously
required -config dbg to complete.

Change-Id: I60f0f49adc8455743afc5e4d23294ce0729f38d2
---
 rbutil/rbutilqt/rbutilqt.pro | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro
index 47cdae154e..d4cf5042bb 100644
--- a/rbutil/rbutilqt/rbutilqt.pro
+++ b/rbutil/rbutilqt/rbutilqt.pro
@@ -25,7 +25,7 @@ contains(QMAKE_CC,($$find(QMAKE_CC,.*gcc.*))) {
 unix:!mac:!noccache {
     CCACHE = $$system(which ccache)
     !isEmpty(CCACHE) {
-        message("using ccache")
+        message("using ccache at $$CCACHE")
         QMAKE_CXX = ccache $$QMAKE_CXX
         QMAKE_CC = ccache $$QMAKE_CC
     }
@@ -54,13 +54,13 @@ RCC_DIR = $$MYBUILDDIR/rcc
         message("Qt >= 4.5 required!")
         !isEmpty(QT_VERSION) error("Qt found:" $$[QT_VERSION])
     }
-message("Qt version used:" $$VER)
+message("using Qt version $$VER at $$[QT_INSTALL_PREFIX]")
 }
 
 RBBASE_DIR = $$_PRO_FILE_PWD_
 RBBASE_DIR = $$replace(RBBASE_DIR,/rbutil/rbutilqt,)
 
-message("Rockbox Base dir: "$$RBBASE_DIR)
+message("using Rockbox basedir $$RBBASE_DIR")
 
 # check for system speex. Add a custom rule for pre-building librbspeex if not
 # found. Newer versions of speex are split up into libspeex and libspeexdsp,
@@ -105,11 +105,16 @@ tags.depends = $(SOURCES)
 QMAKE_EXTRA_TARGETS += tags
 
 # add a custom rule for making the translations
-lrelease.commands = $$[QT_INSTALL_BINS]/lrelease -silent $$_PRO_FILE_
+LRELEASE = $$system(which $$[QT_INSTALL_BINS]/lrelease)
+lrelease.commands = $$LRELEASE -silent $$_PRO_FILE_
 QMAKE_EXTRA_TARGETS += lrelease
-!dbg {
+!isEmpty(LRELEASE) {
+    message("using lrelease at $$LRELEASE")
     PRE_TARGETDEPS += lrelease
 }
+isEmpty(LRELEASE) {
+    warning("could not find lrelease. Skipping translations.")
+}
 
 # Needed by QT on Win
 INCLUDEPATH += $$_PRO_FILE_PWD_ $$_PRO_FILE_PWD_/irivertools \
@@ -155,12 +160,12 @@ contains(QT_MAJOR_VERSION, 5) {
 dbg {
     CONFIG += debug thread qt warn_on
     DEFINES += DBG
-    message("debug")
+    message("creating debug version")
 }
 !dbg {
     CONFIG += release thread qt
     DEFINES += NODEBUG
-    message("release")
+    message("creating release version")
 }
 
 DEFINES += RBUTIL _LARGEFILE64_SOURCE