afm-unit.conf: cleanup of generation

The generation files are reworked to improve
their evolution and maintainability:

 - the Makefile now refers to any .inc file
 - the macros are isolated from the skeleton
 - main iterators are managed in the skeleton
 - improve management of UNIT_NAME_BASE

Bug-AGL: SPEC-2436

Change-Id: I0877eb0149c9362be3290ed2c146cc69fc6bf718
Signed-off-by: José Bollo <jose.bollo@iot.bzh>

1 files changed, 21 insertions, 17 deletions

diff --git a/conf/unit/afm-unit.conf.in b/conf/unit/afm-unit.conf.in
index 02dd82d..e9585f0 100644
--- a/conf/unit/afm-unit.conf.in
+++ b/conf/unit/afm-unit.conf.in
@@ -1,4 +1,4 @@
-;---------------------------------------------------------------------------------
+;-------------------------------------------------------------------------------
 ; File:
 ;
 ;    afm-unit.conf
@@ -74,11 +74,14 @@
 ;              Records the installation directory path in the field "wgtdir"
 ;              of the private object only.
 ;
-;---------------------------------------------------------------------------------
+;-------------------------------------------------------------------------------
+;----        F O R E A C H   T A R G E T                                    ----
+;-------------------------------------------------------------------------------
 {{#targets}}
-;---------------------------------------------------------------------------------
-;----         M A I N    P A R T    O F   T H E   S E R V I C E               ----
-;---------------------------------------------------------------------------------
+;-------------------------------------------------------------------------------
+;-------------------------------------------------------------------------------
+;----         M A I N    P A R T    O F   T H E   S E R V I C E             ----
+;-------------------------------------------------------------------------------
 %begin systemd-unit
 # auto generated by wgtpkg-unit for {{:id}} version {{:version}} target {{:#target}} of {{:idaver}}
 %nl
@@ -163,9 +166,9 @@ SyslogIdentifier=afbd-{{idaver}}{{^#target=main}}@{{:#target}}{{/#target=main}}
 StandardInput=null
 StandardOutput=journal
 StandardError=journal
-;---------------------------------------------------------------------------------
-;----   text/html  application/vnd.agl.native  application/vnd.agl.service    ----
-;---------------------------------------------------------------------------------
+;-------------------------------------------------------------------------------
+;----   text/html  application/vnd.agl.native  application/vnd.agl.service  ----
+;-------------------------------------------------------------------------------
 {{#content.type=text/html|application/vnd.agl.native|application/vnd.agl.service}}
 {{^content.type=application/vnd.agl.service}}
 X-AFM--http-port={{:#metatarget.http-port}}
@@ -202,23 +205,23 @@ ExecStart=/usr/bin/afb-daemon \
 	{{#content.type=text/html}}--exec /usr/bin/web-runtime http://localhost:@p/{{content.src}}?token=@t{{/content.type=text/html}} \
 	{{#content.type=application/vnd.agl.native}}--exec {{:#metadata.install-dir}}/{{content.src}} @p @t{{/content.type=application/vnd.agl.native}}
 {{/content.type=text/html|application/vnd.agl.native|application/vnd.agl.service}}
-;---------------------------------------------------------------------------------
-;----                 application/x-executable                                ----
-;---------------------------------------------------------------------------------
+;-------------------------------------------------------------------------------
+;----                 application/x-executable                              ----
+;-------------------------------------------------------------------------------
 {{#content.type=application/x-executable}}
 ExecStart={{:#metadata.install-dir}}/{{content.src}}
 {{/content.type=application/x-executable}}
 {{#required-permission.@afm_prefix@permission::system:run-by-default}}
-;---------------------------------------------------------------------------------
+;-------------------------------------------------------------------------------
 ; auto start
-;---------------------------------------------------------------------------------
+;-------------------------------------------------------------------------------
 [Install]
 WantedBy=afm-user-session@.target
 %systemd-unit wanted-by afm-user-session@.target
 {{/required-permission.@afm_prefix@permission::system:run-by-default}}
 %end systemd-unit
 ;-------------------------------------------------------------------------------
-;----        P R O V I D E D   A P I S                                      ----
+;----        F O R E A C H   P R O V I D E D   A P I S                      ----
 ;-------------------------------------------------------------------------------
 {{#provided-api}}
 {{#value=ws|auto}}
@@ -264,7 +267,7 @@ Service=afm-{{#required-permission.@afm_prefix@permission::public:hidden}}servic
 {{/value=ws|auto}}
 {{/provided-api}}
 ;-------------------------------------------------------------------------------
-;----        P R O V I D E D   B I N D I N G                                ----
+;----        F O R E A C H   P R O V I D E D   B I N D I N G                ----
 ;-------------------------------------------------------------------------------
 {{#provided-binding}}
 ;-------------------------------------------------------------------------------
@@ -284,7 +287,8 @@ RemainAfterExit=yes
 ExecStart=/bin/ln -sf {{:#metadata.install-dir}}/{{value}} @afm_users_rundir@/%i/apis/link/{{name}}
 %end systemd-unit
 {{/provided-binding}}
+;-------------------------------------------------------------------------------
 {{/targets}}
-;---------------------------------------------------------------------------------
+;-------------------------------------------------------------------------------
 ; End of file afm-unit.conf mode RELEASE
-;---------------------------------------------------------------------------------
+;-------------------------------------------------------------------------------