This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3546

packaging: move buildrpm to contrib/packaging/
ClosedPublic

Authored by indygreg on May 12 2018, 5:19 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGb7cd9e94c259: packaging: move buildrpm to contrib/packaging/
Summary

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

indygreg created this revision.May 12 2018, 5:19 PM
Closed by commit rHGb7cd9e94c259: packaging: move buildrpm to contrib/packaging/ (authored by indygreg). · Explain WhyMay 15 2018, 8:52 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 8691

Makefile

docker-ubuntu-bionic: contrib/packaging/docker/ubuntu-bionic docker-ubuntu-bionic: contrib/packaging/docker/ubuntu-bionic
contrib/packaging/dockerdeb ubuntu bionic contrib/packaging/dockerdeb ubuntu bionic
docker-ubuntu-bionic-ppa: contrib/packaging/docker/ubuntu-bionic docker-ubuntu-bionic-ppa: contrib/packaging/docker/ubuntu-bionic
contrib/packaging/dockerdeb ubuntu bionic --source-only contrib/packaging/dockerdeb ubuntu bionic --source-only
fedora20: fedora20:
mkdir -p packages/fedora20 mkdir -p packages/fedora20
contrib/buildrpm contrib/packaging/buildrpm
cp rpmbuild/RPMS/*/* packages/fedora20 cp rpmbuild/RPMS/*/* packages/fedora20
cp rpmbuild/SRPMS/* packages/fedora20 cp rpmbuild/SRPMS/* packages/fedora20
rm -rf rpmbuild rm -rf rpmbuild
docker-fedora20: docker-fedora20:
mkdir -p packages/fedora20 mkdir -p packages/fedora20
contrib/packaging/dockerrpm fedora20 contrib/packaging/dockerrpm fedora20
fedora21: fedora21:
mkdir -p packages/fedora21 mkdir -p packages/fedora21
contrib/buildrpm contrib/packaging/buildrpm
cp rpmbuild/RPMS/*/* packages/fedora21 cp rpmbuild/RPMS/*/* packages/fedora21
cp rpmbuild/SRPMS/* packages/fedora21 cp rpmbuild/SRPMS/* packages/fedora21
rm -rf rpmbuild rm -rf rpmbuild
docker-fedora21: docker-fedora21:
mkdir -p packages/fedora21 mkdir -p packages/fedora21
contrib/packaging/dockerrpm fedora21 contrib/packaging/dockerrpm fedora21
centos5: centos5:
mkdir -p packages/centos5 mkdir -p packages/centos5
contrib/buildrpm --withpython contrib/packaging/buildrpm --withpython
cp rpmbuild/RPMS/*/* packages/centos5 cp rpmbuild/RPMS/*/* packages/centos5
cp rpmbuild/SRPMS/* packages/centos5 cp rpmbuild/SRPMS/* packages/centos5
docker-centos5: docker-centos5:
mkdir -p packages/centos5 mkdir -p packages/centos5
contrib/packaging/dockerrpm centos5 --withpython contrib/packaging/dockerrpm centos5 --withpython
centos6: centos6:
mkdir -p packages/centos6 mkdir -p packages/centos6
contrib/buildrpm --withpython contrib/packaging/buildrpm --withpython
cp rpmbuild/RPMS/*/* packages/centos6 cp rpmbuild/RPMS/*/* packages/centos6
cp rpmbuild/SRPMS/* packages/centos6 cp rpmbuild/SRPMS/* packages/centos6
docker-centos6: docker-centos6:
mkdir -p packages/centos6 mkdir -p packages/centos6
contrib/packaging/dockerrpm centos6 --withpython contrib/packaging/dockerrpm centos6 --withpython
centos7: centos7:
mkdir -p packages/centos7 mkdir -p packages/centos7
contrib/buildrpm contrib/packaging/buildrpm
cp rpmbuild/RPMS/*/* packages/centos7 cp rpmbuild/RPMS/*/* packages/centos7
cp rpmbuild/SRPMS/* packages/centos7 cp rpmbuild/SRPMS/* packages/centos7
docker-centos7: docker-centos7:
mkdir -p packages/centos7 mkdir -p packages/centos7
contrib/packaging/dockerrpm centos7 contrib/packaging/dockerrpm centos7
linux-wheels: linux-wheels-x86_64 linux-wheels-i686 linux-wheels: linux-wheels-x86_64 linux-wheels-i686

contrib/buildrpm

  • This file was moved to contrib/packaging/buildrpm.

contrib/packaging/buildrpm

  • This file was moved from contrib/buildrpm.
#!/bin/bash -e #!/bin/bash -e
# #
# Build a Mercurial RPM from the current repo # Build a Mercurial RPM from the current repo
# #
# Tested on # Tested on
# - Fedora 20 # - Fedora 20
# - CentOS 5 # - CentOS 5
# - centOS 6 # - centOS 6
. $(dirname $0)/packaging/packagelib.sh . $(dirname $0)/packagelib.sh
BUILD=1 BUILD=1
RPMBUILDDIR="$PWD/rpmbuild" RPMBUILDDIR="$PWD/rpmbuild"
while [ "$1" ]; do while [ "$1" ]; do
case "$1" in case "$1" in
--prepare ) --prepare )
shift shift
;; ;;
* ) * )
echo "Invalid parameter $1!" 1>&2 echo "Invalid parameter $1!" 1>&2
exit 1 exit 1
;; ;;
esac esac
done done
cd "`dirname $0`/.." cd "`dirname $0`/../.."
specfile=$PWD/contrib/packaging/mercurial.spec specfile=$PWD/contrib/packaging/mercurial.spec
if [ ! -f $specfile ]; then if [ ! -f $specfile ]; then
echo "Cannot find $specfile!" 1>&2 echo "Cannot find $specfile!" 1>&2
exit 1 exit 1
fi fi
if [ ! -d .hg ]; then if [ ! -d .hg ]; then

contrib/packaging/dockerrpm

#!/bin/bash -e #!/bin/bash -e
. $(dirname $0)/dockerlib.sh . $(dirname $0)/dockerlib.sh
BUILDDIR=$(dirname $0) BUILDDIR=$(dirname $0)
export ROOTDIR=$(cd $BUILDDIR/../..; pwd) export ROOTDIR=$(cd $BUILDDIR/../..; pwd)
checkdocker checkdocker
PLATFORM="$1" PLATFORM="$1"
shift # extra params are passed to buildrpm shift # extra params are passed to buildrpm
initcontainer $PLATFORM initcontainer $PLATFORM
RPMBUILDDIR=$ROOTDIR/packages/$PLATFORM RPMBUILDDIR=$ROOTDIR/packages/$PLATFORM
contrib/buildrpm --rpmbuilddir $RPMBUILDDIR --prepare $* contrib/packaging/buildrpm --rpmbuilddir $RPMBUILDDIR --prepare $*
DSHARED=/mnt/shared DSHARED=/mnt/shared
$DOCKER run -e http_proxy -e https_proxy -u $DBUILDUSER --rm -v $RPMBUILDDIR:$DSHARED $CONTAINER \ $DOCKER run -e http_proxy -e https_proxy -u $DBUILDUSER --rm -v $RPMBUILDDIR:$DSHARED $CONTAINER \
rpmbuild --define "_topdir $DSHARED" -ba $DSHARED/SPECS/mercurial.spec --clean rpmbuild --define "_topdir $DSHARED" -ba $DSHARED/SPECS/mercurial.spec --clean
$DOCKER run -e http_proxy -e https_proxy -u $DBUILDUSER --rm -v $RPMBUILDDIR:$DSHARED $CONTAINER \ $DOCKER run -e http_proxy -e https_proxy -u $DBUILDUSER --rm -v $RPMBUILDDIR:$DSHARED $CONTAINER \
createrepo $DSHARED createrepo $DSHARED