packaging: move packagelib.sh into contrib/packaging/

This required some minor path adjustments in scripts referencing
this path.

Differential Revision: https://phab.mercurial-scm.org/D3543

contrib/builddeb

@@ -1,104 +1,104
 #!/bin/sh -e
 #
 # Build a Mercurial debian package from the current repo
 #
 # Tested on Jessie (stable as of original script authoring.)
 
-. $(dirname $0)/packagelib.sh
+. $(dirname $0)/packaging/packagelib.sh
 
 BUILD=1
 CLEANUP=1
 DISTID=`(lsb_release -is 2> /dev/null | tr '[:upper:]' '[:lower:]') || echo debian`
 CODENAME=`lsb_release -cs 2> /dev/null || echo unknown`
 DEBFLAGS=-b
 while [ "$1" ]; do
     case "$1" in
     --distid )
         shift
         DISTID="$1"
         shift
         ;;
     --codename )
         shift
         CODENAME="$1"
         shift
         ;;
     --cleanup )
         shift
         BUILD=
         ;;
     --build )
         shift
         CLEANUP=
         ;;
     --source-only )
         shift
         DEBFLAGS=-S
         ;;
     * )
         echo "Invalid parameter $1!" 1>&2
         exit 1
         ;;
     esac
 done
 
 trap "if [ '$CLEANUP' ] ; then rm -r '$PWD/debian' ; fi" EXIT
 
 set -u
 
 if [ ! -d .hg ]; then
     echo 'You are not inside a Mercurial repository!' 1>&2
     exit 1
 fi
 
 gethgversion
 debver="$version"
 if [ -n "$type" ] ; then
     debver="$debver~$type"
 fi
 if [ -n "$distance" ] ; then
     debver="$debver+$distance-$CODENAME-$node"
 elif [ "$DEBFLAGS" = "-S" ] ; then
     # for building a ppa (--source-only) for a release (distance == 0), we need
     # to version the distroseries so that we can upload to launchpad
     debver="$debver~${CODENAME}1"
 fi
 
 control=debian/control
 changelog=debian/changelog
 
 if [ "$BUILD" ]; then
     if [ -d debian ] ; then
         echo "Error! debian control directory already exists!"
         exit 1
     fi
 
     cp -r "$PWD"/contrib/debian debian
 
     sed -i.tmp "s/__VERSION__/$debver/" $changelog
     sed -i.tmp "s/__DATE__/$(date --rfc-2822)/" $changelog
     sed -i.tmp "s/__CODENAME__/$CODENAME/" $changelog
     rm $changelog.tmp
 
     # remove the node from the version string
     SRCFILE="mercurial_$(echo $debver | sed "s,-$node,,").orig.tar.gz"
     "$PWD/hg" archive $SRCFILE
     mv $SRCFILE ..
     debuild -us -uc -i -I $DEBFLAGS
     if [ $? != 0 ]; then
         echo 'debuild failed!'
         exit 1
     fi
 
 fi
 if [ "$CLEANUP" ] ; then
     echo
     OUTPUTDIR=${OUTPUTDIR:=packages/$DISTID-$CODENAME}
     mkdir -p "$OUTPUTDIR"
     find ../mercurial*.deb ../mercurial_*.build ../mercurial_*.changes \
           ../mercurial*.dsc ../mercurial*.gz \
           -type f -newer $control -print0 2>/dev/null | \
       xargs -Inarf -0 mv narf "$OUTPUTDIR"
     echo "Built packages for $debver:"
     find "$OUTPUTDIR" -type f -newer $control -name '*.deb'
 fi

contrib/buildrpm

@@ -1,162 +1,162
 #!/bin/bash -e
 #
 # Build a Mercurial RPM from the current repo
 #
 # Tested on
 # - Fedora 20
 # - CentOS 5
 # - centOS 6
 
-. $(dirname $0)/packagelib.sh
+. $(dirname $0)/packaging/packagelib.sh
 
 BUILD=1
 RPMBUILDDIR="$PWD/rpmbuild"
 
 while [ "$1" ]; do
     case "$1" in
     --prepare )
         shift
         BUILD=
         ;;
     --withpython | --with-python)
         shift
         PYTHONVER=2.7.14
         PYTHONMD5=cee2e4b33ad3750da77b2e85f2f8b724
         ;;
     --rpmbuilddir )
         shift
         RPMBUILDDIR="$1"
         shift
         ;;
     * )
         echo "Invalid parameter $1!" 1>&2
         exit 1
         ;;
     esac
 done
 
 cd "`dirname $0`/.."
 
 specfile=$PWD/contrib/mercurial.spec
 if [ ! -f $specfile ]; then
     echo "Cannot find $specfile!" 1>&2
     exit 1
 fi
 
 if [ ! -d .hg ]; then
     echo 'You are not inside a Mercurial repository!' 1>&2
     exit 1
 fi
 
 gethgversion
 
 # TODO: handle distance/node set, and type set
 
 if [ -z "$type" ] ; then
    release=1
 else
     release=0.9_$type
 fi
 
 if [ -n "$distance" ] ; then
     release=$release+$distance_$node
 fi
 
 if [ "$PYTHONVER" ]; then
     release=$release+$PYTHONVER
     RPMPYTHONVER=$PYTHONVER
 else
     RPMPYTHONVER=%{nil}
 fi
 
 mkdir -p $RPMBUILDDIR/{SOURCES,BUILD,SRPMS,RPMS}
 $HG archive -t tgz $RPMBUILDDIR/SOURCES/mercurial-$version-$release.tar.gz
 if [ "$PYTHONVER" ]; then
 (
     mkdir -p build
     cd build
     PYTHON_SRCFILE=Python-$PYTHONVER.tgz
     [ -f $PYTHON_SRCFILE ] || curl -Lo $PYTHON_SRCFILE http://www.python.org/ftp/python/$PYTHONVER/$PYTHON_SRCFILE
     if [ "$PYTHONMD5" ]; then
         echo "$PYTHONMD5 $PYTHON_SRCFILE" | md5sum -w -c
     fi
     ln -f $PYTHON_SRCFILE $RPMBUILDDIR/SOURCES/$PYTHON_SRCFILE
 
     DOCUTILSVER=`sed -ne "s/^%global docutilsname docutils-//p" $specfile`
     DOCUTILS_SRCFILE=docutils-$DOCUTILSVER.tar.gz
     [ -f $DOCUTILS_SRCFILE ] || curl -Lo $DOCUTILS_SRCFILE http://downloads.sourceforge.net/project/docutils/docutils/$DOCUTILSVER/$DOCUTILS_SRCFILE
     DOCUTILSMD5=`sed -ne "s/^%global docutilsmd5 //p" $specfile`
     if [ "$DOCUTILSMD5" ]; then
         echo "$DOCUTILSMD5 $DOCUTILS_SRCFILE" | md5sum -w -c
     fi
     ln -f $DOCUTILS_SRCFILE $RPMBUILDDIR/SOURCES/$DOCUTILS_SRCFILE
 )
 fi
 
 mkdir -p $RPMBUILDDIR/SPECS
 rpmspec=$RPMBUILDDIR/SPECS/mercurial.spec
 
 sed -e "s,^Version:.*,Version: $version," \
     -e "s,^Release:.*,Release: $release," \
     $specfile > $rpmspec
 
 echo >> $rpmspec
 echo "%changelog" >> $rpmspec
 
 if echo $version | grep '+' > /dev/null 2>&1; then
     latesttag="`echo $version | sed -e 's/+.*//'`"
     $HG log -r .:"$latesttag" -fM \
         --template '{date|hgdate}\t{author}\t{desc|firstline}\n' | python -c '
 import sys, time
 
 def datestr(date, format):
     return time.strftime(format, time.gmtime(float(date[0]) - date[1]))
 
 changelog = []
 for l in sys.stdin.readlines():
     tok = l.split("\t")
     hgdate = tuple(int(v) for v in tok[0].split())
     changelog.append((datestr(hgdate, "%F"), tok[1], hgdate, tok[2]))
 prevtitle = ""
 for l in sorted(changelog, reverse=True):
     title = "* %s %s" % (datestr(l[2], "%a %b %d %Y"), l[1])
     if prevtitle != title:
         prevtitle = title
         print
         print title
     print "- %s" % l[3].strip()
 ' >> $rpmspec
 
 else
 
     $HG log \
          --template '{date|hgdate}\t{author}\t{desc|firstline}\n' \
          .hgtags | python -c '
 import sys, time
 
 def datestr(date, format):
     return time.strftime(format, time.gmtime(float(date[0]) - date[1]))
 
 for l in sys.stdin.readlines():
     tok = l.split("\t")
     hgdate = tuple(int(v) for v in tok[0].split())
     print "* %s %s\n- %s" % (datestr(hgdate, "%a %b %d %Y"), tok[1], tok[2])
 ' >> $rpmspec
 
 fi
 
 sed -i \
     -e "s/^%define withpython.*$/%define withpython $RPMPYTHONVER/" \
     $rpmspec
 
 if [ "$BUILD" ]; then
     rpmbuild --define "_topdir $RPMBUILDDIR" -ba $rpmspec --clean
     if [ $? = 0 ]; then
         echo
         echo "Built packages for $version-$release:"
         find $RPMBUILDDIR/*RPMS/ -type f -newer $rpmspec
     fi
 else
     echo "Prepared sources for $version-$release $rpmspec are in $RPMBUILDDIR/SOURCES/ - use like:"
     echo "rpmbuild --define '_topdir $RPMBUILDDIR' -ba $rpmspec --clean"
 fi

contrib/packaging/dockerdeb

@@ -1,35 +1,35
 #!/bin/bash -eu
 
 . $(dirname $0)/dockerlib.sh
-. $(dirname $0)/../packagelib.sh
+. $(dirname $0)/packagelib.sh
 
 BUILDDIR=$(dirname $0)
 export ROOTDIR=$(cd $BUILDDIR/../.. > /dev/null; pwd)
 
 checkdocker
 
 DISTID="$1"
 CODENAME="$2"
 PLATFORM="$1-$2"
 shift; shift # extra params are passed to build process
 
 OUTPUTDIR=${OUTPUTDIR:=$ROOTDIR/packages/$PLATFORM}
 
 initcontainer $PLATFORM
 
 # debuild only appears to be able to save built debs etc to .., so we
 # have to share the .. of the current directory with the docker
 # container and hope it's writable. Whee.
 dn=$(basename $PWD)
 
 if [ $(uname) = "Darwin" ] ; then
     $DOCKER run -u $DBUILDUSER --rm -v $PWD/..:/mnt $CONTAINER \
             sh -c "cd /mnt/$dn && make clean && make local"
 fi
 $DOCKER run -u $DBUILDUSER --rm -v $PWD/..:/mnt $CONTAINER \
   sh -c "cd /mnt/$dn && DEB_BUILD_OPTIONS='${DEB_BUILD_OPTIONS:=}' contrib/builddeb --build --distid $DISTID --codename $CODENAME $@"
 contrib/builddeb --cleanup --distid $DISTID --codename $CODENAME
 if [ $(uname) = "Darwin" ] ; then
     $DOCKER run -u $DBUILDUSER --rm -v $PWD/..:/mnt $CONTAINER \
             sh -c "cd /mnt/$dn && make clean"
 fi