Correct jbuild-ignore

Since beta15, jbuilder no longer permits subdirectories in jbuild-ignore files so the sub-directory ones are split off to separate files. Signed-off-by: David Allsopp <[email protected]>
jhwoodyatt · Jan 11, 2018 · 34f6c34 · 34f6c34
1 parent 8896266
commit 34f6c34
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -22,6 +22,7 @@ src_ext/*.tbz
 src_ext/*.tar.gz
 src_ext/archives/*
 src_ext/*.download
+src_ext/jbuild-ignore
 *.tar.bz2
 *.annot
 *.tar.gz

diff --git a/jbuild-ignore b/jbuild-ignore
@@ -1,3 +1 @@
 bootstrap
-src_ext/jbuilder
-tests/packages
diff --git a/src_ext/Makefile b/src_ext/Makefile
@@ -77,7 +77,12 @@ endif
 jbuilder/_build/install/default/bin/jbuilder$(EXE): $(JBUILDER_CLONE)
 	cd jbuilder && ocaml bootstrap.ml && ./boot.exe
 
-clone: $(JBUILDER_CLONE) $(SRC_EXTS:=.stamp)
+.PHONY: ext-ignore
+ext-ignore:
+	@echo "This file is automatically generated" > jbuild-ignore
+	@echo jbuilder >> jbuild-ignore
+
+clone: $(JBUILDER_CLONE) $(SRC_EXTS:=.stamp) | ext-ignore
 	@
 
 .PHONY: archives
@@ -132,5 +137,5 @@ clean:
 
 distclean: clean
 	rm -rf jbuilder $(SRC_EXTS) mccs
-	rm -f *.tar.gz *.tbz *.stamp *.download
+	rm -f *.tar.gz *.tbz *.stamp *.download jbuild-ignore
 	[ -d archives ] && ([ "$$(find archives -maxdepth 0 -type d -empty)" != "" ] && rmdir archives || echo "WARNING! $$(pwd)/archives/ not empty so left") || true
diff --git a/tests/jbuild-ignore b/tests/jbuild-ignore
@@ -0,0 +1 @@
+packages