diff options
| -rw-r--r-- | ctl-lib/CMakeLists.txt (renamed from ctl-dispatch/CMakeLists.txt) | 0 | ||||
| -rw-r--r-- | ctl-lib/ctl-action.c (renamed from ctl-dispatch/ctl-action.c) | 0 | ||||
| -rw-r--r-- | ctl-lib/ctl-config.c (renamed from ctl-dispatch/ctl-config.c) | 0 | ||||
| -rw-r--r-- | ctl-lib/ctl-config.h (renamed from ctl-dispatch/ctl-config.h) | 0 | ||||
| -rw-r--r-- | ctl-lib/ctl-lua.c (renamed from ctl-dispatch/ctl-lua.c) | 0 | ||||
| -rw-r--r-- | ctl-lib/ctl-lua.h (renamed from ctl-dispatch/ctl-lua.h) | 0 | ||||
| -rw-r--r-- | ctl-lib/ctl-onload.c (renamed from ctl-dispatch/ctl-onload.c) | 0 | ||||
| -rw-r--r-- | ctl-lib/ctl-plugin.c (renamed from ctl-dispatch/ctl-plugin.c) | 0 | ||||
| -rw-r--r-- | ctl-lib/ctl-plugin.h (renamed from ctl-dispatch/ctl-plugin.h) | 0 | ||||
| -rw-r--r-- | ctl-lib/ctl-timer.c (renamed from ctl-dispatch/ctl-timer.c) | 0 | ||||
| -rw-r--r-- | ctl-lib/ctl-timer.h (renamed from ctl-dispatch/ctl-timer.h) | 0 | ||||
| -rw-r--r-- | nbproject/configurations.xml | 327 | ||||
| -rw-r--r-- | nbproject/project.xml | 26 |
13 files changed, 0 insertions, 353 deletions
diff --git a/ctl-dispatch/CMakeLists.txt b/ctl-lib/CMakeLists.txt index b3d0c32..b3d0c32 100644 --- a/ctl-dispatch/CMakeLists.txt +++ b/ctl-lib/CMakeLists.txt diff --git a/ctl-dispatch/ctl-action.c b/ctl-lib/ctl-action.c index b24269c..b24269c 100644 --- a/ctl-dispatch/ctl-action.c +++ b/ctl-lib/ctl-action.c diff --git a/ctl-dispatch/ctl-config.c b/ctl-lib/ctl-config.c index b7c0d54..b7c0d54 100644 --- a/ctl-dispatch/ctl-config.c +++ b/ctl-lib/ctl-config.c diff --git a/ctl-dispatch/ctl-config.h b/ctl-lib/ctl-config.h index 2e3a16a..2e3a16a 100644 --- a/ctl-dispatch/ctl-config.h +++ b/ctl-lib/ctl-config.h diff --git a/ctl-dispatch/ctl-lua.c b/ctl-lib/ctl-lua.c index 7b68fe2..7b68fe2 100644 --- a/ctl-dispatch/ctl-lua.c +++ b/ctl-lib/ctl-lua.c diff --git a/ctl-dispatch/ctl-lua.h b/ctl-lib/ctl-lua.h index 6f2ce7d..6f2ce7d 100644 --- a/ctl-dispatch/ctl-lua.h +++ b/ctl-lib/ctl-lua.h diff --git a/ctl-dispatch/ctl-onload.c b/ctl-lib/ctl-onload.c index 97bd109..97bd109 100644 --- a/ctl-dispatch/ctl-onload.c +++ b/ctl-lib/ctl-onload.c diff --git a/ctl-dispatch/ctl-plugin.c b/ctl-lib/ctl-plugin.c index f589035..f589035 100644 --- a/ctl-dispatch/ctl-plugin.c +++ b/ctl-lib/ctl-plugin.c diff --git a/ctl-dispatch/ctl-plugin.h b/ctl-lib/ctl-plugin.h index e0ab3dd..e0ab3dd 100644 --- a/ctl-dispatch/ctl-plugin.h +++ b/ctl-lib/ctl-plugin.h diff --git a/ctl-dispatch/ctl-timer.c b/ctl-lib/ctl-timer.c index 1de6f99..1de6f99 100644 --- a/ctl-dispatch/ctl-timer.c +++ b/ctl-lib/ctl-timer.c diff --git a/ctl-dispatch/ctl-timer.h b/ctl-lib/ctl-timer.h index b08299f..b08299f 100644 --- a/ctl-dispatch/ctl-timer.h +++ b/ctl-lib/ctl-timer.h diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml deleted file mode 100644 index 172a65b..0000000 --- a/nbproject/configurations.xml +++ /dev/null @@ -1,327 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<configurationDescriptor version="100"> - <logicalFolder name="root" displayName="root" projectFiles="true" kind="ROOT"> - <df root="." name="0"> - <df name="afb-source"> - <in>ctl-binding.c</in> - <in>ctl-dispatch.c</in> - <in>ctl-lua.c</in> - <in>ctl-plugin-sample.c</in> - <in>ctl-policy.c</in> - <in>ctl-timer.c</in> - <in>filescan-utils.c</in> - <in>wrap-json.c</in> - </df> - <df name="afb-utilities"> - <in>filescan-utils.c</in> - <in>wrap-json.c</in> - </df> - <df name="build"> - <df name="CMakeFiles"> - <df name="3.5.2"> - <df name="CompilerIdC"> - <in>CMakeCCompilerId.c</in> - </df> - <df name="CompilerIdCXX"> - <in>CMakeCXXCompilerId.cpp</in> - </df> - </df> - <in>feature_tests.c</in> - <in>feature_tests.cxx</in> - </df> - </df> -<<<<<<< Updated upstream - <df name="ctl-binding"> - <in>ctl-binding.c</in> - <in>ctl-dispatch.c</in> - <in>ctl-lua.c</in> - <in>ctl-timer.c</in> - </df> - <df name="ctl-plugin"> - <in>ctl-plugin-sample.c</in> - </df> -======= ->>>>>>> Stashed changes - </df> - <logicalFolder name="ExternalFiles" - displayName="Important Files" - projectFiles="false" - kind="IMPORTANT_FILES_FOLDER"> - <itemPath>CMakeLists.txt</itemPath> - <itemPath>Makefile</itemPath> - <itemPath>nbproject/private/launcher.properties</itemPath> - </logicalFolder> - </logicalFolder> - <sourceFolderFilter>^(nbproject)$</sourceFolderFilter> - <sourceRootList> - <Elem>.</Elem> - </sourceRootList> - <projectmakefile>Makefile</projectmakefile> - <confs> - <conf name="Default" type="0"> - <toolsSet> - <compilerSet>default</compilerSet> - <dependencyChecking>false</dependencyChecking> - <rebuildPropChanged>false</rebuildPropChanged> - </toolsSet> - <flagsDictionary> - <element flagsID="0" commonFlags="-g -fPIC -fPIC"/> - <element flagsID="1" commonFlags="-mtune=generic -march=x86-64 -g -fPIC"/> - </flagsDictionary> - <codeAssistance> - <includeAdditional>true</includeAdditional> - </codeAssistance> - <makefileType> - <makeTool> - <buildCommandWorkingDir>build</buildCommandWorkingDir> - <buildCommand>${MAKE} -f Makefile</buildCommand> - <cleanCommand>${MAKE} -f Makefile clean</cleanCommand> - <executablePath></executablePath> - <ccTool> - <incDir> - <pElem>.</pElem> - </incDir> - </ccTool> - </makeTool> - <preBuild> - <preBuildCommandWorkingDir>build</preBuildCommandWorkingDir> - <preBuildCommand>cmake ..</preBuildCommand> - </preBuild> - </makefileType> - <item path="afb-source/ctl-binding.c" ex="false" tool="0" flavor2="3"> - <cTool flags="0"> - <incDir> - <pElem>/usr/include/json-c</pElem> - <pElem>../../../opt/include</pElem> - <pElem>/usr/include/p11-kit-1</pElem> - <pElem>/usr/include/lua5.3</pElem> - <pElem>afb-utilities</pElem> - <pElem>build/afb-source</pElem> - </incDir> - <preprocessorList> - <Elem>CONTROL_CONFIG_PATH="/home/fulup/Workspace/AGL-AppFW/afb-controller/conf.d/project/json.d:/home/fulup/opt/afb-controller/json.d"</Elem> - <Elem>CONTROL_CONFIG_POST="control"</Elem> - <Elem>CONTROL_CONFIG_PRE="onload"</Elem> - <Elem>CONTROL_DOSCRIPT_PRE="doscript"</Elem> - <Elem>CONTROL_LUA_EVENT="luaevt"</Elem> - <Elem>CONTROL_LUA_PATH="/home/fulup/Workspace/AGL-AppFW/afb-controller/conf.d/project/lua.d:/home/fulup/opt/controller-plugins/ctl-lua.d"</Elem> - <Elem>CONTROL_MAXPATH_LEN=255</Elem> - <Elem>CONTROL_ONLOAD_PROFILE="onload-default"</Elem> - <Elem>CONTROL_PLUGIN_PATH="/home/fulup/Workspace/AGL-AppFW/afb-controller/build:/home/fulup/opt/afb-controller/lib/controller-plugins:/usr/lib/afb/controller-plugins/ctlplug"</Elem> - <Elem>CONTROL_SUPPORT_LUA</Elem> - <Elem>CTL_PLUGIN_MAGIC=2468013579</Elem> -<<<<<<< Updated upstream - <Elem>NATIVE_LINUX</Elem> - <Elem>controller_EXPORTS</Elem> -======= - <Elem>control_afb_EXPORTS</Elem> ->>>>>>> Stashed changes - </preprocessorList> - </cTool> - </item> - <item path="afb-source/ctl-dispatch.c" ex="false" tool="0" flavor2="3"> - <cTool flags="1"> - <incDir> - <pElem>../../../opt/include/afb</pElem> - <pElem>afb-source</pElem> - <pElem>/usr/include/json-c</pElem> - <pElem>/usr/include/lua5.3</pElem> - <pElem>afb-utilities</pElem> - <pElem>../../../opt/include</pElem> - <pElem>build/afb-source</pElem> - </incDir> - </cTool> - </item> - <item path="afb-source/ctl-lua.c" ex="false" tool="0" flavor2="3"> - <cTool flags="1"> - <incDir> - <pElem>../../../opt/include/afb</pElem> - <pElem>afb-source</pElem> - <pElem>/usr/include/json-c</pElem> - <pElem>/usr/include/lua5.3</pElem> - <pElem>afb-utilities</pElem> - <pElem>../../../opt/include</pElem> - <pElem>build/afb-source</pElem> - </incDir> - </cTool> - </item> - <item path="afb-source/ctl-plugin-sample.c" ex="false" tool="0" flavor2="3"> - <cTool flags="1"> - <incDir> - <pElem>../../../opt/include/afb</pElem> - <pElem>afb-source</pElem> - <pElem>/usr/include/json-c</pElem> - <pElem>/usr/include/lua5.3</pElem> - <pElem>build/afb-source</pElem> - </incDir> - </cTool> - </item> - <item path="afb-source/ctl-policy.c" ex="false" tool="0" flavor2="2"> - <cTool> - <incDir> - <pElem>.</pElem> - </incDir> - </cTool> - </item> - <item path="afb-source/ctl-timer.c" ex="false" tool="0" flavor2="3"> - <cTool flags="1"> - <incDir> - <pElem>../../../opt/include/afb</pElem> - <pElem>afb-source</pElem> - <pElem>../../../opt/include</pElem> - <pElem>build/afb-source</pElem> - </incDir> - </cTool> - </item> - <item path="afb-source/filescan-utils.c" ex="false" tool="0" flavor2="2"> - <cTool> - <incDir> - <pElem>.</pElem> - </incDir> - </cTool> - </item> - <item path="afb-source/wrap-json.c" ex="false" tool="0" flavor2="2"> - <cTool> - <incDir> - <pElem>.</pElem> - </incDir> - </cTool> - </item> - <item path="afb-utilities/filescan-utils.c" ex="false" tool="0" flavor2="3"> - <cTool flags="0"> - <incDir> - <pElem>/usr/include/json-c</pElem> - <pElem>../../../opt/include</pElem> - <pElem>/usr/include/p11-kit-1</pElem> - <pElem>/usr/include/lua5.3</pElem> - <pElem>afb-utilities</pElem> - <pElem>build/afb-utilities</pElem> - </incDir> - <preprocessorList> - <Elem>CONTROL_CONFIG_PATH="/home/fulup/Workspace/AGL-AppFW/afb-controller/conf.d/project/json.d:/home/fulup/opt/afb-controller/json.d"</Elem> - <Elem>CONTROL_CONFIG_POST="control"</Elem> - <Elem>CONTROL_CONFIG_PRE="onload"</Elem> - <Elem>CONTROL_DOSCRIPT_PRE="doscript"</Elem> - <Elem>CONTROL_MAXPATH_LEN=255</Elem> - <Elem>CONTROL_ONLOAD_PROFILE="onload-default"</Elem> - <Elem>CONTROL_PLUGIN_PATH="/home/fulup/Workspace/AGL-AppFW/afb-controller/build:/home/fulup/opt/afb-controller/lib/controller-plugins:/usr/lib/afb/controller-plugins/ctlplug"</Elem> - <Elem>CTL_PLUGIN_MAGIC=2468013579</Elem> - <Elem>NATIVE_LINUX</Elem> - </preprocessorList> - </cTool> - </item> - <item path="afb-utilities/wrap-json.c" ex="false" tool="0" flavor2="3"> - <cTool flags="1"> - <incDir> - <pElem>afb-utilities</pElem> - <pElem>/usr/include/json-c</pElem> - <pElem>build/afb-utilities</pElem> - </incDir> - </cTool> - </item> - <item path="build/CMakeFiles/3.5.2/CompilerIdC/CMakeCCompilerId.c" - ex="false" - tool="0" - flavor2="2"> - </item> - <item path="build/CMakeFiles/3.5.2/CompilerIdCXX/CMakeCXXCompilerId.cpp" - ex="false" - tool="1" - flavor2="4"> - </item> - <item path="build/CMakeFiles/feature_tests.c" ex="false" tool="0" flavor2="2"> - </item> - <item path="build/CMakeFiles/feature_tests.cxx" ex="false" tool="1" flavor2="4"> - </item> -<<<<<<< Updated upstream - <item path="ctl-binding/ctl-binding.c" ex="false" tool="0" flavor2="0"> - <cTool flags="0"> - </cTool> - </item> - <item path="ctl-binding/ctl-dispatch.c" ex="false" tool="0" flavor2="0"> - <cTool flags="0"> - </cTool> - </item> - <item path="ctl-binding/ctl-lua.c" ex="false" tool="0" flavor2="0"> - <cTool flags="0"> - </cTool> - </item> - <item path="ctl-binding/ctl-timer.c" ex="false" tool="0" flavor2="0"> - <cTool flags="0"> - </cTool> - </item> - <item path="ctl-plugin/ctl-plugin-sample.c" ex="false" tool="0" flavor2="3"> - <cTool flags="0"> - </cTool> - </item> -======= ->>>>>>> Stashed changes - <folder path="0/build"> - <cTool> - <incDir> - <pElem>.</pElem> - </incDir> - </cTool> - </folder> -<<<<<<< Updated upstream - <folder path="0/ctl-binding"> - <cTool> - <incDir> - <pElem>/usr/include/json-c</pElem> - <pElem>../../../opt/include</pElem> - <pElem>/usr/include/p11-kit-1</pElem> - <pElem>/usr/include/lua5.3</pElem> - <pElem>ctl-binding</pElem> - <pElem>afb-utilities</pElem> - <pElem>build/ctl-binding</pElem> - </incDir> - <preprocessorList> - <Elem>CONTROL_CONFIG_PATH="/home/fulup/Workspace/AGL-AppFW/afb-controller/conf.d/project/json.d:/home/fulup/opt/afb-controller/json.d"</Elem> - <Elem>CONTROL_CONFIG_POST="control"</Elem> - <Elem>CONTROL_CONFIG_PRE="onload"</Elem> - <Elem>CONTROL_DOSCRIPT_PRE="doscript"</Elem> - <Elem>CONTROL_LUA_EVENT="luaevt"</Elem> - <Elem>CONTROL_LUA_PATH="/home/fulup/Workspace/AGL-AppFW/afb-controller/conf.d/project/lua.d:/home/fulup/opt/controller-plugins/ctl-lua.d"</Elem> - <Elem>CONTROL_MAXPATH_LEN=255</Elem> - <Elem>CONTROL_ONLOAD_PROFILE="onload-default"</Elem> - <Elem>CONTROL_PLUGIN_PATH="/home/fulup/Workspace/AGL-AppFW/afb-controller/build:/home/fulup/opt/afb-controller/lib/controller-plugins:/usr/lib/afb/controller-plugins/ctlplug"</Elem> - <Elem>CONTROL_SUPPORT_LUA</Elem> - <Elem>CTL_PLUGIN_MAGIC=2468013579</Elem> - <Elem>NATIVE_LINUX</Elem> - <Elem>afb_controller_EXPORTS</Elem> - </preprocessorList> - </cTool> - </folder> - <folder path="0/ctl-plugin"> - <cTool> - <incDir> - <pElem>/usr/include/json-c</pElem> - <pElem>../../../opt/include</pElem> - <pElem>/usr/include/p11-kit-1</pElem> - <pElem>/usr/include/lua5.3</pElem> - <pElem>ctl-binding</pElem> - <pElem>afb-utilities</pElem> - <pElem>build/ctl-plugin</pElem> - </incDir> - <preprocessorList> - <Elem>CONTROL_CONFIG_PATH="/home/fulup/Workspace/AGL-AppFW/afb-controller/conf.d/project/json.d:/home/fulup/opt/afb-controller/json.d"</Elem> - <Elem>CONTROL_CONFIG_POST="control"</Elem> - <Elem>CONTROL_CONFIG_PRE="onload"</Elem> - <Elem>CONTROL_DOSCRIPT_PRE="doscript"</Elem> - <Elem>CONTROL_LUA_EVENT="luaevt"</Elem> - <Elem>CONTROL_LUA_PATH="/home/fulup/Workspace/AGL-AppFW/afb-controller/conf.d/project/lua.d:/home/fulup/opt/controller-plugins/ctl-lua.d"</Elem> - <Elem>CONTROL_MAXPATH_LEN=255</Elem> - <Elem>CONTROL_ONLOAD_PROFILE="onload-default"</Elem> - <Elem>CONTROL_PLUGIN_PATH="/home/fulup/Workspace/AGL-AppFW/afb-controller/build:/home/fulup/opt/afb-controller/lib/controller-plugins:/usr/lib/afb/controller-plugins/ctlplug"</Elem> - <Elem>CONTROL_SUPPORT_LUA</Elem> - <Elem>CTL_PLUGIN_MAGIC=2468013579</Elem> - <Elem>NATIVE_LINUX</Elem> - <Elem>audio_plugin_sample_EXPORTS</Elem> - </preprocessorList> - </cTool> - </folder> -======= ->>>>>>> Stashed changes - </conf> - </confs> -</configurationDescriptor> diff --git a/nbproject/project.xml b/nbproject/project.xml deleted file mode 100644 index 0ba53c6..0000000 --- a/nbproject/project.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://www.netbeans.org/ns/project/1"> - <type>org.netbeans.modules.cnd.makeproject</type> - <configuration> - <data xmlns="http://www.netbeans.org/ns/make-project/1"> - <name>ctl-utilities</name> - <c-extensions>c</c-extensions> - <cpp-extensions>cpp,cxx</cpp-extensions> - <header-extensions>h</header-extensions> - <sourceEncoding>UTF-8</sourceEncoding> - <make-dep-projects/> - <sourceRootList> - <sourceRootElem>.</sourceRootElem> - </sourceRootList> - <confList> - <confElem> - <name>Default</name> - <type>0</type> - </confElem> - </confList> - <formatting> - <project-formatting-style>false</project-formatting-style> - </formatting> - </data> - </configuration> -</project> |