Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ensure all archives are retrieved in make cache-archives #5624

Merged
merged 1 commit into from
Jul 24, 2024
Merged

Ensure all archives are retrieved in make cache-archives #5624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion master_changes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ New option/command/subcommand are prefixed with ◈.
*

## Infrastructure
*
* Ensure the full archive includes the 0install sources [#5624 @dra27]

## Admin
*
Expand Down
11 changes: 8 additions & 3 deletions src_ext/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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))))))
Expand Down
Loading