Skip to content

Harden makefile invariants #6804

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

Draft
kit-ty-kate wants to merge 3 commits into
base: master
Choose a base branch
from
+17 −17
Draft

Harden makefile invariants #6804

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d0bdece
src_ext: make sure the temporary directories are empty before extract…
kit-ty-kate Nov 19, 2025
a01e46a
Add missing quotes around every calls to rm with variable arguments
kit-ty-kate Nov 19, 2025
48a5e47
Indent some of the inline shell scripts in src_ext/Makefile
kit-ty-kate Nov 19, 2025
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 admin-scripts/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ LIBS = $(patsubst %,../src/opam-%.cma,$(DEPS))
%: %.ml
sed 's/^#.*//' $< >$*-tmp.ml
ocamlfind ocamlc -package unix,re.glob,ocamlgraph -linkpkg $(INCLUDE) $(LIBS) ../src/tools/opam_admin_top.ml $*-tmp.ml -o $@
rm $*-tmp.ml
rm "$*-tmp.ml"

1_2_to_2_0: compilers-to-packages
cp $< $@
Expand Down
32 changes: 16 additions & 16 deletions src_ext/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ MD5CHECK = { \
sum=`md5sum $(1) 2>/dev/null | sed -e 's/^[^a-f0-9]*\([a-f0-9]*\).*/\1/'`; \
test -n "$$sum" || sum=`md5 $(1) | sed -e 's/^.* = //'`; \
{ test "$$sum" = "$(2)" $(if $(SILENT),,&& echo '$(1) has the expected MD5.'); } || \
{ rm -f $(1); \
{ rm -f "$(1)"; \
echo 'MD5 for $(1) differs:'; \
echo ' expected: $(2)'; \
echo " actual: $$sum"; \
Expand Down Expand Up @@ -128,32 +128,32 @@ GET_ARCHIVE=\
cp archives/$(notdir $(URL_$*)) $(call ARCHIVE_FILE,$*) 2>/dev/null || $(call GET_ARCHIVE,$*)

%.stamp: %.download
$(SILENT)rm -rf "tmp-$*"
$(SILENT)mkdir -p tmp-$*
$(SILENT)cd tmp-$* && $(if $(patsubst %.tar.gz,,$(URL_$*)),bunzip2,gunzip) -c ../$(call ARCHIVE_FILE,$*) | tar xf -
$(SILENT)rm -rf $*
$(SILENT)rm -rf "$*"
@for ii in tmp-$*/*; do if [ -d $${ii} ]; then mv $${ii} $*; fi; done; \
rm -rf tmp-$*
rm -rf "tmp-$*"
@if [ -d patches/$* ]; then \
cd $* && \
for p in ../patches/$*/*.patch; do \
$(PATCH) -p1 < $$p $(if $(SILENT),> /dev/null); \
done; \
fi
for p in ../patches/$*/*.patch; do \
$(PATCH) -p1 < $$p $(if $(SILENT),> /dev/null); \
done; \
fi
@if [ "$*" != "dune-local" ] ; then \
for j in $(wildcard dune-$* dune-$*-*); do \
cp $$j $*$$(echo "$$j" | sed -e "s/dune-$*//" -e "s|-|/|g")/dune; \
echo "(lang dune 1.2)" > $*/dune-project; \
echo "(name $*)" >> $*/dune-project; \
touch $*/$*.opam; \
done; \
fi
for j in $(wildcard dune-$* dune-$*-*); do \
cp $$j $*$$(echo "$$j" | sed -e "s/dune-$*//" -e "s|-|/|g")/dune; \
echo "(lang dune 1.2)" > $*/dune-project; \
echo "(name $*)" >> $*/dune-project; \
touch $*/$*.opam; \
done; \
fi
@touch $@

clean:
@

distclean: clean
rm -rf dune-local secondary $(SRC_EXTS)
rm -f *.tar.gz *.tbz *.*stamp *.*download dune \
Makefile.config
rm -f *.tar.gz *.tbz *.*stamp *.*download dune Makefile.config
[ -d archives ] && ([ "$$(find archives -maxdepth 0 -type d -empty)" != "" ] && rmdir archives || echo "WARNING! $$(pwd)/archives/ not empty so left") || true
Loading