stage.mk: tweak library install

FStarLang · Jan 2, 2025 · a184774 · a184774
1 parent fc97777
commit a184774
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/mk/stage.mk b/mk/stage.mk
@@ -34,17 +34,15 @@ clean: _force
 	rm -rf out
 
 CP=cp -p # preserve timestamps
+
 install: fstarc-bare fstarc-full libapp libplugin
-	# Seems to need one final build?
+	@# Seems to need one final build?
 	cd dune && dune build $(FSTAR_DUNE_BUILD_OPTIONS)
 	cd dune && dune install $(FSTAR_DUNE_OPTIONS) --prefix=$(abspath $(CURDIR)/out)
-	# Install library
-	$(CP) -t out/lib/fstar ulib/*.fst
-	$(CP) -t out/lib/fstar ulib/*.fsti
-	$(CP) -t out/lib/fstar ulib/fstar.include
-	$(CP) -r -t out/lib/fstar ulib/experimental
-	$(CP) -r -t out/lib/fstar ulib/legacy
-	# Install checked files for the library
-	mkdir -p out/lib/fstar/.checked
-	$(CP) -r -t out/lib/fstar/.checked ulib.checked/*
-	# Should we make sure checked files have newer timestamp?
+	@# Install library
+	$(CP) -H -p -r ulib out/lib/fstar/ulib
+	echo 'ulib' >> out/lib/fstar/fstar.include
+	@# Install checked files for the library
+	mkdir -p out/lib/fstar/ulib/.checked
+	$(CP) ulib.checked/* out/lib/fstar/ulib/.checked/
+	echo '.checked' >> out/lib/fstar/ulib/fstar.include
diff --git a/ulib/fstar.include b/ulib/fstar.include
@@ -1,3 +1,2 @@
 legacy
 experimental
-.checked