X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/ab5b1d0d31b2fbdc4896f8a107611ff056d6a668..ece81b7517b1af6f86aff733498f6c11d5aa814f:/prepare-release diff --git a/prepare-release b/prepare-release index 8605719b1..df1b0a2cf 100755 --- a/prepare-release +++ b/prepare-release @@ -11,7 +11,7 @@ VERSION=$(dpkg-parsechangelog | sed -n -e '/^Version:/s/^Version: //p') DISTRIBUTION=$(dpkg-parsechangelog | sed -n -e '/^Distribution:/s/^Distribution: //p') LIBAPTPKGVERSION="$(awk -v ORS='.' '/^\#define APT_PKG_M/ {print $3}' apt-pkg/contrib/macros.h | sed 's/\.$//')" -LIBAPTINSTVERSION="$(grep '^MAJOR=' apt-inst/makefile |cut -d '=' -f 2)" +LIBAPTINSTVERSION="$(sed -nr 's/set\(MAJOR ([^)]*)\)/\1/p' apt-inst/CMakeLists.txt)" librarysymbolsfromfile() { local MISSING="$(grep '^+#MISSING' "$1")" @@ -21,7 +21,7 @@ librarysymbolsfromfile() { echo '=== Missing required symbols:' echo -n "$MISSING" | grep -v '|optional=' || true echo '=== New symbols:' - grep '^+ ' "$1" | cut -d' ' -f 2 | cut -d'@' -f 1 | c++filt | while read line; do + grep '^+ ' "$1" | grep -v '^+ (c++' | cut -d' ' -f 2 | cut -d'@' -f 1 | c++filt | while read line; do echo " (c++)\"${line}@${SYMVER}\" $VERSION" done | sort -u } @@ -53,13 +53,14 @@ if [ "$1" = 'pre-export' ]; then VERSION="$VERSION~$(date +%Y%m%d)" fi - sed -i -e "s/^PACKAGE_VERSION=\".*\"$/PACKAGE_VERSION=\"${VERSION}\"/" configure.ac + sed -i -e "s/^set(PACKAGE_VERSION \".*\")$/set(PACKAGE_VERSION \"${VERSION}\")/" CMakeLists.txt sed -i -e "s/^$//" doc/apt-verbatim.ent # update the last-modification field of manpages based on git changes grep --files-with-matches '' doc/*.xml | while read file; do \ LASTMOD="$(date -d "@$(git log --format='%at' --max-count=1 --invert-grep --fixed-strings --grep 'review typo +release Git-Dch: Ignore' "$file")" '+%Y-%m-%dT00:00:00Z')" sed -i -e "s#^\([ ]\+\).*\$#\1$LASTMOD#" "$file" done @@ -67,7 +68,20 @@ Git-Dch: Ignore' "$file")" '+%Y-%m-%dT00:00:00Z')" if [ "$(date +%Y-%m-%d)" != "$(grep --max-count=1 '^"POT-Creation-Date: .*\n"$' po/apt-all.pot | cut -d' ' -f 2)" -o \ "$(date +%Y-%m-%d)" != "$(grep --max-count=1 '^"POT-Creation-Date: .*\n"$' doc/po/apt-doc.pot | cut -d' ' -f 2)" ]; then echo >&2 'POT files are not up-to-date. Execute »make update-po« for you…' - make update-po + [ -e build ] || mkdir build + ( cd build && cmake .. ) + cmake --build build --target update-po -- -j 4 + fi +elif [ "$1" = 'pre-build' ]; then + if [ "$DISTRIBUTION" = "UNRELEASED" ]; then + echo 'BUILDING AN UNRELEASED VERSION' + else + CONFVERSION="$(sed -ne "s/^set(PACKAGE_VERSION \"\(.*\)\")$/\1/p" CMakeLists.txt)" + if [ "$VERSION" != "$CONFVERSION" ]; then + echo "changelog (${VERSION}) and CMakeLists.txt (${CONFVERSION}) talk about different versions!" + echo "You probably want to run »./prepare-release pre-export« to fix this." + exit 1 + fi fi elif [ "$1" = 'post-build' ]; then if [ "$DISTRIBUTION" != "UNRELEASED" ]; then @@ -103,9 +117,11 @@ elif [ "$1" = 'post-build' ]; then fi done # lets assume we will always have a german manpage translation - if [ -e 'doc/de/' ]; then + if [ -e */doc/de/ -o -e doc/de ]; then # … but check the translations only with one vendor for translation-specific errors - if ! xmllint --nonet --valid --noout $(find doc/ -mindepth 2 -maxdepth 2 -name '*.xml'); then + if ! xmllint --path /vendor/$(./vendor/getinfo current)/ \ + --path doc/ \ + --nonet --valid --noout $(find doc/ */doc/ -mindepth 2 -maxdepth 2 -name '*.xml'); then echo >&2 "WARNING: translated docbook manpages have errors!" fi else @@ -115,9 +131,21 @@ elif [ "$1" = 'post-build' ]; then elif [ "$1" = 'library' ]; then librarysymbols() { - echo "Checking $1 in version $2" + local libname=$(echo "${1}" | cut -c 4-) + local buildlib="build/bin/${1}.so.${2}" + for dir in $libname */$libname; do + local new_buildlib="$dir/${1}.so.${2}" + if [ -r "${new_buildlib}" ] && [ ! -e "$buildlib" -o "$new_buildlib" -nt "$buildlib" ]; then + local buildlib="${new_buildlib}" + fi + done + if [ ! -r "$buildlib" ]; then + echo "ERROR: The library ${1} has to be built before symbols can be checked!" + return + fi + echo "Checking $1 in version $2 build at $(stat -L -c '%y' "$buildlib")" local tmpfile=$(mktemp) - dpkg-gensymbols -p${1}${2} -ebuild/bin/${1}.so.${2} -Idebian/${1}${2}.symbols -O/dev/null 2> /dev/null > $tmpfile || true + dpkg-gensymbols -p${1}${2} -e${buildlib} -Idebian/${1}${2}.symbols -O/dev/null 2> /dev/null > $tmpfile || true librarysymbolsfromfile "$tmpfile" "$(echo "${1}" | cut -c 4- | tr -d '-' | tr 'a-z' 'A-Z')_${2}" rm -f $tmpfile } @@ -130,7 +158,7 @@ elif [ "$1" = 'buildlog' ]; then shift done elif [ "$1" = 'travis-ci' ]; then - apt-get install -qy --no-install-recommends $(sed -n -e '/^Build-Depends: /,/^Build-Depends-Indep: / {p}' debian/control | sed -e 's#([^)]*)##g' -e 's#^Build-Depends\(-Indep\)\?: ##' | tr -d ',') + apt-get install -qy --no-install-recommends $(sed -n -e '/^Build-Depends: /,/^Build-Depends-Indep: / {p}' debian/control | sed -e 's#([^)]*)##g' -e 's#^Build-Depends\(-Indep\)\?: ##' -e 's#<.*>##g' | tr -d ',') apt-get install -qy --no-install-recommends $(sed -n 's#^Depends: .*@, \(.*\)$#\1#p' debian/tests/control | tr -d ',') elif [ "$1" = 'coverage' ]; then DIR="${2:-./coverage}" @@ -166,12 +194,14 @@ elif [ "$1" = 'coverage' ]; then genhtml --output-directory "${DIR}" "${DIR}/apt.coverage.fixed" ${LCOVRC} else echo >&1 "Usage:\t$0 pre-export +\t$0 pre-build \t$0 post-build -If you use »gbp buildpackage« you can leave these alone as they will -be run at the right places auto-magically. Otherwise you should use -»pre-export« to update po and pot files as well as version numbering. -»post-build« can be used to run some more or less useful checks later on. +Updating po-files and versions as well as some basic checks are done +by »pre-export« which needs to be run before package building. +If you use »gbp buildpackage« you will be notified if you forget. +»pre-build« and »post-build« can be used to run some more or less +useful checks automatically run by »gbp« otherwise. \t$0 library \t$0 buildlog filename…