This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6958

hg: move hg script to be a template that gets filled in via make
Needs RevisionPublic

Authored by durin42 on Oct 4 2019, 11:28 AM.

Download Raw Diff

Details

Reviewers

indygreg

Group Reviewers

hg-reviewers

Summary

Right now this is only handling the interpreter path, but we could do
more. I tried to add the hg rule as a dependency of everything that
might need it to work, but I didn't test all the packaging rules.

Diff Detail

Repository

rHG Mercurial

Lint

Lint Skipped

Unit

Unit Tests Skipped

Event Timeline

durin42 created this revision.Oct 4 2019, 11:28 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptOct 4 2019, 11:28 AM

Herald added a subscriber: mercurial-devel. · View Herald Transcript

Changes are coming.

This revision now requires changes to proceed.Oct 4 2019, 11:49 AM

mharbison72 added a subscriber: mharbison72.Oct 4 2019, 3:29 PM

mharbison72 added inline comments.

Makefile
50	Any sane way to get this to strip $(DESTDIR) from the lead? (Or maybe just override it via another parameter.) That would solve one of the issues with the custom Mac install builder (D6846), but probably causes a problem running `contrib/genosxversion.py` (which wants to exec `hg`).

Revision Contents
Changeset List

		Path
M		.hgignore (1 line)
M		Makefile (21 lines)
V		{hg → hg.in.py}
V	M	{hg.in.py ← hg} (2 lines)
M		tests/test-check-code.t (2 lines)

Commit	Parents	Author	Summary	Date
b1d87d1ea5af	8c4f32b907e6	Augie Fackler		Oct 4 2019, 11:12 AM

Diff 16794

.hgignore

	contrib/vagrant/.vagrant			contrib/vagrant/.vagrant
	dist			dist
	packages			packages
	doc/common.txt			doc/common.txt
	doc/*.[0-9]			doc/*.[0-9]
	doc/*.[0-9].txt			doc/*.[0-9].txt
	doc/*.[0-9].gendoc.txt			doc/*.[0-9].gendoc.txt
	doc/*.[0-9].{x,ht}ml			doc/*.[0-9].{x,ht}ml
				hg
	MANIFEST			MANIFEST
	MANIFEST.in			MANIFEST.in
	patches			patches
	mercurial/__modulepolicy__.py			mercurial/__modulepolicy__.py
	mercurial/__version__.py			mercurial/__version__.py
	mercurial/hgpythonlib.h			mercurial/hgpythonlib.h
	mercurial.egg-info			mercurial.egg-info
	.DS_Store			.DS_Store

Makefile

	@echo 'Example for a system-wide installation under /usr/local:'			@echo 'Example for a system-wide installation under /usr/local:'
	@echo ' make all && su -c "make install" && hg version'			@echo ' make all && su -c "make install" && hg version'
	@echo			@echo
	@echo 'Example for a local installation (usable in this directory):'			@echo 'Example for a local installation (usable in this directory):'
	@echo ' make local && ./hg version'			@echo ' make local && ./hg version'

	all: build doc			all: build doc

	local:			hg: hg.in.py
				$(PYTHON) -c "import sys; sys.stdout.write(sys.stdin.read().replace('%(interpreter)s', sys.executable))" < hg.in.py > hg
				mharbison72Unsubmitted Not Done Any sane way to get this to strip $(DESTDIR) from the lead? (Or maybe just override it via another parameter.) That would solve one of the issues with the custom Mac install builder (D6846), but probably causes a problem running `contrib/genosxversion.py` (which wants to exec `hg`). mharbison72: Any sane way to get this to strip $(DESTDIR) from the lead? (Or maybe just override it via…
				chmod +x hg

				local: hg
	$(PYTHON) setup.py $(PURE) \			$(PYTHON) setup.py $(PURE) \
	build_py -c -d . \			build_py -c -d . \
	build_ext $(COMPILERFLAG) -i \			build_ext $(COMPILERFLAG) -i \
	build_hgexe $(COMPILERFLAG) -i \			build_hgexe $(COMPILERFLAG) -i \
	build_mo			build_mo
	env HGRCPATH= $(PYTHON) hg version			env HGRCPATH= $(PYTHON) hg version

	build:			build: hg
	$(PYTHON) setup.py $(PURE) build $(COMPILERFLAG)			$(PYTHON) setup.py $(PURE) build $(COMPILERFLAG)

	wheel:			wheel: hg
	FORCE_SETUPTOOLS=1 $(PYTHON) setup.py $(PURE) bdist_wheel $(COMPILERFLAG)			FORCE_SETUPTOOLS=1 $(PYTHON) setup.py $(PURE) bdist_wheel $(COMPILERFLAG)

	doc:			doc:
	$(MAKE) -C doc			$(MAKE) -C doc

	cleanbutpackages:			cleanbutpackages:
	-$(PYTHON) setup.py clean --all # ignore errors from this command			-$(PYTHON) setup.py clean --all # ignore errors from this command
	find contrib doc hgext hgext3rd i18n mercurial tests hgdemandimport \			find contrib doc hgext hgext3rd i18n mercurial tests hgdemandimport \
	$ -name '.py[cdo]' -o -name '.so' $ -exec rm -f '{}' ';'			$ -name '.py[cdo]' -o -name '.so' $ -exec rm -f '{}' ';'
	rm -f MANIFEST MANIFEST.in hgext/__index__.py tests/*.err			rm -f MANIFEST MANIFEST.in hgext/__index__.py tests/*.err
	rm -f mercurial/__modulepolicy__.py			rm -f mercurial/__modulepolicy__.py
	if test -d .hg; then rm -f mercurial/__version__.py; fi			if test -d .hg; then rm -f mercurial/__version__.py; fi
	rm -rf build mercurial/locale			rm -rf build mercurial/locale
	$(MAKE) -C doc clean			$(MAKE) -C doc clean
	$(MAKE) -C contrib/chg distclean			$(MAKE) -C contrib/chg distclean
	rm -rf rust/target			rm -rf rust/target
	rm -f mercurial/rustext.so			rm -f mercurial/rustext.so
				rm -f hg

	clean: cleanbutpackages			clean: cleanbutpackages
	rm -rf packages			rm -rf packages

	install: install-bin install-doc			install: install-bin install-doc

	install-bin: build			install-bin: build
	$(PYTHON) setup.py $(PURE) install --root="$(DESTDIR)/" --prefix="$(PREFIX)" --force			$(PYTHON) setup.py $(PURE) install --root="$(DESTDIR)/" --prefix="$(PREFIX)" --force

	dist: tests dist-notests			dist: tests dist-notests

	dist-notests: doc MANIFEST.in			dist-notests: doc MANIFEST.in
	TAR_OPTIONS="--owner=root --group=root --mode=u+w,go-w,a+rX-s" $(PYTHON) setup.py -q sdist			TAR_OPTIONS="--owner=root --group=root --mode=u+w,go-w,a+rX-s" $(PYTHON) setup.py -q sdist

	check: tests			check: tests

	tests:			tests: hg
	# Run Rust tests if cargo is installed			# Run Rust tests if cargo is installed
	if command -v $(CARGO) >/dev/null 2>&1; then \			if command -v $(CARGO) >/dev/null 2>&1; then \
	cd $(HGROOT)/rust/hg-cpython && $(CARGO) test --quiet --all; \			cd $(HGROOT)/rust/hg-cpython && $(CARGO) test --quiet --all; \
	fi			fi
	cd tests && $(PYTHON) run-tests.py $(TESTFLAGS)			cd tests && $(PYTHON) run-tests.py $(TESTFLAGS)

	test-%:			test-%: hg
	cd tests && $(PYTHON) run-tests.py $(TESTFLAGS) $@			cd tests && $(PYTHON) run-tests.py $(TESTFLAGS) $@

	testpy-%:			testpy-%: hg
	@echo Looking for Python $* in $(HGPYTHONS)			@echo Looking for Python $* in $(HGPYTHONS)
	[ -e $(HGPYTHONS)/$*/bin/python ] \|\| ( \			[ -e $(HGPYTHONS)/$*/bin/python ] \|\| ( \
	cd $$(mktemp --directory --tmpdir) && \			cd $$(mktemp --directory --tmpdir) && \
	$(MAKE) -f $(HGROOT)/contrib/Makefile.python PYTHONVER=$* PREFIX=$(HGPYTHONS)/$* python )			$(MAKE) -f $(HGROOT)/contrib/Makefile.python PYTHONVER=$* PREFIX=$(HGPYTHONS)/$* python )
	cd tests && $(HGPYTHONS)/$*/bin/python run-tests.py $(TESTFLAGS)			cd tests && $(HGPYTHONS)/$*/bin/python run-tests.py $(TESTFLAGS)

	check-code:			check-code:
	hg manifest \| xargs python contrib/check-code.py			hg manifest \| xargs python contrib/check-code.py
	fedora28 \			fedora28 \
	fedora29 \			fedora29 \
	linux-wheels \			linux-wheels \
	linux-wheels-x86_64 \			linux-wheels-x86_64 \
	linux-wheels-i686 \			linux-wheels-i686 \
	ppa			ppa

	# Forward packaging targets for convenience.			# Forward packaging targets for convenience.
	$(packaging_targets):			$(packaging_targets): hg
	$(MAKE) -C contrib/packaging $@			$(MAKE) -C contrib/packaging $@

	osx:			osx: hg
	rm -rf build/mercurial			rm -rf build/mercurial
	/usr/bin/python2.7 setup.py install --optimize=1 \			/usr/bin/python2.7 setup.py install --optimize=1 \
	--root=build/mercurial/ --prefix=/usr/local/ \			--root=build/mercurial/ --prefix=/usr/local/ \
	--install-lib=/Library/Python/2.7/site-packages/			--install-lib=/Library/Python/2.7/site-packages/
	make -C doc all install DESTDIR="$(PWD)/build/mercurial/"			make -C doc all install DESTDIR="$(PWD)/build/mercurial/"
	# Place a bogon .DS_Store file in the target dir so we can be			# Place a bogon .DS_Store file in the target dir so we can be
	# sure it doesn't get included in the final package.			# sure it doesn't get included in the final package.
	touch build/mercurial/.DS_Store			touch build/mercurial/.DS_Store

hg

This file was moved to hg.in.py.

hg.in.py

This file was moved from hg.

Property	Old Value	New Value
File Mode	100755	100644

	#!/usr/bin/env python			#!%(interpreter)s
	#			#
	# mercurial - scalable distributed SCM			# mercurial - scalable distributed SCM
	#			#
	# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>			# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
	#			#
	# This software may be used and distributed according to the terms of the			# This software may be used and distributed according to the terms of the
	# GNU General Public License version 2 or any later version.			# GNU General Public License version 2 or any later version.
	from __future__ import absolute_import			from __future__ import absolute_import

tests/test-check-code.t

	.hgsigs			.hgsigs
	.hgtags			.hgtags
	.jshintrc			.jshintrc
	CONTRIBUTING			CONTRIBUTING
	CONTRIBUTORS			CONTRIBUTORS
	COPYING			COPYING
	Makefile			Makefile
	README.rst			README.rst
	hg			hg.in.py
	hgeditor			hgeditor
	hgweb.cgi			hgweb.cgi
	setup.py			setup.py

	Prevent adding modules which could be shadowed by ancient .so/.dylib.			Prevent adding modules which could be shadowed by ancient .so/.dylib.

	$ testrepohg files \			$ testrepohg files \
	> mercurial/base85.py \			> mercurial/base85.py \

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	16794			Oct 4 2019, 11:28 AM	★	★