Skip to content

Commit

Permalink
debugging
Browse files Browse the repository at this point in the history
  • Loading branch information
mtzguido committed Jan 10, 2025
1 parent befd565 commit e915a82
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
15 changes: 11 additions & 4 deletions mk/src_package_mk.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 \
Expand All @@ -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
Expand Down

0 comments on commit e915a82

Please sign in to comment.