Merge pull request #5624 from dra27/full-archive

Ensure all archives are retrieved in `make cache-archives`
ocaml · Jul 24, 2024 · 66f7251 · 66f7251
2 parents 52575bc + b55b38a
commit 66f7251
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/master_changes.md b/master_changes.md
@@ -61,7 +61,7 @@ New option/command/subcommand are prefixed with ◈.
   *
 
 ## Infrastructure
-  *
+  * Ensure the full archive includes the 0install sources [#5624 @dra27]
 
 ## Admin
   *

diff --git a/src_ext/Makefile b/src_ext/Makefile
@@ -34,13 +34,18 @@ endef
 
 SRC_EXTS = cppo base64 extlib re cmdliner ocamlgraph cudf dose3 opam-file-format result seq stdlib-shims
 PKG_EXTS = $(SRC_EXTS) dune-local findlib ocamlbuild topkg mccs
+ALL_EXTS = $(SRC_EXTS) $(PKG_EXTS) ocaml flexdll
 
+MCCS_SRCS = mccs
+ALL_EXTS += $(MCCS_SRCS)
 ifeq ($(MCCS_ENABLED),true)
-SRC_EXTS := $(SRC_EXTS) mccs
+SRC_EXTS += $(MCCS_SRCS)
 endif
 
+0INSTALL_SRCS = opam-0install-cudf 0install-solver
+ALL_EXTS += $(0INSTALL_SRCS)
 ifeq ($(OPAM_0INSTALL_SOLVER_ENABLED),true)
-SRC_EXTS := $(SRC_EXTS) opam-0install-cudf 0install-solver
+SRC_EXTS += $(0INSTALL_SRCS)
 endif
 
 include Makefile.sources
@@ -141,7 +146,7 @@ archives: $(SRC_EXTS:=.download)
 archives-pkg: $(PKG_EXTS:=.pkgdownload)
 	@
 
-cache-archives: $(SRC_EXTS:=.cache) $(PKG_EXTS:=.pkgcache) ocaml.cache flexdll.cache
+cache-archives: $(ALL_EXTS:=.cache) $(ALL_EXTS:=.pkgcache)
 	@
 
 has-archives: $(addprefix archives/, $(notdir $(URL_ocaml)) $(notdir $(URL_flexdll)) $(ARCHIVES) $(filter-out $(ARCHIVES), $(foreach pkg,$(PKG_EXTS), $(notdir $(URL_PKG_$(pkg))))))