diff options
| author |   José Bollo <jose.bollo@iot.bzh> | 2018-07-19 14:09:17 +0200 |
|---|---|---|
| committer | José Bollo <jose.bollo@iot.bzh> | 2018-07-19 16:33:08 +0200 |
| commit | b798adf312fe0510d8a26dec7f57dacfefcd275c (patch) | |
| tree | 066ee6a8380c4e25850719e206031ffb98f84017 /docs | |
| parent | ec39d7d5e370e75a29fc7cc01607bcf8bc5b18af (diff) | |
Fix errors in migration to V3
Fix a tiny error in the migration script and improve it.
Fix declaration of afb_daemon_get... without args for
binding V3 compatibility.
Fix declaration of afb_api_event_handler_...
Fix the correct URL to the sed script:
valid: https://git.automotivelinux.org/src/app-framework-binder/plain/docs/migration-to-binding-v3.sed
invalid: https://git.automotivelinux.org/src/app-framework-binder/tree/docs/migration-to-binding-v3.sed
Bug-AGL: SPEC-1595
Change-Id: I245b20a9c14634a94c69420312afbd97628bc750
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/afb-migration-to-binding-v3.md | 6 | ||||
| -rw-r--r-- | docs/migration-to-binding-v3.sed | 15 |
2 files changed, 14 insertions, 7 deletions
diff --git a/docs/afb-migration-to-binding-v3.md b/docs/afb-migration-to-binding-v3.md index 501c79fa..266a8b0c 100644 --- a/docs/afb-migration-to-binding-v3.md +++ b/docs/afb-migration-to-binding-v3.md @@ -91,12 +91,16 @@ you want to upgrade. It can be done using **curl** and applied using **sed** as below. ```bash -BASE=https://git.automotivelinux.org/src/app-framework-binder/tree +BASE=https://git.automotivelinux.org/src/app-framework-binder/plain SED=migration-to-binding-v3.sed curl -o $SED $BASE/docs/$SED sed -i -f $SED file1 file2 file3... ``` +You can also follow +[this link](https://git.automotivelinux.org/src/app-framework-binder/plain/docs/migration-to-binding-v3.sed) +and save the file. + This automatic action does most of the boring job but not all the job. The remaining of this guide explains the missing part. diff --git a/docs/migration-to-binding-v3.sed b/docs/migration-to-binding-v3.sed index a6682051..13a78f54 100644 --- a/docs/migration-to-binding-v3.sed +++ b/docs/migration-to-binding-v3.sed @@ -40,7 +40,7 @@ s:\<afb_api_make_eventid\>:afb_api_make_event:g s:\<afb_api_new_api\>:-!&:g s:\<afb_api_sub_verb\>:afb_api_del_verb:g -# udate legacy calls +# update legacy calls # ------------------ s:\<afb_req_subcall\(_req\)\>:afb_req_subcall_legacy:g s:\<afb_req_subcall_sync\>:afb_req_subcall_sync_legacy:g @@ -48,11 +48,14 @@ s:\<afb_api_call\>:afb_api_call_legacy:g s:\<afb_api_call_sync\>:afb_api_call_sync_legacy:g s:\<afb_req_store\>:afb_req_addref:g s:\<afb_req_unstore\> *( *\(.*\) *):\1:g -s:\<afb_daemon_\([a-z_0-9]* *(\):afb_api_\1afbBindingV3root,:g -s:\<afb_daemon_\([a-z_0-9]* *(\):afb_api_\1afbBindingV3root,:g -s:\<afb_service_call_\([a-z_0-9]*\)\( *(\):afb_api_\1_legacy\2afbBindingV3root,:g -s:\<afb_service_\([a-z_0-9]* *(\):afb_api_\1afbBindingV3root,:g -s:\<AFB_\(\(ERROR\|WARNING\|NOTICE\|INFO\|DEBUG\)\> *(\):AFB_API_\1afbBindingV3root,:g + +# optional but activated by default +# --------------------------------- +s:\<afb_daemon_get_\(event_loop\|user_bus\|system_bus\)[ \t]*(:afb_api_get_\1(afbBindingV3root:g +s:\<afb_daemon_\([a-z_0-9]* *(\):afb_api_\1afbBindingV3root, :g +s:\<afb_service_call_\([a-z_0-9]*\)\( *(\):afb_api_\1_legacy\2afbBindingV3root, :g +s:\<afb_service_\([a-z_0-9]* *(\):afb_api_\1afbBindingV3root, :g +s:\<AFB_\(\(ERROR\|WARNING\|NOTICE\|INFO\|DEBUG\)\> *(\):AFB_API_\1afbBindingV3root, :g # special app-controller # ---------------------- |