janware/jw-pkg
1
mirror of ssh://git.janware.com/janware/proj/jw-pkg synced 2026-04-24 09:13:37 +02:00
Code Activity Actions

make: Install cache-projects.mk

Browse source 
.cache-projects.mk is not installed / packaged, which makes builds
against an installed jw-pkg considerably slower. Change that, at the
risk of making the installed jw-pkg-devel less versatile. This commit
installs a cache file cache-projects.mk, renamed from
.cache-projects.mk, because there's no justification for hiding an
installed makefile. At least I can't think of one.

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2026-02-01 09:50:49 +01:00
commit 741a3b6db2
4 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
make/Makefile
View file

@ -1,5 +1,6 @@
TOPDIR = .. TOPDIR = ..
CACHED_FILES := defs.mk projects.mk platform.mk Makefile CACHED_FILES := defs.mk projects.mk platform.mk Makefile
MKFILES += $(CACHE_PROJECTS_MK)
include $(TOPDIR)/make/proj.mk include $(TOPDIR)/make/proj.mk
include $(JWBDIR)/make/make.mk include $(JWBDIR)/make/make.mk
@ -21,3 +22,10 @@ endif
grep-vars: grep-vars:
$(Q)sed '/^ *[A-Z]/!d; s/^[ ]*//g; s/[=+?:].*//g; s/[ ]*//g' *.mk | sort -u $(Q)sed '/^ *[A-Z]/!d; s/^[ ]*//g; s/[=+?:].*//g; s/[ ]*//g' *.mk | sort -u
cache-projects: $(CACHE_PROJECTS_MK)
clean-cache-projects:
rm -f $(CACHE_PROJECTS_MK)
$(CACHE_PROJECTS_MK): $(CACHE_PROJECT_MK)
sed '/\($(subst $(space),\|,$(CACHED_VARS_ONLY_PROJECT))\)\s*[:?]\?=/ d' $< > $@.tmp
mv $@.tmp $@

10
make/cache.mk
View file

@ -4,8 +4,6 @@
.PHONY: cache clean-cache clean-cache-projects .PHONY: cache clean-cache clean-cache-projects
CACHE_PROJECT_MK ?= .cache-project.mk CACHE_PROJECT_MK ?= .cache-project.mk
CACHE_PROJECTS_MK ?= .cache-projects.mk
CACHE_FILES_MK = $(CACHE_PROJECT_MK) $(CACHE_PROJECTS_MK)
CACHED_VARS_ONLY_PROJECT ?= \ CACHED_VARS_ONLY_PROJECT ?= \
PROJECT \ PROJECT \
PREREQ \ PREREQ \
@ -29,11 +27,3 @@ $(CACHE_PROJECT_MK): $(CACHED_FILES) $(JWBDIR)/make/cache.mk
$(GREP) . | \ $(GREP) . | \
tee $@.tmp tee $@.tmp
mv $@.tmp $@ mv $@.tmp $@
# -- Only used in jw-pkg
cache-projects: $(CACHE_PROJECTS_MK)
clean-cache-projects:
rm -f $(CACHE_PROJECTS_MK)
$(CACHE_PROJECTS_MK): $(CACHE_PROJECT_MK)
sed '/\($(subst $(space),\|,$(CACHED_VARS_ONLY_PROJECT))\)\s*[:?]\?=/ d' $< > $@.tmp
mv $@.tmp $@

4
make/platform.mk
View file

@ -10,7 +10,9 @@ define try_include
endif endif
endef endef
$(eval $(call try_include,$(JWBDIR)/make/.cache-projects.mk)) CACHE_PROJECTS_MK := $(JWBDIR)/cache-projects.mk
$(eval $(call try_include,$(CACHE_PROJECTS_MK)))
$(eval $(call try_include,$(TOPDIR)/make/.cache-project.mk)) $(eval $(call try_include,$(TOPDIR)/make/.cache-project.mk))
$(eval $(call try_include,$(JWBDIR)/make/pre-local.mk)) $(eval $(call try_include,$(JWBDIR)/make/pre-local.mk))
$(eval $(call try_include,$(TOPDIR)/make/pre-local.mk)) $(eval $(call try_include,$(TOPDIR)/make/pre-local.mk))

3
make/rpmdist.mk
View file

@ -140,8 +140,7 @@ pkg-update: pkgupdate.dist
pkg-upload-local: pkg-upload-local.dist pkg-upload-local: pkg-upload-local.dist
clean.rpm: clean.rpm:
$(RM) -rf $(DIST_DIR) *.dist make/.cache-project.mk make/.cache-projects.mk $(RM) -rf $(DIST_DIR) *.dist make/.cache-project.mk
#ifeq ($(PROJECT_DESCR_FILE),) #ifeq ($(PROJECT_DESCR_FILE),)
# #
#clean.mkspec: #clean.mkspec: