From d700782e7dae31cbef37ae038b992d2cb0c6f6a4 Mon Sep 17 00:00:00 2001 From: David Wagner Date: Tue, 6 Jan 2015 18:27:08 +0100 Subject: Make ParameterMgrLogger template This will make it possible to have different kind of ParameterMgr connectors instead of hardcoding ParameterMgrPlatformConnector in ParameterMgrLogger. Change-Id: Ia78d9f56c8cc73321e1956856755a56a3569b517 Signed-off-by: David Wagner --- parameter/CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'parameter/CMakeLists.txt') diff --git a/parameter/CMakeLists.txt b/parameter/CMakeLists.txt index 50fc15b..590c7b1 100644 --- a/parameter/CMakeLists.txt +++ b/parameter/CMakeLists.txt @@ -79,7 +79,6 @@ add_library(parameter SHARED BitParameterType.cpp BitParameter.cpp ElementLocator.cpp - ParameterMgrLogger.cpp AutoLog.cpp CompoundRule.cpp SelectionCriterionRule.cpp @@ -153,7 +152,6 @@ add_library(parameter SHARED BitParameterType.cpp BitParameter.cpp ElementLocator.cpp - ParameterMgrLogger.cpp AutoLog.cpp CompoundRule.cpp SelectionCriterionRule.cpp @@ -189,6 +187,7 @@ install(TARGETS parameter LIBRARY DESTINATION lib) # Client headers install(FILES include/ParameterHandle.h + include/ParameterMgrLoggerForward.h include/ParameterMgrPlatformConnector.h include/SelectionCriterionInterface.h include/SelectionCriterionTypeInterface.h -- cgit v1.1 From a53f6504e8d3d01ffd0ea1e655e202b03b943fe6 Mon Sep 17 00:00:00 2001 From: David Wagner Date: Tue, 6 Jan 2015 18:30:49 +0100 Subject: parameter: sort C++ filenames and remove duplicates There were duplicates in the CMakeLists.txt; this patch removes them and sorts the filenames so that they are identical in Android.mk and CMakeLists.txt. Please keep the names sorted, using the shell's "sort -u" command. Change-Id: I027676beb4ee19de2341cd65e0e5c077cddb5627 Signed-off-by: David Wagner --- parameter/CMakeLists.txt | 179 ++++++++++++++--------------------------------- 1 file changed, 53 insertions(+), 126 deletions(-) (limited to 'parameter/CMakeLists.txt') diff --git a/parameter/CMakeLists.txt b/parameter/CMakeLists.txt index 590c7b1..cf2449e 100644 --- a/parameter/CMakeLists.txt +++ b/parameter/CMakeLists.txt @@ -27,152 +27,79 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. add_library(parameter SHARED - Subsystem.cpp - PathNavigator.cpp - Element.cpp - SystemClass.cpp - ParameterMgr.cpp - SelectionCriteria.cpp - SelectionCriterionLibrary.cpp - SelectionCriteriaDefinition.cpp - SelectionCriterionType.cpp - ElementLibrary.cpp - SubsystemElementBuilder.cpp - SelectionCriterion.cpp - ComponentLibrary.cpp - ConfigurableElement.cpp - MappingData.cpp - ParameterBlackboard.cpp - ComponentType.cpp - TypeElement.cpp - InstanceConfigurableElement.cpp - ComponentInstance.cpp - ParameterBlockType.cpp - ParameterType.cpp - Parameter.cpp - BooleanParameterType.cpp - IntegerParameterType.cpp - ArrayParameter.cpp - InstanceDefinition.cpp - ParameterMgrPlatformConnector.cpp - FixedPointParameterType.cpp - ParameterAccessContext.cpp - XmlFileIncluderElement.cpp - ParameterFrameworkConfiguration.cpp - FrameworkConfigurationLocation.cpp - PluginLocation.cpp - ElementLibrarySet.cpp - ErrorContext.cpp AreaConfiguration.cpp - DomainConfiguration.cpp - ConfigurableDomain.cpp - SyncerSet.cpp - ConfigurableDomains.cpp - BinaryStream.cpp - ConfigurationAccessContext.cpp - XmlElementSerializingContext.cpp - XmlParameterSerializingContext.cpp + ArrayParameter.cpp + AutoLog.cpp + BaseParameter.cpp BinarySerializableElement.cpp - BitwiseAreaConfiguration.cpp - BitParameterBlockType.cpp + BinaryStream.cpp BitParameterBlock.cpp - BitParameterType.cpp + BitParameterBlockType.cpp BitParameter.cpp - ElementLocator.cpp - AutoLog.cpp + BitParameterType.cpp + BitwiseAreaConfiguration.cpp + BooleanParameterType.cpp + ComponentInstance.cpp + ComponentLibrary.cpp + ComponentType.cpp CompoundRule.cpp - SelectionCriterionRule.cpp + ConfigurableDomain.cpp + ConfigurableDomains.cpp ConfigurableElementAggregator.cpp - HardwareBackSynchronizer.cpp - SimulatedBackSynchronizer.cpp - MappingContext.cpp - SubsystemObject.cpp - FormattedSubsystemObject.cpp - SubsystemObjectCreator.cpp - BaseParameter.cpp - StringParameterType.cpp - StringParameter.cpp - EnumParameterType.cpp - VirtualSubsystem.cpp - VirtualSyncer.cpp - ParameterHandle.cpp - ParameterAdaptation.cpp - LinearParameterAdaptation.cpp - RuleParser.cpp - EnumValuePair.cpp - Subsystem.cpp - PathNavigator.cpp + ConfigurableElement.cpp + ConfigurationAccessContext.cpp + DomainConfiguration.cpp Element.cpp - SystemClass.cpp - ParameterMgr.cpp - SelectionCriteria.cpp - SelectionCriterionLibrary.cpp - SelectionCriteriaDefinition.cpp - SelectionCriterionType.cpp ElementLibrary.cpp - SubsystemElementBuilder.cpp - SelectionCriterion.cpp - ComponentLibrary.cpp - ConfigurableElement.cpp + ElementLibrarySet.cpp + ElementLocator.cpp + EnumParameterType.cpp + EnumValuePair.cpp + ErrorContext.cpp + FixedPointParameterType.cpp + FormattedSubsystemObject.cpp + FrameworkConfigurationLocation.cpp + HardwareBackSynchronizer.cpp + InstanceConfigurableElement.cpp + InstanceDefinition.cpp + IntegerParameterType.cpp + LinearParameterAdaptation.cpp + MappingContext.cpp MappingData.cpp + ParameterAccessContext.cpp + ParameterAdaptation.cpp ParameterBlackboard.cpp - ComponentType.cpp - TypeElement.cpp - InstanceConfigurableElement.cpp - ComponentInstance.cpp ParameterBlockType.cpp - ParameterType.cpp Parameter.cpp - BooleanParameterType.cpp - IntegerParameterType.cpp - ArrayParameter.cpp - InstanceDefinition.cpp - ParameterMgrPlatformConnector.cpp - FixedPointParameterType.cpp - ParameterAccessContext.cpp - XmlFileIncluderElement.cpp ParameterFrameworkConfiguration.cpp - FrameworkConfigurationLocation.cpp + ParameterHandle.cpp + ParameterMgr.cpp + ParameterMgrPlatformConnector.cpp + ParameterType.cpp + PathNavigator.cpp PluginLocation.cpp - ElementLibrarySet.cpp - ErrorContext.cpp - AreaConfiguration.cpp - DomainConfiguration.cpp - ConfigurableDomain.cpp - SyncerSet.cpp - ConfigurableDomains.cpp - BinaryStream.cpp - ConfigurationAccessContext.cpp - XmlElementSerializingContext.cpp - XmlParameterSerializingContext.cpp - BinarySerializableElement.cpp - BitwiseAreaConfiguration.cpp - BitParameterBlockType.cpp - BitParameterBlock.cpp - BitParameterType.cpp - BitParameter.cpp - ElementLocator.cpp - AutoLog.cpp - CompoundRule.cpp + RuleParser.cpp + SelectionCriteria.cpp + SelectionCriteriaDefinition.cpp + SelectionCriterion.cpp + SelectionCriterionLibrary.cpp SelectionCriterionRule.cpp - ConfigurableElementAggregator.cpp - HardwareBackSynchronizer.cpp + SelectionCriterionType.cpp SimulatedBackSynchronizer.cpp - MappingContext.cpp + StringParameter.cpp + StringParameterType.cpp + Subsystem.cpp + SubsystemElementBuilder.cpp SubsystemObject.cpp - FormattedSubsystemObject.cpp SubsystemObjectCreator.cpp - BaseParameter.cpp - StringParameterType.cpp - StringParameter.cpp - EnumParameterType.cpp + SyncerSet.cpp + SystemClass.cpp + TypeElement.cpp VirtualSubsystem.cpp VirtualSyncer.cpp - ParameterHandle.cpp - ParameterAdaptation.cpp - LinearParameterAdaptation.cpp - RuleParser.cpp - EnumValuePair.cpp) + XmlElementSerializingContext.cpp + XmlFileIncluderElement.cpp + XmlParameterSerializingContext.cpp) include_directories( include -- cgit v1.1 From 36f40a0b7eee0a6d8b6ca54fdfb1b9043845a555 Mon Sep 17 00:00:00 2001 From: David Wagner Date: Tue, 6 Jan 2015 18:33:36 +0100 Subject: New ParamegerMgr "Full" connector This is a new connector that implements (almost) all of the parameter-framework capabilities, in contrast to CParameterMgrPlatformConnector which only implements criteria creation, modification, and application and dynamic parameter handling capabilities. It will allow user to programatically do whatever the PFW can do, e.g. create domains and configurations. Change-Id: Ide118aaaae4f84fa7280d2cae470de0c024c0f00 Signed-off-by: David Wagner --- parameter/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'parameter/CMakeLists.txt') diff --git a/parameter/CMakeLists.txt b/parameter/CMakeLists.txt index cf2449e..7d91a82 100644 --- a/parameter/CMakeLists.txt +++ b/parameter/CMakeLists.txt @@ -74,6 +74,7 @@ add_library(parameter SHARED ParameterFrameworkConfiguration.cpp ParameterHandle.cpp ParameterMgr.cpp + ParameterMgrFullConnector.cpp ParameterMgrPlatformConnector.cpp ParameterType.cpp PathNavigator.cpp @@ -115,6 +116,7 @@ install(TARGETS parameter LIBRARY DESTINATION lib) install(FILES include/ParameterHandle.h include/ParameterMgrLoggerForward.h + include/ParameterMgrFullConnector.h include/ParameterMgrPlatformConnector.h include/SelectionCriterionInterface.h include/SelectionCriterionTypeInterface.h -- cgit v1.1