From 673953e56c3de98a34f81e99cb67bb5558c51805 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Sat, 12 Sep 2026 17:28:51 +0200 Subject: [PATCH] .gitignore: Run make gitignore Update .gitignore by running "make gitignore. Add a couple of jw-pkg- specific build-artifacts to GITIGNORE_PATTERNS_END before: .cache-projects.mk make/ssh-wrapper.sh Also cancel the automatic inclusion of file paths containing jw-pkg with an empty GITIGNORE_PATTERNS_TOP. Signed-off-by: Jan Lindemann --- .gitignore | 63 +++++++++++++++++++++++++++++++++++++++++++----------- Makefile | 4 ++++ 2 files changed, 55 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 3b34a6fa..b903490e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,16 +1,55 @@ -dist -bin/*.sh -bin/*.py -*.done +*.a +*.dep.mk *.dist +*.done +*.jw-secret +*.jw-secret-file +*.ldscript +*.o +*.old +*.orig *.out -test-out.txt -make/.cache.mk -make/jw-pkg.pc -minimal-to-master.sh -pkg-build.dist -pkgconfig/ -rebase.sh -__pycache__ +*.pc +*.pyc +*.rep +*.secret +*.so +*.so.* +*.swp +*_generated_* +*tmp* +*~ +-test-out.txt .cache-project.mk +.exrc +.feedfs_history +.gdb_history +.jw-agit +.mypy_cache +.ruff_cache +__init__.py +__pycache__ +bin/*.bat +bin/*.pl +bin/*.pm +bin/*.py +bin/*.sh +bin/*.tcl +conftest.py +core +dist +ld-*.conf +local.conf +local.mk +local.mk +local.yaml +make/*.pc +mkspec.sh +pr-descr*.txt +pre-local.mk +pyproject.toml +pyrightconfig.json +!*.jw-tmpl +!*.tmpl .cache-projects.mk +make/ssh-wrapper.sh diff --git a/Makefile b/Makefile index 105c83d0..7ff1e771 100644 --- a/Makefile +++ b/Makefile @@ -4,12 +4,16 @@ PKG_UPLOAD_URLPREFIX ?= rsync_ssh://$(JANWARE_USER)@pkg.janware.com:/srv/da all: all: cache-projects +GITIGNORE_PATTERNS_TOP = +GITIGNORE_PATTERNS_END = .cache-projects.mk make/ssh-wrapper.sh + include $(TOPDIR)/make/proj.mk include $(JWBDIR)/make/topdir.mk include $(JWBDIR)/make/srcdist.mk include $(JWBDIR)/make/git-cvs-bridge.mk include $(JWBDIR)/make/py-topdir.mk + clean: clean.pkgconfig clean.pkgconfig: rm -rf pkgconfig