From 4eebab4010c5d61f58dacfae7d7bed752d4424d9 Mon Sep 17 00:00:00 2001 From: Slávek Banko Date: Fri, 28 Apr 2023 03:16:02 +0200 Subject: Allow to determine the target version from the default version in the tde-cmake module. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- create_all_tarballs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'create_all_tarballs') diff --git a/create_all_tarballs b/create_all_tarballs index 1ec8f12..1434f77 100755 --- a/create_all_tarballs +++ b/create_all_tarballs @@ -80,7 +80,9 @@ fi # Set target version if [ -z "$TARGET" ]; then - if [ -f main/core/tdelibs/tdecore/tdeversion.h ]; then + if [ -f main/dependencies/tde-cmake/modules/TDEVersion.cmake ]; then + tdeversionHeader=main/dependencies/tde-cmake/modules/TDEVersion.cmake + elif [ -f main/core/tdelibs/tdecore/tdeversion.h ]; then tdeversionHeader=main/core/tdelibs/tdecore/tdeversion.h elif [ -f main/core/tdelibs/kdecore/kdeversion.h ]; then tdeversionHeader=main/core/tdelibs/kdecore/kdeversion.h @@ -93,7 +95,7 @@ if [ -z "$TARGET" ]; then echo "Cannot find TDE core headers. Exiting." exit 1 fi - TARGET=`sed -n 's|#define [KT]DE_VERSION_STRING "[^0-9]\?\([^ "]*\).*|\1|p' $tdeversionHeader` + TARGET=`sed -n 's/^[ \t]*\(set( DEFAULT_VERSION\|#define [KT]DE_VERSION_STRING\) "[^0-9]\?\([^ ~"]*\).*/\2/p' $tdeversionHeader` fi export TARGET -- cgit v1.2.3