diff options
Diffstat (limited to 'devel/qt5/files/create_kde-qt_release.sh')
| -rw-r--r-- | devel/qt5/files/create_kde-qt_release.sh | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/devel/qt5/files/create_kde-qt_release.sh b/devel/qt5/files/create_kde-qt_release.sh index d46e4bd088d8..a255ea5e79f7 100644 --- a/devel/qt5/files/create_kde-qt_release.sh +++ b/devel/qt5/files/create_kde-qt_release.sh @@ -10,15 +10,13 @@ BASE_DIRECTORY="$2" # Version of Qt we want VERSION="$3" ORIGIN_TAG="$4" +BRANCH="$5" # Remote KDE git repository REPO="https://invent.kde.org/qt/qt/${PROJECT}.git" # Local checkout CHECKOUT="${BASE_DIRECTORY}/${PROJECT}" -# KDE-Qt branch -BRANCH=kde/5.15 - # Make sure we can use ${BASE_DIRECTORY} if [ ! -d "${BASE_DIRECTORY}" ] || [ ! -w "${BASE_DIRECTORY}" ] ; then echo "Directory '${BASE_DIRECTORY}' does not exist" @@ -27,11 +25,14 @@ fi # Init a new git checkout if it is missing if [ ! -d "${CHECKOUT}" ] ; then - git -C "${BASE_DIRECTORY}" clone "${REPO}" + git -C "${BASE_DIRECTORY}" clone --recurse-submodules --no-remote-submodules "${REPO}" fi # Update the checkout of the required branch -git -C "${CHECKOUT}" checkout "${BRANCH}" && git -C "${CHECKOUT}" pull --ff-only --rebase --autostash +git -C "${CHECKOUT}" checkout "${BRANCH}" && \ +git -C "${CHECKOUT}" pull --ff-only --rebase --autostash && \ +git -C "${CHECKOUT}" submodule update + if [ $? -ne 0 ] ; then echo "Failed to update ${CHECKOUT}" exit 1 @@ -40,16 +41,20 @@ fi # Count number of patches added by KDE PATCH_COUNT=$(git -C ${CHECKOUT} rev-list --count ${ORIGIN_TAG}..origin/${BRANCH}) -# Setup information for the distfile +# Set up information for the distfile DISTNAME="kde-${PROJECT}-${VERSION}p${PATCH_COUNT}" -DISTFILE="${BASE_DIRECTORY}/${DISTNAME}.tar.xz" +DISTFILE_TAR="${BASE_DIRECTORY}/${DISTNAME}.tar" +DISTFILE="${DISTFILE_TAR}.xz" # Tar and compress distfile -git -C ${CHECKOUT} archive --format=tar --prefix="${DISTNAME}/" HEAD | xz > "${DISTFILE}" +git -C ${CHECKOUT} archive --format=tar --prefix="${DISTNAME}/" HEAD --output ${DISTFILE_TAR} && \ +git -C ${CHECKOUT} submodule foreach --recursive "git archive --prefix="${DISTNAME}"/\$path/ --output=${BASE_DIRECTORY}/\$sha1.tar HEAD && tar -r --file=${DISTFILE_TAR} @${BASE_DIRECTORY}/\$sha1.tar && rm ${BASE_DIRECTORY}/\$sha1.tar" && \ +xz ${DISTFILE_TAR} + if [ $? -ne 0 ] ; then echo "Failed to create tarball ${DISTFILE}" exit 1 fi -# Printout information required in qt-dist.mk +# Print out information required in qt-dist.mk echo -e "Distfile:\t${DISTFILE}\n_KDE_${DIST}=\t${PATCH_COUNT}" |