diff options
| author | Matti Paaso <matti.paaso@digia.com> | 2014-04-17 13:54:00 +0300 |
|---|---|---|
| committer | Matti Paaso <matti.paaso@digia.com> | 2014-04-17 14:55:50 +0200 |
| commit | 13c0dd4e7c4cc4410e89f73cb589bc5005a8482f (patch) | |
| tree | d014a5824fdb8e4a17514298d50667895fa0f921 /packaging-tools/mksrc.sh | |
| parent | 87ebf68642078ad82fa833bf8d00f1abe65fe063 (diff) | |
MODULE_VERSION detection made more solid (hits every time).
Change-Id: I1dde88e6f82cc9d224a6bfa761c82afa1517de96
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
Reviewed-by: Antti Kokko <antti.kokko@digia.com>
Diffstat (limited to 'packaging-tools/mksrc.sh')
| -rwxr-xr-x | packaging-tools/mksrc.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/packaging-tools/mksrc.sh b/packaging-tools/mksrc.sh index d47894e54..5cf4ea50c 100755 --- a/packaging-tools/mksrc.sh +++ b/packaging-tools/mksrc.sh @@ -363,8 +363,8 @@ if [ $SKIPSYNCQT = no ]; then if [ $SINGLEMODULE = no ]; then while read submodule; do if [ $submodule != qtbase ]; then - RESULT=$(grep "MODULE_VERSION = " $PACKAGE_DIR/$submodule/.qmake.conf) - QTSYNCQTVER=$(echo $RESULT | cut -d ' ' -f3) + RESULT=$(grep "MODULE_VERSION" $PACKAGE_DIR/$submodule/.qmake.conf) + QTSYNCQTVER=$(echo $RESULT | sed s/^MODULLE_VERSION\s*\=\s*//) fi echo " - Running syncqt.pl for $submodule with -version $QTSYNCQTVER" if [ $submodule = qtwebkit ]; then @@ -375,8 +375,8 @@ 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 | cut -d ' ' -f3) + RESULT=$(grep "MODULE_VERSION" $PACKAGE_DIR/.qmake.conf) + QTSYNCQTVER=$(echo $RESULT | sed s/^MODULLE_VERSION\s*\=\s*//) echo " - Running syncqt.pl for $REPO_NAME with -version $QTSYNCQTVER" $CUR_DIR/../qtbase/bin/syncqt.pl -version $QTSYNCQTVER -outdir $PACKAGE_DIR $PACKAGE_DIR fi |