summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xcreate_all_tarballs6
-rwxr-xr-xcreate_tarball6
2 files changed, 8 insertions, 4 deletions
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
diff --git a/create_tarball b/create_tarball
index b19dec6..6bc534e 100755
--- a/create_tarball
+++ b/create_tarball
@@ -57,7 +57,9 @@ MODULE=${SUBROOT#$TDEROOT/main/}
# Set target version
if [ -z "$TARGET" ]; then
- if [ -f $TDEROOT/main/core/tdelibs/tdecore/tdeversion.h ]; then
+ if [ -f $TDEROOT/main/dependencies/tde-cmake/modules/TDEVersion.cmake ]; then
+ tdeversionHeader=$TDEROOT/main/dependencies/tde-cmake/modules/TDEVersion.cmake
+ elif [ -f $TDEROOT/main/core/tdelibs/tdecore/tdeversion.h ]; then
tdeversionHeader=$TDEROOT/main/core/tdelibs/tdecore/tdeversion.h
elif [ -f $TDEROOT/main/core/tdelibs/kdecore/kdeversion.h ]; then
tdeversionHeader=$TDEROOT/main/core/tdelibs/kdecore/kdeversion.h
@@ -70,7 +72,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
# Check branch by target