From 46d2e72bbc17385221a3f7bc3ffb3f0edb07aad0 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Thu, 18 Jan 2024 10:57:27 -0800 Subject: [PATCH 1/2] Fix incremental build. --- src/3d/tests/modules/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/3d/tests/modules/Makefile b/src/3d/tests/modules/Makefile index 5636dd2a9..6e38502a7 100644 --- a/src/3d/tests/modules/Makefile +++ b/src/3d/tests/modules/Makefile @@ -92,7 +92,7 @@ clean: # This rule is for continuous integration only (for the purpose of # testing EverParse.) It can be ignored by users. -ci: $(EVERPARSE_ALL_O_FILES) +ci: $(EVERPARSE_ALL_O_FILES) $(EVERPARSE_ALL_H_FILES) ! test -e $(EVERPARSE_OUTPUT_DIR)/Lib.h $(EVERPARSE_CMD) --check_inplace_hash src/Point.3d=$(EVERPARSE_OUTPUT_DIR)/Point.h $(EVERPARSE_CMD) --check_inplace_hash src/Point.3d=$(EVERPARSE_OUTPUT_DIR)/Point.c From 987823ef17b54f6d7b1278d7d12234e1410a4567 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Thu, 18 Jan 2024 10:58:35 -0800 Subject: [PATCH 2/2] Remove redundant config.json files. This makes the VS Code extension work on generated files in src/3d/tests/modules. --- src/3d/EverParse3DCompiler.fst.config.json | 9 --------- src/3d/prelude/EverParse3dPrelude.fst.config.json | 15 --------------- 2 files changed, 24 deletions(-) delete mode 100644 src/3d/EverParse3DCompiler.fst.config.json delete mode 100644 src/3d/prelude/EverParse3dPrelude.fst.config.json diff --git a/src/3d/EverParse3DCompiler.fst.config.json b/src/3d/EverParse3DCompiler.fst.config.json deleted file mode 100644 index 0e1c65c70..000000000 --- a/src/3d/EverParse3DCompiler.fst.config.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "fstar_exe": "fstar.exe", - "options": [ - ], - "include_dirs": [ - "." - ] - } - \ No newline at end of file diff --git a/src/3d/prelude/EverParse3dPrelude.fst.config.json b/src/3d/prelude/EverParse3dPrelude.fst.config.json deleted file mode 100644 index f3dcb21e8..000000000 --- a/src/3d/prelude/EverParse3dPrelude.fst.config.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "fstar_exe": "fstar.exe", - "options": [ - "--max_fuel", "0", - "--max_ifuel", "2", - "--initial_ifuel", "2" - ], - "include_dirs": [ - "${EVERPARSE_HOME}/src/lowparse", - "${KRML_HOME}/krmllib", - "${KRML_HOME}/krmllib/obj", - "${EVERPARSE_HOME}/src/3d/prelude" - ] - } - \ No newline at end of file