##// END OF EJS Templates
dirstate: don't fail when dropping a not-tracked file (issue3080)...
dirstate: don't fail when dropping a not-tracked file (issue3080) Complex merges with divergent renames can cause a file to be 'moved' twice, causing dirstate.drop() to be called twice. Rather than try to ensure there are no unexpected corner cases where this can happen, we simply ignore drops of files that aren't tracked.

File last commit:

r15379:3ca419fb stable
r15399:41453d55 2.0 stable
Show More
Makefile
116 lines | 3.8 KiB | text/x-makefile | MakefileLexer
Martin Geisler
Makefile: added instructions on how to override PREFIX
r10134 # If you want to change PREFIX, do not just edit it below. The changed
# value wont get passed on to recursive make calls. You should instead
# override the variable on the command like:
#
# % make PREFIX=/opt/ install
wilde@trapperkeeper.sha-bang.de
Added install target.
r2233 PREFIX=/usr/local
export PREFIX
Thomas Arendsen Hein
Add Makefile for generating release tarballs....
r1008 PYTHON=python
Martin Geisler
use PURE option in Makefile
r7706 PURE=
Martin Geisler
Makefile: remove underscore in var name
r12816 PYFILES:=$(shell find mercurial hgext doc -name '*.py')
Martin Geisler
Makefile: var for documentation files
r12817 DOCFILES=mercurial/help/*.txt
Thomas Arendsen Hein
Add Makefile for generating release tarballs....
r1008
Thomas Arendsen Hein
Just using 'make' now shows help. 'make all' doesn't perform inplace build.
r2244 help:
@echo 'Commonly used make targets:'
@echo ' all - build program and documentation'
@echo ' install - install program and man pages to PREFIX ($(PREFIX))'
@echo ' install-home - install with setup.py install --home=HOME ($(HOME))'
Markus F.X.J. Oberhumer
Makefile: change "make local" to build a fully working local version.
r4706 @echo ' local - build for inplace usage'
Thomas Arendsen Hein
Just using 'make' now shows help. 'make all' doesn't perform inplace build.
r2244 @echo ' tests - run all tests in the automatic test suite'
Thomas Arendsen Hein
Makefile: adjust example, test-merge1 is now test-merge1.t
r15379 @echo ' test-foo - run only specified tests (e.g. test-merge1.t)'
Thomas Arendsen Hein
Just using 'make' now shows help. 'make all' doesn't perform inplace build.
r2244 @echo ' dist - run all tests and create a source tarball in dist/'
@echo ' clean - remove files created by other targets'
@echo ' (except installed files or dist source tarball)'
Martin Geisler
i18n: let Makefile generate i18n/hg.pot...
r7648 @echo ' update-pot - update i18n/hg.pot'
Thomas Arendsen Hein
Just using 'make' now shows help. 'make all' doesn't perform inplace build.
r2244 @echo
@echo 'Example for a system-wide installation under /usr/local:'
@echo ' make all && su -c "make install" && hg version'
@echo
@echo 'Example for a local installation (usable in this directory):'
@echo ' make local && ./hg version'
all: build doc
Thomas Arendsen Hein
New make targets:...
r2235
local:
Martin Geisler
use PURE option in Makefile
r7706 $(PYTHON) setup.py $(PURE) build_py -c -d . build_ext -i build_mo
Markus F.X.J. Oberhumer
Makefile: change "make local" to build a fully working local version.
r4706 $(PYTHON) hg version
mpm@selenic.com
Add default make rule...
r1020
Thomas Arendsen Hein
New make targets:...
r2235 build:
Martin Geisler
use PURE option in Makefile
r7706 $(PYTHON) setup.py $(PURE) build
Thomas Arendsen Hein
New make targets:...
r2235
doc:
$(MAKE) -C doc
Thomas Arendsen Hein
Add Makefile for generating release tarballs....
r1008
clean:
Greg Ward
Makefile: fix grammar in comment
r8365 -$(PYTHON) setup.py clean --all # ignore errors from this command
Brodie Rao
Makefile: remove all .so files during clean...
r12499 find . \( -name '*.py[cdo]' -o -name '*.so' \) -exec rm -f '{}' ';'
Martin Geisler
Makefile: remove pure modules on clean
r14315 rm -f $(addprefix mercurial/,$(notdir $(wildcard mercurial/pure/*.py)))
Stephen Thorne
distutils: Create MANIFEST.in instead of MANIFEST in Makefile...
r14558 rm -f MANIFEST MANIFEST.in tests/*.err
Brodie Rao
Makefile: remove the build folder manually...
r12500 rm -rf build mercurial/locale
levon@movementarian.org
Use $(MAKE) not make
r1423 $(MAKE) -C doc clean
Thomas Arendsen Hein
Add Makefile for generating release tarballs....
r1008
Sascha Wilde
Split installation targets into install-bin and install-doc....
r2527 install: install-bin install-doc
install-bin: build
Dévai Tamás
Respect the DESTDIR variable during 'make install'...
r10961 $(PYTHON) setup.py $(PURE) install --root="$(DESTDIR)/" --prefix="$(PREFIX)" --force
Sascha Wilde
Split installation targets into install-bin and install-doc....
r2527
install-doc: doc
Thomas Arendsen Hein
New make targets:...
r2235 cd doc && $(MAKE) $(MFLAGS) install
Sascha Wilde
Split installation targets into install-bin and install-doc....
r2527 install-home: install-home-bin install-home-doc
install-home-bin: build
Martin Geisler
use PURE option in Makefile
r7706 $(PYTHON) setup.py $(PURE) install --home="$(HOME)" --force
Sascha Wilde
Split installation targets into install-bin and install-doc....
r2527
install-home-doc: doc
Thomas Arendsen Hein
New make targets:...
r2235 cd doc && $(MAKE) $(MFLAGS) PREFIX="$(HOME)" install
Benoit Boissinot
fix MANIFEST generation
r3872 MANIFEST-doc:
$(MAKE) -C doc MANIFEST
Stephen Thorne
distutils: Create MANIFEST.in instead of MANIFEST in Makefile...
r14558 MANIFEST.in: MANIFEST-doc
hg manifest | sed -e 's/^/include /' > MANIFEST.in
echo include mercurial/__version__.py >> MANIFEST.in
sed -e 's/^/include /' < doc/MANIFEST >> MANIFEST.in
Benoit Boissinot
fix MANIFEST generation
r3872
Thomas Arendsen Hein
New make target "dist-notests" to create tarballs without running tests first.
r2234 dist: tests dist-notests
Stephen Thorne
distutils: Create MANIFEST.in instead of MANIFEST in Makefile...
r14558 dist-notests: doc MANIFEST.in
Matt Mackall
Make make dist a bit quieter
r3865 TAR_OPTIONS="--owner=root --group=root --mode=u+w,go-w,a+rX-s" $(PYTHON) setup.py -q sdist
Thomas Arendsen Hein
Add Makefile for generating release tarballs....
r1008
Johan Euphrosine
add make check: tests rule
r14172 check: tests
Thomas Arendsen Hein
Add Makefile for generating release tarballs....
r1008 tests:
Benoit Boissinot
add possibility to pass flags when testing with the Makefile
r3969 cd tests && $(PYTHON) run-tests.py $(TESTFLAGS)
Thomas Arendsen Hein
Add Makefile for generating release tarballs....
r1008
Benoit Boissinot
add a target for running only one test
r1426 test-%:
Benoit Boissinot
add possibility to pass flags when testing with the Makefile
r3969 cd tests && $(PYTHON) run-tests.py $(TESTFLAGS) $@
Benoit Boissinot
add a target for running only one test
r1426
Tobias Bell
enhance Makefile for language translators...
r7893 update-pot: i18n/hg.pot
Martin Geisler
Makefile: var for documentation files
r12817 i18n/hg.pot: $(PYFILES) $(DOCFILES)
Martin Geisler
i18n: accurately generate hg.pot
r8542 $(PYTHON) i18n/hggettext mercurial/commands.py \
Wagner Bruna
i18n: extract docstrings from fileset module
r14705 hgext/*.py hgext/*/__init__.py mercurial/fileset.py mercurial/revset.py \
Alexander Sauta
i18n-ru: translated missing strings for commands, some typos corrected
r14815 mercurial/templatefilters.py mercurial/templatekw.py \
Wagner Bruna
i18n: extract docstrings from revset module
r12854 $(DOCFILES) > i18n/hg.pot
Martin Geisler
i18n: extract strings with xgettext...
r7710 # All strings marked for translation in Mercurial contain
# ASCII characters only. But some files contain string
# literals like this '\037\213'. xgettext thinks it has to
Martin Geisler
Makefile: fixed comment
r8273 # parse them even though they are not marked for translation.
# Extracting with an explicit encoding of ISO-8859-1 will make
# xgettext "parse" and ignore them.
Martin Geisler
Makefile: remove underscore in var name
r12816 echo $(PYFILES) | xargs \
Martin Geisler
Makefile: remove non-default wrapping of hg.pot strings
r9278 xgettext --package-name "Mercurial" \
Martin Geisler
Makefile: add more meta data to hg.pot
r8272 --msgid-bugs-address "<mercurial-devel@selenic.com>" \
--copyright-holder "Matt Mackall <mpm@selenic.com> and others" \
Wagner Bruna
i18n: extract comments marked for translator hints...
r12806 --from-code ISO-8859-1 --join --sort-by-file --add-comments=i18n: \
Martin Geisler
i18n: extract strings with xgettext...
r7710 -d hg -p i18n -o hg.pot
Wagner Bruna
i18n: translate each paragraph separately...
r11390 $(PYTHON) i18n/posplit i18n/hg.pot
Thomas Arendsen Hein
Add Makefile for generating release tarballs....
r1008
Tobias Bell
enhance Makefile for language translators...
r7893 %.po: i18n/hg.pot
msgmerge --no-location --update $@ $^
Sascha Wilde
Split installation targets into install-bin and install-doc....
r2527 .PHONY: help all local build doc clean install install-bin install-doc \
Martin Geisler
i18n: let Makefile generate i18n/hg.pot...
r7648 install-home install-home-bin install-home-doc dist dist-notests tests \
update-pot