X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=nbproject%2Fconfigurations.xml;h=e7a060ac7a21c0a85cb343bd2cb88929241fe893;hb=a63851bb4726c89d9a3c5755d78d1c4bbc3f3b2e;hp=449cdafc27d6509b82379ffdde0a3821545e25cc;hpb=33c9353cce432422fea4ba61ab17b20dd8cfe800;p=src%2Fapp-framework-binder.git

diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml
index 449cdafc..e7a060ac 100644
--- a/nbproject/configurations.xml
+++ b/nbproject/configurations.xml
@@ -3,6 +3,10 @@
   <logicalFolder name="root" displayName="root" projectFiles="true" kind="ROOT">
     <df root="." name="0">
       <df name="plugins">
+        <df name="afm-main-plugin">
+          <in>afm-main-plugin.c</in>
+          <in>utils-jbus.c</in>
+        </df>
         <df name="audio">
           <in>audio-alsa.c</in>
           <in>audio-api.c</in>
@@ -12,6 +16,7 @@
           <in>radio-rtlsdr.c</in>
         </df>
         <df name="samples">
+          <in>ClientCtx.c</in>
           <in>HelloWorld.c</in>
           <in>SamplePost.c</in>
         </df>
@@ -24,6 +29,7 @@
         <in>alsa-api.c</in>
         <in>config.c</in>
         <in>dbus-api.c</in>
+        <in>helper-api.c</in>
         <in>http-svc.c</in>
         <in>main.c</in>
         <in>radio-api.c</in>
@@ -64,9 +70,8 @@
         <rebuildPropChanged>false</rebuildPropChanged>
       </toolsSet>
       <flagsDictionary>
-        <element flagsID="0" commonFlags="-fPIC"/>
-        <element flagsID="1" commonFlags="-fPIE"/>
-        <element flagsID="2" commonFlags="-mtune=generic -march=x86-64 -fPIC"/>
+        <element flagsID="0" commonFlags="-fPIE"/>
+        <element flagsID="1" commonFlags="-mtune=generic -march=x86-64 -fPIC"/>
       </flagsDictionary>
       <codeAssistance>
       </codeAssistance>
@@ -76,7 +81,7 @@
           <buildCommand>${MAKE} -f Makefile</buildCommand>
           <cleanCommand>${MAKE} -f Makefile clean</cleanCommand>
           <executablePath>build/afb-daemon</executablePath>
-          <cTool flags="2">
+          <cTool flags="1">
           </cTool>
         </makeTool>
         <preBuild>
@@ -91,24 +96,43 @@
             <pElem>include</pElem>
             <pElem>/usr/include/json-c</pElem>
             <pElem>/usr/include/uuid</pElem>
-            <pElem>/usr/include/alsa</pElem>
           </incDir>
         </cTool>
       </folder>
+      <folder path="0/plugins/afm-main-plugin">
+        <cTool>
+          <incDir>
+            <pElem>plugins/afm-main-plugin</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PLUGIN_INSTALL_DIR="/usr/local/lib64/afb"</Elem>
+            <Elem>__PIC__=2</Elem>
+            <Elem>__REGISTER_PREFIX__=</Elem>
+            <Elem>__USER_LABEL_PREFIX__=</Elem>
+            <Elem>__pic__=2</Elem>
+            <Elem>afm_main_api_EXPORTS=1</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
       <folder path="0/plugins/audio">
         <cTool>
           <incDir>
-            <pElem>build/plugins/audio</pElem>
+            <pElem>plugins/audio</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PLUGIN_INSTALL_DIR="/usr/local/lib64/afb"</Elem>
-            <Elem>audio_api_EXPORTS</Elem>
+            <Elem>__PIC__=2</Elem>
+            <Elem>__REGISTER_PREFIX__=</Elem>
+            <Elem>__USER_LABEL_PREFIX__=</Elem>
+            <Elem>__pic__=2</Elem>
+            <Elem>audio_api_EXPORTS=1</Elem>
           </preprocessorList>
         </cTool>
       </folder>
       <folder path="0/plugins/radio">
         <cTool>
           <incDir>
+            <pElem>/usr/include/alsa</pElem>
             <pElem>/usr/include/libusb-1.0</pElem>
             <pElem>build/plugins</pElem>
             <pElem>plugins/radio</pElem>
@@ -119,60 +143,115 @@
       <folder path="0/plugins/samples">
         <cTool>
           <incDir>
+            <pElem>plugins/samples</pElem>
             <pElem>build/plugins/samples</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PLUGIN_INSTALL_DIR="/usr/local/lib64/afb"</Elem>
+            <Elem>__PIC__=2</Elem>
+            <Elem>__REGISTER_PREFIX__=</Elem>
+            <Elem>__USER_LABEL_PREFIX__=</Elem>
+            <Elem>__pic__=2</Elem>
           </preprocessorList>
         </cTool>
       </folder>
       <folder path="0/plugins/session">
         <cTool>
           <incDir>
+            <pElem>plugins/session</pElem>
             <pElem>build/plugins/session</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PLUGIN_INSTALL_DIR="/usr/local/lib64/afb"</Elem>
-            <Elem>token_api_EXPORTS</Elem>
+            <Elem>__PIC__=2</Elem>
+            <Elem>__REGISTER_PREFIX__=</Elem>
+            <Elem>__USER_LABEL_PREFIX__=</Elem>
+            <Elem>__pic__=2</Elem>
+            <Elem>token_api_EXPORTS=1</Elem>
           </preprocessorList>
         </cTool>
       </folder>
+      <item path="plugins/afm-main-plugin/afm-main-plugin.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+        <cTool flags="1">
+          <incDir>
+            <pElem>include</pElem>
+            <pElem>/usr/include/uuid</pElem>
+            <pElem>build/plugins/afm-main-plugin</pElem>
+          </incDir>
+        </cTool>
+      </item>
+      <item path="plugins/afm-main-plugin/utils-jbus.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+        <cTool flags="1">
+          <incDir>
+            <pElem>/usr/lib64/dbus-1.0/include/dbus</pElem>
+            <pElem>/usr/include/dbus-1.0/dbus</pElem>
+            <pElem>/usr/include/dbus-1.0</pElem>
+            <pElem>/usr/lib64/dbus-1.0/include</pElem>
+            <pElem>build/plugins/afm-main-plugin</pElem>
+          </incDir>
+        </cTool>
+      </item>
       <item path="plugins/audio/audio-alsa.c" ex="false" tool="0" flavor2="2">
-        <cTool flags="0">
+        <cTool flags="1">
+          <incDir>
+            <pElem>include</pElem>
+            <pElem>/usr/include/json-c</pElem>
+            <pElem>/usr/include/uuid</pElem>
+            <pElem>build/plugins/audio</pElem>
+          </incDir>
         </cTool>
       </item>
       <item path="plugins/audio/audio-api.c" ex="false" tool="0" flavor2="2">
-        <cTool flags="0">
+        <cTool flags="1">
+          <incDir>
+            <pElem>/usr/include/json-c</pElem>
+            <pElem>include</pElem>
+            <pElem>/usr/include/uuid</pElem>
+            <pElem>build/plugins/audio</pElem>
+          </incDir>
         </cTool>
       </item>
       <item path="plugins/radio/radio-api.c" ex="false" tool="0" flavor2="2">
-        <cTool flags="2">
+        <cTool flags="1">
         </cTool>
       </item>
       <item path="plugins/radio/radio-rtlsdr.c" ex="false" tool="0" flavor2="2">
-        <cTool flags="2">
+        <cTool flags="1">
+        </cTool>
+      </item>
+      <item path="plugins/samples/ClientCtx.c" ex="false" tool="0" flavor2="2">
+        <cTool flags="1">
+          <preprocessorList>
+            <Elem>clientCtx_api_EXPORTS=1</Elem>
+          </preprocessorList>
         </cTool>
       </item>
       <item path="plugins/samples/HelloWorld.c" ex="false" tool="0" flavor2="2">
-        <cTool flags="0">
+        <cTool flags="1">
           <preprocessorList>
-            <Elem>helloWorld_api_EXPORTS</Elem>
+            <Elem>helloWorld_api_EXPORTS=1</Elem>
           </preprocessorList>
         </cTool>
       </item>
       <item path="plugins/samples/SamplePost.c" ex="false" tool="0" flavor2="2">
-        <cTool flags="0">
+        <cTool flags="1">
           <preprocessorList>
-            <Elem>samplePost_api_EXPORTS</Elem>
+            <Elem>samplePost_api_EXPORTS=1</Elem>
           </preprocessorList>
         </cTool>
       </item>
       <item path="plugins/session/token-api.c" ex="false" tool="0" flavor2="2">
-        <cTool flags="0">
+        <cTool flags="1">
         </cTool>
       </item>
       <item path="src/afbs-api.c" ex="false" tool="0" flavor2="2">
-        <cTool flags="1">
+        <cTool flags="0">
           <incDir>
             <pElem>plugins/audio</pElem>
             <pElem>/usr/include/json-c</pElem>
@@ -186,7 +265,7 @@
         </cTool>
       </item>
       <item path="src/alsa-api.c" ex="false" tool="0" flavor2="2">
-        <cTool flags="1">
+        <cTool flags="0">
           <incDir>
             <pElem>plugins/audio</pElem>
             <pElem>/usr/include/json-c</pElem>
@@ -200,22 +279,25 @@
         </cTool>
       </item>
       <item path="src/config.c" ex="false" tool="0" flavor2="2">
-        <cTool flags="0">
+        <cTool flags="1">
           <incDir>
-            <pElem>include</pElem>
+            <pElem>src</pElem>
             <pElem>/usr/include/json-c</pElem>
+            <pElem>include</pElem>
             <pElem>/usr/include/uuid</pElem>
-            <pElem>/usr/include/alsa</pElem>
             <pElem>build/src</pElem>
           </incDir>
           <preprocessorList>
-            <Elem>HAVE_AUDIO_PLUGIN=1</Elem>
             <Elem>PLUGIN_INSTALL_DIR="/usr/local/lib64/afb"</Elem>
+            <Elem>__PIC__=2</Elem>
+            <Elem>__REGISTER_PREFIX__=</Elem>
+            <Elem>__USER_LABEL_PREFIX__=</Elem>
+            <Elem>__pic__=2</Elem>
           </preprocessorList>
         </cTool>
       </item>
       <item path="src/dbus-api.c" ex="false" tool="0" flavor2="2">
-        <cTool flags="1">
+        <cTool flags="0">
           <incDir>
             <pElem>plugins/audio</pElem>
             <pElem>/usr/include/json-c</pElem>
@@ -228,38 +310,48 @@
           </incDir>
         </cTool>
       </item>
-      <item path="src/http-svc.c" ex="false" tool="0" flavor2="2">
-        <cTool flags="0">
+      <item path="src/helper-api.c" ex="false" tool="0" flavor2="2">
+        <cTool flags="1">
           <incDir>
+            <pElem>src</pElem>
+            <pElem>/usr/include/json-c</pElem>
             <pElem>include</pElem>
+            <pElem>/usr/include/uuid</pElem>
+            <pElem>build/src</pElem>
+          </incDir>
+        </cTool>
+      </item>
+      <item path="src/http-svc.c" ex="false" tool="0" flavor2="2">
+        <cTool flags="1">
+          <incDir>
+            <pElem>src</pElem>
             <pElem>/usr/include/json-c</pElem>
+            <pElem>include</pElem>
             <pElem>/usr/include/uuid</pElem>
-            <pElem>/usr/include/alsa</pElem>
             <pElem>build/src</pElem>
           </incDir>
-          <preprocessorList>
-            <Elem>HAVE_AUDIO_PLUGIN=1</Elem>
-            <Elem>PLUGIN_INSTALL_DIR="/usr/local/lib64/afb"</Elem>
-          </preprocessorList>
         </cTool>
       </item>
       <item path="src/main.c" ex="false" tool="0" flavor2="2">
-        <cTool flags="0">
+        <cTool flags="1">
           <incDir>
-            <pElem>include</pElem>
+            <pElem>src</pElem>
             <pElem>/usr/include/json-c</pElem>
+            <pElem>include</pElem>
             <pElem>/usr/include/uuid</pElem>
-            <pElem>/usr/include/alsa</pElem>
             <pElem>build/src</pElem>
           </incDir>
           <preprocessorList>
-            <Elem>HAVE_AUDIO_PLUGIN=1</Elem>
             <Elem>PLUGIN_INSTALL_DIR="/usr/local/lib64/afb"</Elem>
+            <Elem>__PIC__=2</Elem>
+            <Elem>__REGISTER_PREFIX__=</Elem>
+            <Elem>__USER_LABEL_PREFIX__=</Elem>
+            <Elem>__pic__=2</Elem>
           </preprocessorList>
         </cTool>
       </item>
       <item path="src/radio-api.c" ex="false" tool="0" flavor2="2">
-        <cTool flags="1">
+        <cTool flags="0">
           <incDir>
             <pElem>plugins/audio</pElem>
             <pElem>/usr/include/json-c</pElem>
@@ -277,32 +369,31 @@
         </cTool>
       </item>
       <item path="src/rest-api.c" ex="false" tool="0" flavor2="2">
-        <cTool flags="0">
+        <cTool flags="1">
           <incDir>
-            <pElem>include</pElem>
+            <pElem>src</pElem>
             <pElem>/usr/include/json-c</pElem>
+            <pElem>include</pElem>
             <pElem>/usr/include/uuid</pElem>
-            <pElem>/usr/include/alsa</pElem>
             <pElem>build/src</pElem>
           </incDir>
-          <preprocessorList>
-            <Elem>HAVE_AUDIO_PLUGIN=1</Elem>
-            <Elem>PLUGIN_INSTALL_DIR="/usr/local/lib64/afb"</Elem>
-          </preprocessorList>
         </cTool>
       </item>
       <item path="src/session.c" ex="false" tool="0" flavor2="2">
-        <cTool flags="0">
+        <cTool flags="1">
           <incDir>
-            <pElem>include</pElem>
+            <pElem>src</pElem>
             <pElem>/usr/include/json-c</pElem>
             <pElem>/usr/include/uuid</pElem>
-            <pElem>/usr/include/alsa</pElem>
+            <pElem>include</pElem>
             <pElem>build/src</pElem>
           </incDir>
           <preprocessorList>
-            <Elem>HAVE_AUDIO_PLUGIN=1</Elem>
             <Elem>PLUGIN_INSTALL_DIR="/usr/local/lib64/afb"</Elem>
+            <Elem>__PIC__=2</Elem>
+            <Elem>__REGISTER_PREFIX__=</Elem>
+            <Elem>__USER_LABEL_PREFIX__=</Elem>
+            <Elem>__pic__=2</Elem>
           </preprocessorList>
         </cTool>
       </item>