diff --git a/ivette/Makefile b/ivette/Makefile index 61a31e5f29c3d8212ae4b664bacabd92e72444d9..e09816470ddc9d607c1d555f469ab776c69cf682 100644 --- a/ivette/Makefile +++ b/ivette/Makefile @@ -107,8 +107,7 @@ update-distrib-files: api: @echo "[Ivette] Generating TypeScript API" @find src/frama-c -path "*/api/*" -name "*.ts" -exec rm -f {} \; - ../bin/frama-c.byte \ - -load-module src/frama-c/api_generator.ml \ + ../bin/frama-c \ -server-tsc @find src/frama-c -path "*/api/*" -name "*.ts" \ -exec headache \ diff --git a/ivette/src/frama-c/kernel/api/services/index.ts b/ivette/src/frama-c/kernel/api/services/index.ts index 5cd79c35c7b1775bb80693317ee2e978c1fd1576..56868eadf193ee1f571fa2c1ca9d164db8c0d8f5 100644 --- a/ivette/src/frama-c/kernel/api/services/index.ts +++ b/ivette/src/frama-c/kernel/api/services/index.ts @@ -64,15 +64,14 @@ import { tag } from 'frama-c/kernel/api/data'; const getConfig_internal: Server.GetRequest< null, - { pluginpath: string[], libdir: string, datadir: string, version: string } + { pluginpath: string[], datadir: string[], version: string } > = { kind: Server.RqKind.GET, name: 'kernel.services.getConfig', input: Json.jNull, output: Json.jObject({ pluginpath: Json.jList(Json.jString), - libdir: Json.jFail(Json.jString,'String expected'), - datadir: Json.jFail(Json.jString,'String expected'), + datadir: Json.jList(Json.jString), version: Json.jFail(Json.jString,'String expected'), }), signals: [], @@ -80,7 +79,7 @@ const getConfig_internal: Server.GetRequest< /** Frama-C Kernel configuration */ export const getConfig: Server.GetRequest< null, - { pluginpath: string[], libdir: string, datadir: string, version: string } + { pluginpath: string[], datadir: string[], version: string } >= getConfig_internal; const load_internal: Server.SetRequest<string,string | undefined> = {