Release 1.1.4

[apt.git] / prepare-release

diff --git a/prepare-release b/prepare-release
index 3c81a21cbdf5fa1246ea5d3cdf2dbfe5c05d1e04..89d5feae9b3c66d7e6da1015994bae442c3d9fd0 100755 (executable)
--- a/prepare-release
+++ b/prepare-release
@@ -11,17 +11,18 @@ 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/\.$//')"
 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="$(egrep '^MAJOR=' apt-inst/makefile |cut -d '=' -f 2)"
+LIBAPTINSTVERSION="$(grep '^MAJOR=' apt-inst/makefile |cut -d '=' -f 2)"

 
 librarysymbolsfromfile() {
        local MISSING="$(grep '^+#MISSING' "$1")"
 
 librarysymbolsfromfile() {
        local MISSING="$(grep '^+#MISSING' "$1")"

+       local SYMVER="$2"

        echo '=== Missing optional symbols:'
        echo -n "$MISSING" | grep '|optional=' || true
        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
        echo '=== Missing optional symbols:'
        echo -n "$MISSING" | grep '|optional=' || true
        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

-               echo " (c++)\"${line}@Base\" $VERSION"
+               echo " (c++)\"${line}@${SYMVER}\" $VERSION"

        done | sort -u
 }
 
        done | sort -u
 }
 


@@ -52,23 +53,60 @@ if [ "$1" = 'pre-export' ]; then
                VERSION="$VERSION~$(date +%Y%m%d)"
        fi
 
                VERSION="$VERSION~$(date +%Y%m%d)"
        fi
 

+       sed -i -e "s/^PACKAGE_VERSION=\".*\"$/PACKAGE_VERSION=\"${VERSION}\"/" configure.ac
+       sed -i -e "s/^<!ENTITY apt-product-version \".*\">$/<!ENTITY apt-product-version \"${VERSION}\">/" doc/apt-verbatim.ent
+
+       # update the last-modification field of manpages based on git changes
+       grep --files-with-matches '<date>' 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#^\([ ]\+\)<date>.*</date>\$#\1<date>$LASTMOD</date>#" "$file"
+       done
+

        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
        fi
        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
        fi

-
-       sed -i -e "s/^PACKAGE_VERSION=\".*\"$/PACKAGE_VERSION=\"${VERSION}\"/" configure.ac
-       sed -i -e "s/^<!ENTITY apt-product-version \".*\">$/<!ENTITY apt-product-version \"${VERSION}\">/" doc/apt-verbatim.ent
+elif [ "$1" = 'pre-build' ]; then
+       if [ "$DISTRIBUTION" = "UNRELEASED" ]; then
+               echo 'BUILDING AN UNRELEASED VERSION'
+       else
+               CONFVERSION="$(sed -ne "s/^PACKAGE_VERSION=\"\(.*\)\"$/\1/p" configure.ac)"
+               if [ "$VERSION" != "$CONFVERSION" ]; then
+                       echo "changelog (${VERSION}) and configure (${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
 elif [ "$1" = 'post-build' ]; then
        if [ "$DISTRIBUTION" != "UNRELEASED" ]; then

-               echo >&2 "REMEMBER: Tag this release with »git tag ${VERSION}« if you are satisfied"
+               echo >&2 "REMEMBER: Tag this release with »git tag -s ${VERSION}« if you are satisfied"

        else
                echo >&2 'REMEMBER: Change to a valid distribution before release'
        fi
 
        dpkg-checkbuilddeps -d 'libxml2-utils'
 
        else
                echo >&2 'REMEMBER: Change to a valid distribution before release'
        fi
 
        dpkg-checkbuilddeps -d 'libxml2-utils'
 

+       HEADERBLUEPRINT="$(mktemp)"
+       sed -n '1,/^$/p' doc/apt.8.xml > "$HEADERBLUEPRINT"
+       find doc -mindepth 1 -maxdepth 1 -type f -name '*.xml' | while read FILE; do
+               if ! sed -n '1,/^$/p' "$FILE" | cmp "$HEADERBLUEPRINT" - >/dev/null 2>&1; then
+                       echo >&2 "WARNING: Manpage $FILE has not the usual header! (see diff below)"
+                       sed -n '1,/^$/p' "$FILE" | diff -u "$HEADERBLUEPRINT" - || true
+               fi
+       done
+       sed -n '1,/^$/p' doc/guide.dbk > "$HEADERBLUEPRINT"
+       find doc -mindepth 1 -maxdepth 1 -type f -name '*.dbk' | while read FILE; do
+               if ! sed -n '1,/^$/p' "$FILE" | cmp "$HEADERBLUEPRINT" - >/dev/null 2>&1; then
+                       echo >&2 "WARNING: Documentation $FILE has not the usual header (see diff below)!"
+                       sed -n '1,/^$/p' "$FILE" | diff -u "$HEADERBLUEPRINT" - || true
+               fi
+       done
+       rm "$HEADERBLUEPRINT"
+

        # check the manpages with each vendor for vendor-specific errors…
        find vendor -mindepth 1 -maxdepth 1 -type d | cut -d'/' -f 2 | while read DISTRO; do
                ln -sf ../vendor/${DISTRO}/apt-vendor.ent doc
        # check the manpages with each vendor for vendor-specific errors…
        find vendor -mindepth 1 -maxdepth 1 -type d | cut -d'/' -f 2 | while read DISTRO; do
                ln -sf ../vendor/${DISTRO}/apt-vendor.ent doc


@@ -92,7 +130,7 @@ elif [ "$1" = 'library' ]; then
                echo "Checking $1 in version $2"
                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
                echo "Checking $1 in version $2"
                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

-               librarysymbolsfromfile "$tmpfile"
+               librarysymbolsfromfile "$tmpfile" "$(echo "${1}" | cut -c 4- | tr -d '-' | tr 'a-z' 'A-Z')_${2}"

                rm -f $tmpfile
        }
        librarysymbols 'libapt-pkg' "${LIBAPTPKGVERSION}"
                rm -f $tmpfile
        }
        librarysymbols 'libapt-pkg' "${LIBAPTPKGVERSION}"


@@ -100,21 +138,71 @@ elif [ "$1" = 'library' ]; then
        librarysymbols 'libapt-inst' "${LIBAPTINSTVERSION}"
 elif [ "$1" = 'buildlog' ]; then
        while [ -n "$2" ]; do
        librarysymbols 'libapt-inst' "${LIBAPTINSTVERSION}"
 elif [ "$1" = 'buildlog' ]; then
        while [ -n "$2" ]; do

-               librarysymbolsfromfile "$2"
+               librarysymbolsfromfile "$2" 'UNKNOWN'

                shift
        done
 elif [ "$1" = 'travis-ci' ]; then
                shift
        done
 elif [ "$1" = 'travis-ci' ]; then

-       apt-get install -q --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\)\?: ##' | 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}"
+       git clean -dfX # remove ignored build artefacts for a clean start
+       make CFLAGS+='--coverage' CXXFLAGS+='--coverage'
+       LCOVRC='--rc geninfo_checksum=1 --rc lcov_branch_coverage=1'
+       mkdir "$DIR"
+       lcov --no-external --directory . --capture --initial --output-file "${DIR}/apt.coverage.init" ${LCOVRC}
+       make test || true
+       ./test/integration/run-tests -q || true
+       lcov --no-external --directory . --capture --output-file "${DIR}/apt.coverage.run" ${LCOVRC}
+       lcov -a "${DIR}/apt.coverage.init" -a "${DIR}/apt.coverage.run"  -o "${DIR}/apt.coverage.total" ${LCOVRC}
+       cp "${DIR}/apt.coverage.total" "${DIR}/apt.coverage.fixed"
+       rewritefile() {
+               file="$1"
+               shift
+               name="$(basename "$file")"
+               while [ -n "$1" ]; do
+                       if [ -r "$1/$name" ]; then
+                               sed -i "s#$file#$1/$name#" "${DIR}/apt.coverage.fixed"
+                               break
+                       fi
+                       shift
+               done
+               if [ -z "$1" ]; then
+                       echo >&2 "Coverage data captured for unknown file $file"
+               fi
+       }
+       grep 'build/include/' "${DIR}/apt.coverage.fixed" | sed "s#^SF:$(pwd)/##" | while read file; do
+               rewritefile "$file" 'apt-pkg' 'apt-pkg/deb' 'apt-pkg/edsp' 'apt-pkg/contrib' \
+                  'apt-inst' 'apt-inst/deb' 'apt-inst/contrib' 'apt-private'
+       done
+       genhtml --output-directory "${DIR}" "${DIR}/apt.coverage.fixed" ${LCOVRC}

 else
        echo >&1 "Usage:\t$0 pre-export
 else
        echo >&1 "Usage:\t$0 pre-export

+\t$0 pre-build

 \t$0 post-build
 \t$0 post-build

+
+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 library

+\t$0 buildlog filename…
+
+»library« and »buildlog« aren't run automatically but can be useful for
+maintaining the (more or less experimental) symbols files we provide.
+»library« displays the diff between advertised symbols and the once provided
+by the libraries, while »buildlog« extracts this diff from the buildlogs.
+Both will format the diff properly.
+
+\t$0 travis-ci
+\t$0 coverage [output-dir]

 
 

-If you use »git buildpackage« you can leave this script alone as it 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.
+»travis-ci« is a shortcut to install all build- as well as test-dependencies
+used by .travis.yml.
+»coverage« does a clean build with the right flags for coverage reporting,
+runs all tests and generates a html report in the end.
+"

 
 

-»library« isn't run automatically but can be useful for maintaining the
-(more or less experimental) symbols files we provide"

 fi
 fi