diff --git a/.gitignore b/.gitignore index 2b4f54f21d9cf186ece79748c5ccf45d6620dc45..993b9c8b2112ae1fd38f410d6e1e1d5cd504da02 100644 --- a/.gitignore +++ b/.gitignore @@ -54,6 +54,7 @@ _build /dev/fc-time /dev/fc-memuse /bin/ocamldep_transitive_closure +/bin/ivette #share /share/Makefile.config diff --git a/Makefile b/Makefile index 9d94325ae423e998f608e5d2d06ac95347178f4e..cccd90e1305ba9f8cdc448f87a2fee4122d37c47 100644 --- a/Makefile +++ b/Makefile @@ -73,6 +73,18 @@ endif dune clean rm -rf _build .merlin +############################################################################## +# IVETTE +################################ + +.PHONY: ivette ivette-dev + +ivette: + @$(MAKE) -C ivette + +ivette-dev: + @$(MAKE) -C ivette dev + ############################################################################## # HELP ################################ diff --git a/ivette/.gitignore b/ivette/.gitignore index 5137465dd358ebe9aa0f203fc100c0b4cae255b5..08b3cc95e60a655d4d140fb6f410ec9dbedb4ebc 100644 --- a/ivette/.gitignore +++ b/ivette/.gitignore @@ -9,7 +9,6 @@ .eslint-cache node_modules yarn-error.log -/bin /dist /doc/html /src/renderer/loader.ts diff --git a/ivette/Makefile b/ivette/Makefile index 84dc2b6ad5acadfdc84b34dcd8cd4d92a1f949b9..c038ba8aca794a3e0ad176fa49e5c1a97b940f8c 100644 --- a/ivette/Makefile +++ b/ivette/Makefile @@ -23,9 +23,9 @@ # -------------------------------------------------------------------------- APP=Ivette DOME=./src/dome -DOME_ARGS=--command $$(dirname $$0)/../../bin/frama-c +DOME_ARGS=--command $$(dirname $$0)/frama-c DOME_DEV=-server-debug 1 -DOME_CLI=./bin/ivette +DOME_CLI=../bin/ivette DOME_API=./src/frama-c DOME_CUSTOM_ENTRIES= yes COPYRIGHT=CEA LIST / LSL