From 9e4ed8ca4fe7bddc67d3a1baa00b3742563846e4 Mon Sep 17 00:00:00 2001
From: Allan Blanchard <allan.blanchard@cea.fr>
Date: Tue, 7 Jun 2022 17:19:45 +0200
Subject: [PATCH] [Ivette] Make API
---
ivette/Makefile | 3 +--
ivette/src/frama-c/kernel/api/services/index.ts | 7 +++----
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/ivette/Makefile b/ivette/Makefile
index 61a31e5f29c..e09816470dd 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 5cd79c35c7b..56868eadf19 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> = {
--
GitLab