| indygreg |
| hg-reviewers |
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | contrib/packaging/Makefile (5 lines) | |||
| M | contrib/packaging/buildrpm (9 lines) | |||
| M | contrib/packaging/docker/centos7 (5 lines) | |||
| M | contrib/packaging/mercurial.spec (3 lines) |
| CENTOS_RELEASES := \ | CENTOS_RELEASES := \ | ||||
| 7 \ | 7 \ | ||||
| 8 | 8 | ||||
| # Build a Python for these CentOS releases. | # Build a Python for these CentOS releases. | ||||
| CENTOS_WITH_PYTHON_RELEASES := | CENTOS_WITH_PYTHON_RELEASES := | ||||
| CENTOS_WITH_NONVERSIONED_PYTHON := | CENTOS_WITH_NONVERSIONED_PYTHON := | ||||
| CENTOS_WITH_36_DOCUTILS := 7 | |||||
| help: | help: | ||||
| @echo 'Packaging Make Targets' | @echo 'Packaging Make Targets' | ||||
| @echo '' | @echo '' | ||||
| @echo 'docker-centos{$(strip $(CENTOS_RELEASES))}' | @echo 'docker-centos{$(strip $(CENTOS_RELEASES))}' | ||||
| @echo ' Build an RPM for a specific CentOS version using Docker.' | @echo ' Build an RPM for a specific CentOS version using Docker.' | ||||
| @echo '' | @echo '' | ||||
| @echo 'docker-debian-{$(strip $(DEBIAN_CODENAMES))}' | @echo 'docker-debian-{$(strip $(DEBIAN_CODENAMES))}' | ||||
| docker-fedora: | docker-fedora: | ||||
| ./dockerrpm fedora$(FEDORA_RELEASE) | ./dockerrpm fedora$(FEDORA_RELEASE) | ||||
| # CentOS targets. | # CentOS targets. | ||||
| define centos_targets | define centos_targets | ||||
| .PHONY: centos$(1) | .PHONY: centos$(1) | ||||
| centos$(1): | centos$(1): | ||||
| mkdir -p $$(HGROOT)/packages/centos$(1) | mkdir -p $$(HGROOT)/packages/centos$(1) | ||||
| ./buildrpm $$(if $$(filter $(1),$$(CENTOS_WITH_PYTHON_RELEASES)),--withpython,$$(if $$(filter $(1),$$(CENTOS_WITH_NONVERSIONED_PYTHON)),--python python,)) | ./buildrpm $$(if $$(filter $(1),$$(CENTOS_WITH_PYTHON_RELEASES)),--withpython,$$(if $$(filter $(1),$$(CENTOS_WITH_NONVERSIONED_PYTHON)),--python python,))$$(if $$(filter $(1),$$(CENTOS_WITH_36_DOCUTILS)), --docutilspackage python36-docutils,) | ||||
| cp $$(HGROOT)/contrib/packaging/rpmbuild/RPMS/*/* $$(HGROOT)/packages/centos$(1) | cp $$(HGROOT)/contrib/packaging/rpmbuild/RPMS/*/* $$(HGROOT)/packages/centos$(1) | ||||
| cp $$(HGROOT)/contrib/packaging/rpmbuild/SRPMS/* $$(HGROOT)/packages/centos$(1) | cp $$(HGROOT)/contrib/packaging/rpmbuild/SRPMS/* $$(HGROOT)/packages/centos$(1) | ||||
| .PHONY: docker-centos$(1) | .PHONY: docker-centos$(1) | ||||
| docker-centos$(1): | docker-centos$(1): | ||||
| ./dockerrpm centos$(1) $$(if $$(filter $(1),$$(CENTOS_WITH_PYTHON_RELEASES)),--withpython,$$(if $$(filter $(1),$$(CENTOS_WITH_NONVERSIONED_PYTHON)),--python python,)) | ./dockerrpm centos$(1) $$(if $$(filter $(1),$$(CENTOS_WITH_PYTHON_RELEASES)),--withpython,$$(if $$(filter $(1),$$(CENTOS_WITH_NONVERSIONED_PYTHON)),--python python,))$$(if $$(filter $(1),$$(CENTOS_WITH_36_DOCUTILS)), --docutilspackage python36-docutils,) | ||||
| endef | endef | ||||
| $(foreach release,$(CENTOS_RELEASES),$(eval $(call centos_targets,$(release)))) | $(foreach release,$(CENTOS_RELEASES),$(eval $(call centos_targets,$(release)))) | ||||
| .PHONY: linux-wheels | .PHONY: linux-wheels | ||||
| linux-wheels: linux-wheels-x86_64 linux-wheels-i686 | linux-wheels: linux-wheels-x86_64 linux-wheels-i686 | ||||
| .PHONY: linux-wheels-x86_64 | .PHONY: linux-wheels-x86_64 | ||||
| linux-wheels-x86_64: | linux-wheels-x86_64: | ||||
| docker run -e "HGTEST_JOBS=$(shell nproc)" --rm -ti -v `pwd`/../..:/src quay.io/pypa/manylinux1_x86_64 /src/contrib/packaging/build-linux-wheels.sh | docker run -e "HGTEST_JOBS=$(shell nproc)" --rm -ti -v `pwd`/../..:/src quay.io/pypa/manylinux1_x86_64 /src/contrib/packaging/build-linux-wheels.sh | ||||
| .PHONY: linux-wheels-i686 | .PHONY: linux-wheels-i686 | ||||
| linux-wheels-i686: | linux-wheels-i686: | ||||
| docker run -e "HGTEST_JOBS=$(shell nproc)" --rm -ti -v `pwd`/../..:/src quay.io/pypa/manylinux1_i686 linux32 /src/contrib/packaging/build-linux-wheels.sh | docker run -e "HGTEST_JOBS=$(shell nproc)" --rm -ti -v `pwd`/../..:/src quay.io/pypa/manylinux1_i686 linux32 /src/contrib/packaging/build-linux-wheels.sh | ||||
| #!/bin/bash -e | #!/bin/bash -e | ||||
| # | # | ||||
| # Build a Mercurial RPM from the current repo, mainly for Fedora/CentOS/RHEL | # Build a Mercurial RPM from the current repo, mainly for Fedora/CentOS/RHEL | ||||
| . $(dirname $0)/packagelib.sh | . $(dirname $0)/packagelib.sh | ||||
| BUILD=1 | BUILD=1 | ||||
| RPMBUILDDIR="$PWD/rpmbuild" | RPMBUILDDIR="$PWD/rpmbuild" | ||||
| PYTHONEXE=python3 | PYTHONEXE=python3 | ||||
| DOCUTILSPACKAGE=python3-docutils | |||||
| while [ "$1" ]; do | while [ "$1" ]; do | ||||
| case "$1" in | case "$1" in | ||||
| --prepare ) | --prepare ) | ||||
| shift | shift | ||||
| BUILD= | BUILD= | ||||
| ;; | ;; | ||||
| --python) | --python) | ||||
| shift | shift | ||||
| PYTHONEXE=$1 | PYTHONEXE=$1 | ||||
| shift | shift | ||||
| ;; | ;; | ||||
| --withpython | --with-python) | --withpython | --with-python) | ||||
| shift | shift | ||||
| PYTHONVER=2.7.16 | PYTHONVER=2.7.16 | ||||
| PYTHONMD5=f1a2ace631068444831d01485466ece0 | PYTHONMD5=f1a2ace631068444831d01485466ece0 | ||||
| PYTHONEXE=python | PYTHONEXE=python | ||||
| ;; | ;; | ||||
| --docutilspackage) | |||||
| shift | |||||
| DOCUTILSPACKAGE="$1" | |||||
| shift | |||||
| ;; | |||||
| --rpmbuilddir ) | --rpmbuilddir ) | ||||
| shift | shift | ||||
| RPMBUILDDIR="$1" | RPMBUILDDIR="$1" | ||||
| shift | shift | ||||
| ;; | ;; | ||||
| * ) | * ) | ||||
| echo "Invalid parameter $1!" 1>&2 | echo "Invalid parameter $1!" 1>&2 | ||||
| exit 1 | exit 1 | ||||
| print("* %s %s\n- %s" % (datestr(hgdate, "%a %b %d %Y"), tok[1], tok[2])) | print("* %s %s\n- %s" % (datestr(hgdate, "%a %b %d %Y"), tok[1], tok[2])) | ||||
| ' >> $rpmspec | ' >> $rpmspec | ||||
| fi | fi | ||||
| sed -i \ | sed -i \ | ||||
| -e "s/^%define withpython.*$/%define withpython $RPMPYTHONVER/" \ | -e "s/^%define withpython.*$/%define withpython $RPMPYTHONVER/" \ | ||||
| $rpmspec | $rpmspec | ||||
| sed -i \ | |||||
| -e "s/^%global pythondocutils.*$/%global pythondocutils $DOCUTILSPACKAGE/" \ | |||||
| $rpmspec | |||||
| if [ "$BUILD" ]; then | if [ "$BUILD" ]; then | ||||
| rpmbuild --define "_topdir $RPMBUILDDIR" -ba $rpmspec --clean | rpmbuild --define "_topdir $RPMBUILDDIR" -ba $rpmspec --clean | ||||
| if [ $? = 0 ]; then | if [ $? = 0 ]; then | ||||
| echo | echo | ||||
| echo "Built packages for $version-$release:" | echo "Built packages for $version-$release:" | ||||
| find $RPMBUILDDIR/*RPMS/ -type f -newer $rpmspec | find $RPMBUILDDIR/*RPMS/ -type f -newer $rpmspec | ||||
| fi | fi | ||||
| else | else | ||||
| echo "Prepared sources for $version-$release $rpmspec are in $RPMBUILDDIR/SOURCES/ - use like:" | echo "Prepared sources for $version-$release $rpmspec are in $RPMBUILDDIR/SOURCES/ - use like:" | ||||
| echo "rpmbuild --define '_topdir $RPMBUILDDIR' -ba $rpmspec --clean" | echo "rpmbuild --define '_topdir $RPMBUILDDIR' -ba $rpmspec --clean" | ||||
| fi | fi | ||||
| FROM centos:centos7 | FROM centos:centos7 | ||||
| RUN groupadd -g %GID% build && \ | RUN groupadd -g %GID% build && \ | ||||
| useradd -u %UID% -g %GID% -s /bin/bash -d /build -m build | useradd -u %UID% -g %GID% -s /bin/bash -d /build -m build | ||||
| RUN yum install -y epel-release | |||||
| RUN yum install -y \ | RUN yum install -y \ | ||||
| gcc \ | gcc \ | ||||
| gettext \ | gettext \ | ||||
| make \ | make \ | ||||
| python-devel \ | python3-devel \ | ||||
| python-docutils \ | python36-docutils \ | ||||
| rpm-build \ | rpm-build \ | ||||
| tar | tar | ||||
| # For creating repo meta data | # For creating repo meta data | ||||
| RUN yum install -y createrepo | RUN yum install -y createrepo | ||||
| %global emacs_lispdir %{_datadir}/emacs/site-lisp | %global emacs_lispdir %{_datadir}/emacs/site-lisp | ||||
| %define withpython %{nil} | %define withpython %{nil} | ||||
| %global pythonexe python3 | %global pythonexe python3 | ||||
| %global pythondocutils python3-docutils | |||||
| %if "%{?withpython}" | %if "%{?withpython}" | ||||
| %global pythonver %{withpython} | %global pythonver %{withpython} | ||||
| %global pythonname Python-%{withpython} | %global pythonname Python-%{withpython} | ||||
| %global docutilsname docutils-0.14 | %global docutilsname docutils-0.14 | ||||
| %global docutilsmd5 c53768d63db3873b7d452833553469de | %global docutilsmd5 c53768d63db3873b7d452833553469de | ||||
| %global pythonhg python-hg | %global pythonhg python-hg | ||||
| Source2: %{docutilsname}.tar.gz | Source2: %{docutilsname}.tar.gz | ||||
| %endif | %endif | ||||
| BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root | BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root | ||||
| BuildRequires: make, gcc, gettext | BuildRequires: make, gcc, gettext | ||||
| %if "%{?withpython}" | %if "%{?withpython}" | ||||
| BuildRequires: readline-devel, openssl-devel, ncurses-devel, zlib-devel, bzip2-devel | BuildRequires: readline-devel, openssl-devel, ncurses-devel, zlib-devel, bzip2-devel | ||||
| %else | %else | ||||
| BuildRequires: %{pythonexe} >= %{pythonver}, %{pythonexe}-devel, %{pythonexe}-docutils >= 0.5 | BuildRequires: %{pythonexe} >= %{pythonver}, %{pythonexe}-devel, %{pythondocutils} | ||||
| Requires: %{pythonexe} >= %{pythonver} | Requires: %{pythonexe} >= %{pythonver} | ||||
| %endif | %endif | ||||
| # The hgk extension uses the wish tcl interpreter, but we don't enforce it | # The hgk extension uses the wish tcl interpreter, but we don't enforce it | ||||
| #Requires: tk | #Requires: tk | ||||
| %description | %description | ||||
| Mercurial is a fast, lightweight source control management system designed | Mercurial is a fast, lightweight source control management system designed | ||||
| for efficient handling of very large distributed projects. | for efficient handling of very large distributed projects. | ||||