diff options
| author |   Jonathan Aillet <jonathan.aillet@iot.bzh> | 2018-05-23 20:44:01 +0200 |
|---|---|---|
| committer | Jonathan Aillet <jonathan.aillet@iot.bzh> | 2018-10-08 15:51:00 +0200 |
| commit | d43607bd8665d5710e5258cf237c1f79ec94b7d9 (patch) | |
| tree | 93c764d1fad1c7ae5b90115db0c6ef3b191b6f6d | |
| parent | 7013c6de6bd016a5d30d73958a9b484e458ef23f (diff) | |
Change the name of controller configuration files
Change the name of controller configuration files to be sure that
they will be found during 'CtlConfigScan'.
Add the name that the binder should take into config.cmake
to be sure that the controller configuration files will be
found during 'CtlConfigScan'.
Change-Id: I94c55c186c52f6f89b06400133cfbce36221d245
Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
| -rw-r--r-- | 4a-hal-references-boards-cfg/hal-4a-sample1.json (renamed from 4a-hal-references-boards-cfg/4a-hal-sample1.json) | 0 | ||||
| -rw-r--r-- | 4a-hal-references-boards-cfg/hal-4a-sample2.json (renamed from 4a-hal-references-boards-cfg/4a-hal-sample2.json) | 0 | ||||
| -rw-r--r-- | 4a-hal/4a-hal-controllers/4a-hal-controllers-api-loader.c | 4 | ||||
| -rw-r--r-- | conf.d/cmake/config.cmake | 2 |
4 files changed, 3 insertions, 3 deletions
diff --git a/4a-hal-references-boards-cfg/4a-hal-sample1.json b/4a-hal-references-boards-cfg/hal-4a-sample1.json index a93a4be..a93a4be 100644 --- a/4a-hal-references-boards-cfg/4a-hal-sample1.json +++ b/4a-hal-references-boards-cfg/hal-4a-sample1.json diff --git a/4a-hal-references-boards-cfg/4a-hal-sample2.json b/4a-hal-references-boards-cfg/hal-4a-sample2.json index 8448b4f..8448b4f 100644 --- a/4a-hal-references-boards-cfg/4a-hal-sample2.json +++ b/4a-hal-references-boards-cfg/hal-4a-sample2.json diff --git a/4a-hal/4a-hal-controllers/4a-hal-controllers-api-loader.c b/4a-hal/4a-hal-controllers/4a-hal-controllers-api-loader.c index a862fbd..834d717 100644 --- a/4a-hal/4a-hal-controllers/4a-hal-controllers-api-loader.c +++ b/4a-hal/4a-hal-controllers/4a-hal-controllers-api-loader.c @@ -192,9 +192,9 @@ int HalCtlsCreateAllApi(afb_dynapi *apiHandle, struct HalMgrData *HalMgrGlobalDa if(! dirList) dirList = CONTROL_CONFIG_PATH; - configJ = CtlConfigScan(dirList, "4a"); + configJ = CtlConfigScan(dirList, "hal"); if(! configJ) { - AFB_DYNAPI_ERROR(apiHandle, "%s: No 4a*.json config file(s) found in %s ", __func__, dirList); + AFB_DYNAPI_ERROR(apiHandle, "%s: No hal-(binder-middle-name)*.json config file(s) found in %s ", __func__, dirList); return -2; } diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake index b5bc27e..8cb6bb8 100644 --- a/conf.d/cmake/config.cmake +++ b/conf.d/cmake/config.cmake @@ -198,7 +198,7 @@ set(AFB_REMPORT "1234" CACHE PATH "Default binder listening port") # Print a helper message when every thing is finished # ---------------------------------------------------- -set(CLOSING_MESSAGE "Typical binding launch: afb-daemon --port=${AFB_REMPORT} --workdir=${CMAKE_BINARY_DIR}/package --ldpaths=lib --roothttp=htdocs --token=\"${AFB_TOKEN}\" --tracereq=common --verbose") +set(CLOSING_MESSAGE "Typical binding launch: afb-daemon --name=4a --port=${AFB_REMPORT} --workdir=${CMAKE_BINARY_DIR}/package --ldpaths=lib --roothttp=htdocs --token=\"${AFB_TOKEN}\" --tracereq=common --verbose") set(PACKAGE_MESSAGE "Install widget file using in the target : afm-util install ${PROJECT_NAME}.wgt") # Optional schema validator about now only XML, LUA and JSON |