comparison Makefile @ 47859:155a2ec8a9dc

merge with stable
author Matt Harbison <matt_harbison@yahoo.com>
date Sun, 22 Aug 2021 16:32:06 -0400
parents f799355d8fe3
children 6387562e68b3
comparison
equal deleted inserted replaced
47802:de2e04fe4897 47859:155a2ec8a9dc
268 "$${OUTPUTDIR:-dist/}"/Mercurial-"$${HGVER}"-macosx"$${OSXVER}".pkg 268 "$${OUTPUTDIR:-dist/}"/Mercurial-"$${HGVER}"-macosx"$${OSXVER}".pkg
269 269
270 pyoxidizer: 270 pyoxidizer:
271 $(PYOXIDIZER) build --path ./rust/hgcli --release 271 $(PYOXIDIZER) build --path ./rust/hgcli --release
272 272
273
274 PYOX_DIR=build/pyoxidizer/x86_64-pc-windows-msvc/release/app
275
276 # a temporary target to setup all we need for run-tests.py --pyoxidizer
277 # (should go away as the run-tests implementation improves
278 pyoxidizer-windows-tests: pyoxidizer
279 rm -rf $(PYOX_DIR)/templates
280 cp -ar $(PYOX_DIR)/lib/mercurial/templates $(PYOX_DIR)/templates
281 rm -rf $(PYOX_DIR)/helptext
282 cp -ar $(PYOX_DIR)/lib/mercurial/helptext $(PYOX_DIR)/helptext
283 rm -rf $(PYOX_DIR)/defaultrc
284 cp -ar $(PYOX_DIR)/lib/mercurial/defaultrc $(PYOX_DIR)/defaultrc
285 rm -rf $(PYOX_DIR)/contrib
286 cp -ar contrib $(PYOX_DIR)/contrib
287 rm -rf $(PYOX_DIR)/doc
288 cp -ar doc $(PYOX_DIR)/doc
289
290
273 .PHONY: help all local build doc cleanbutpackages clean install install-bin \ 291 .PHONY: help all local build doc cleanbutpackages clean install install-bin \
274 install-doc install-home install-home-bin install-home-doc \ 292 install-doc install-home install-home-bin install-home-doc \
275 dist dist-notests check tests rust-tests check-code format-c \ 293 dist dist-notests check tests rust-tests check-code format-c \
276 update-pot pyoxidizer \ 294 update-pot pyoxidizer pyoxidizer-windows-tests \
277 $(packaging_targets) \ 295 $(packaging_targets) \
278 osx 296 osx