diff options
| author | Antti Kokko <antti.kokko@digia.com> | 2014-05-02 10:25:20 +0300 |
|---|---|---|
| committer | Antti Kokko <antti.kokko@digia.com> | 2014-05-02 10:08:19 +0200 |
| commit | d118731a7cc5dd948fa3173390512a76936472cf (patch) | |
| tree | d440eacd1ae0d48f96d3ccc1bfae063762ce0cd0 /packaging-tools/mksrc.sh | |
| parent | 0704d562c2888bbafd9b42b3c056e927ae12a680 (diff) | |
Check if .qmake.conf exists when finding out the module version
Change-Id: I75f308ec3f477eaf745b2714b4be2bc13d6e8f0b
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
Reviewed-by: Matti Paaso <matti.paaso@digia.com>
Diffstat (limited to 'packaging-tools/mksrc.sh')
| -rwxr-xr-x | packaging-tools/mksrc.sh | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/packaging-tools/mksrc.sh b/packaging-tools/mksrc.sh index c103b0ce0..d9d0e157e 100755 --- a/packaging-tools/mksrc.sh +++ b/packaging-tools/mksrc.sh @@ -375,9 +375,13 @@ if [ $SKIPSYNCQT = no ]; then $PACKAGE_DIR/qtbase/bin/syncqt.pl -version $QTSYNCQTVER -outdir $PACKAGE_DIR/$submodule $SYNC_PROFILE_DIR done < $MODULES else - RESULT=$(grep "MODULE_VERSION" $PACKAGE_DIR/.qmake.conf) - QTSYNCQTVER=$(echo $RESULT | sed 's/.[^=]*=\(.[^ \t]*\)[ \t]*/\1/') - if [ -f $PACKAGE_DIR/"sync.profile" ]; then + if [ -f $PACKAGE_DIR/".qmake.conf" ]; then + RESULT=$(grep "MODULE_VERSION" $PACKAGE_DIR/.qmake.conf) + QTSYNCQTVER=$(echo $RESULT | sed 's/.[^=]*=\(.[^ \t]*\)[ \t]*/\1/') + else + echo "*** WARNING .qmake.conf not found *** - not running syncqt.pl ***" + fi + if [ -f $PACKAGE_DIR/"sync.profile" && $QTSYNCQTVER ]; then echo " - Running syncqt.pl for $REPO_NAME with -version $QTSYNCQTVER" $CUR_DIR/../qtbase/bin/syncqt.pl -version $QTSYNCQTVER -outdir $PACKAGE_DIR $PACKAGE_DIR else |