From e915a82978505e1104a8dd4daa27b3df333ff4fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20Mart=C3=ADnez?= Date: Fri, 10 Jan 2025 15:29:05 -0800 Subject: [PATCH] debugging --- .github/workflows/build-windows.yml | 2 +- mk/src_package_mk.mk | 15 +++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index 75a0dbef733..66aed80fb57 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -95,7 +95,7 @@ jobs: working-directory: fstar - run: echo "CYGWIN=" >>$GITHUB_ENV # Note: we admit queries here, like the OPAM build does. - - run: eval $(opam env) && make -kj$(nproc) ADMIT=1 + - run: eval $(opam env) && make V=1 -kj$(nproc) ADMIT=1 working-directory: fstar - run: echo "CYGWIN=" >>$GITHUB_ENV diff --git a/mk/src_package_mk.mk b/mk/src_package_mk.mk index 31eed6ccb3e..6485c523b62 100644 --- a/mk/src_package_mk.mk +++ b/mk/src_package_mk.mk @@ -41,9 +41,11 @@ cygpath=$(abspath "$(1)") endif build: + echo DUNE BUILD dune build --root=dune $(FSTAR_DUNE_BUILD_OPTIONS) install_bin: build + echo DUNE INSTALL dune install --root=dune --prefix=$(call cygpath,out) --verbose check_lib: install_bin @@ -61,11 +63,13 @@ check_lib: install_bin $(MAKE) -f mk/lib.mk verify install_lib: check_lib + echo INSTALL FSTARLIB @# Install library and its checked files - cp -H -p -r ulib out/lib/fstar/ulib - cp -H -p -r ulib.checked out/lib/fstar/ulib.checked + cp -v -H -p -r ulib out/lib/fstar/ulib + cp -v -H -p -r ulib.checked out/lib/fstar/ulib.checked echo 'ulib' > out/lib/fstar/fstar.include echo 'ulib.checked' >> out/lib/fstar/fstar.include + echo DONE INSTALL FSTARLIB check_fstarc: install_bin env \ @@ -80,14 +84,17 @@ check_fstarc: install_bin $(MAKE) -f mk/fstar-12.mk all-checked install_fstarc: check_fstarc + echo INSTALL FSTARC @# Install checked files for FStarC mkdir -p out/lib/fstar/fstarc/ - cp -H -p -r src out/lib/fstar/fstarc/src - cp -H -p -r fstarc.checked out/lib/fstar/fstarc/src.checked + cp -v -H -p -r src out/lib/fstar/fstarc/src + cp -v -H -p -r fstarc.checked out/lib/fstar/fstarc/src.checked echo 'src' > out/lib/fstar/fstarc/fstar.include echo 'src.checked' >> out/lib/fstar/fstarc/fstar.include + echo DONE INSTALL FSTARC trim: _force + echo DUNE CLEAN dune clean $(FSTAR_DUNE_OPTIONS) --root=dune clean: trim