CommonAPI-D-Bus-Tools 3.1.12

COVESA · Jun 20, 2017 · 2e4d3f3 · 2e4d3f3
1 parent e440ae3
commit 2e4d3f3
Show file tree

Hide file tree

Showing 51 changed files with 1,617 additions and 135 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,5 +1,11 @@
 Changes
 =======
+
+v3.1.12
+- Add support for Unix FD type in DBus
+- Fix compiler warnings in generated code
+- Test adaptions
+
 v3.1.11.2
 - Export deployment data
 

diff --git a/org.genivi.commonapi.dbus.cli.feature/feature.xml b/org.genivi.commonapi.dbus.cli.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.genivi.commonapi.dbus.cli.feature"
       label="CommonAPI D-Bus CLI Generator Feature"
-      version="3.1.11.qualifier"
+      version="3.1.12.qualifier"
       provider-name="BMW AG">
 
    <description url="http://www.example.com/description">

diff --git a/org.genivi.commonapi.dbus.cli.feature/pom.xml b/org.genivi.commonapi.dbus.cli.feature/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>commonapi</groupId>
         <artifactId>org.genivi.commonapi.dbus.releng</artifactId>
-        <version>3.1.11-SNAPSHOT</version>
+        <version>3.1.12-SNAPSHOT</version>
         <relativePath>../org.genivi.commonapi.dbus.releng</relativePath>
     </parent>
 </project>
diff --git a/org.genivi.commonapi.dbus.cli.product/commonapi_dbus_cli.product b/org.genivi.commonapi.dbus.cli.product/commonapi_dbus_cli.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="CommonAPI D-Bus Code Generator" uid="org.genivi.commonapi.dbus.cli.product" id="org.genivi.commonapi.dbus.cli.product" application="org.genivi.commonapi.console.application" version="3.1.11" useFeatures="true" includeLaunchers="true">
+<product name="CommonAPI D-Bus Code Generator" uid="org.genivi.commonapi.dbus.cli.product" id="org.genivi.commonapi.dbus.cli.product" application="org.genivi.commonapi.console.application" version="3.1.12" useFeatures="true" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>

diff --git a/org.genivi.commonapi.dbus.cli.product/pom.xml b/org.genivi.commonapi.dbus.cli.product/pom.xml
@@ -131,7 +131,7 @@
     <parent>
         <groupId>commonapi</groupId>
         <artifactId>org.genivi.commonapi.dbus.releng</artifactId>
-        <version>3.1.11-SNAPSHOT</version>
+        <version>3.1.12-SNAPSHOT</version>
         <relativePath>../org.genivi.commonapi.dbus.releng</relativePath>
     </parent>
 </project>
diff --git a/org.genivi.commonapi.dbus.cli/META-INF/MANIFEST.MF b/org.genivi.commonapi.dbus.cli/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: commonapi D-Bus generator Console Interface
 Bundle-SymbolicName: org.genivi.commonapi.dbus.cli;singleton:=true
-Bundle-Version: 3.1.11.qualifier
+Bundle-Version: 3.1.12.qualifier
 Bundle-Activator: org.genivi.commonapi.dbus.cli.Activator
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.xtext;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.franca.core.dsl;bundle-version="[0.9.0,0.10.0)";visibility:=reexport,
  org.franca.deploymodel.dsl;bundle-version="[0.9.0,0.10.0)";visibility:=reexport,
  org.genivi.commonapi.console,
- org.genivi.commonapi.dbus;bundle-version="3.1.11"
+ org.genivi.commonapi.dbus;bundle-version="3.1.12"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: BMW AG
diff --git a/org.genivi.commonapi.dbus.cli/pom.xml b/org.genivi.commonapi.dbus.cli/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>commonapi</groupId>
         <artifactId>org.genivi.commonapi.dbus.releng</artifactId>
-        <version>3.1.11-SNAPSHOT</version>
+        <version>3.1.12-SNAPSHOT</version>
         <relativePath>../org.genivi.commonapi.dbus.releng</relativePath>
     </parent>
 </project>
diff --git a/org.genivi.commonapi.dbus.feature/feature.xml b/org.genivi.commonapi.dbus.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.genivi.commonapi.dbus.feature"
       label="%featureName"
-      version="3.1.11.qualifier"
+      version="3.1.12.qualifier"
       provider-name="%providerName">
 
    <copyright>

diff --git a/org.genivi.commonapi.dbus.feature/pom.xml b/org.genivi.commonapi.dbus.feature/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>commonapi</groupId>
         <artifactId>org.genivi.commonapi.dbus.releng</artifactId>
-        <version>3.1.11-SNAPSHOT</version>
+        <version>3.1.12-SNAPSHOT</version>
         <relativePath>../org.genivi.commonapi.dbus.releng</relativePath>
     </parent>
 </project>
diff --git a/org.genivi.commonapi.dbus.releng/pom.xml b/org.genivi.commonapi.dbus.releng/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>commonapi</groupId>
         <artifactId>org.genivi.commonapi.releng</artifactId>
-        <version>3.1.11-SNAPSHOT</version>
+        <version>3.1.12-SNAPSHOT</version>
         <relativePath>../org.genivi.commonapi.releng</relativePath>
     </parent>
     <repositories>

diff --git a/org.genivi.commonapi.dbus.target/pom.xml b/org.genivi.commonapi.dbus.target/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>commonapi</groupId>
         <artifactId>org.genivi.commonapi.releng</artifactId>
-        <version>3.1.11-SNAPSHOT</version>
+        <version>3.1.12-SNAPSHOT</version>
         <relativePath>../org.genivi.commonapi.releng</relativePath>
     </parent>
 </project>
diff --git a/org.genivi.commonapi.dbus.ui/META-INF/MANIFEST.MF b/org.genivi.commonapi.dbus.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: GENIVI Common API DBus UI
 Bundle-SymbolicName: org.genivi.commonapi.dbus.ui;singleton:=true
-Bundle-Version: 3.1.11.qualifier
+Bundle-Version: 3.1.12.qualifier
 Bundle-Activator: org.genivi.commonapi.dbus.ui.CommonApiDBusUiPlugin
 Bundle-Vendor: BMW AG
 Require-Bundle: org.eclipse.ui,
@@ -14,8 +14,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.xtext.builder;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.xtext.generator;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  com.google.inject;bundle-version="3.0.0",
- org.genivi.commonapi.core.ui;bundle-version="3.1.11";visibility:=reexport,
- org.genivi.commonapi.dbus;bundle-version="3.1.11";visibility:=reexport,
+ org.genivi.commonapi.core.ui;bundle-version="3.1.12";visibility:=reexport,
+ org.genivi.commonapi.dbus;bundle-version="3.1.12";visibility:=reexport,
  org.franca.core.dsl.ui;bundle-version="0.9.1",
  org.franca.deploymodel.dsl.ui;bundle-version="0.9.1"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8

diff --git a/org.genivi.commonapi.dbus.ui/pom.xml b/org.genivi.commonapi.dbus.ui/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>commonapi</groupId>
         <artifactId>org.genivi.commonapi.dbus.releng</artifactId>
-        <version>3.1.11-SNAPSHOT</version>
+        <version>3.1.12-SNAPSHOT</version>
         <relativePath>../org.genivi.commonapi.dbus.releng</relativePath>
     </parent>
 </project>
diff --git a/org.genivi.commonapi.dbus.updatesite/category.xml b/org.genivi.commonapi.dbus.updatesite/category.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/org.genivi.commonapi.core.validator.feature_3.1.11.qualifier.jar" id="org.genivi.commonapi.dbus.validator.feature" version="3.1.11.qualifier">
+   <feature url="features/org.genivi.commonapi.core.validator.feature_3.1.12.qualifier.jar" id="org.genivi.commonapi.dbus.validator.feature" version="3.1.12.qualifier">
       <category name="GENIVI CommonAPI"/>
    </feature>
-   <feature url="features/org.genivi.commonapi.dbus.feature_3.1.11.qualifier.jar" id="org.genivi.commonapi.dbus.feature" version="3.1.11.qualifier">
+   <feature url="features/org.genivi.commonapi.dbus.feature_3.1.12.qualifier.jar" id="org.genivi.commonapi.dbus.feature" version="3.1.12.qualifier">
       <category name="GENIVI CommonAPI"/>
    </feature>
    <category-def name="GENIVI CommonAPI" label="GENIVI CommonAPI Generators">

diff --git a/org.genivi.commonapi.dbus.updatesite/pom.xml b/org.genivi.commonapi.dbus.updatesite/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>commonapi</groupId>
         <artifactId>org.genivi.commonapi.dbus.releng</artifactId>
-        <version>3.1.11-SNAPSHOT</version>
+        <version>3.1.12-SNAPSHOT</version>
         <relativePath>../org.genivi.commonapi.dbus.releng</relativePath>
     </parent>
 </project>
diff --git a/org.genivi.commonapi.dbus.validator.feature/feature.xml b/org.genivi.commonapi.dbus.validator.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.genivi.commonapi.dbus.validator.feature"
       label="%featureName"
-      version="3.1.11.qualifier"
+      version="3.1.12.qualifier"
       provider-name="%providerName">
 
    <copyright>

diff --git a/org.genivi.commonapi.dbus.validator.feature/pom.xml b/org.genivi.commonapi.dbus.validator.feature/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>commonapi</groupId>
         <artifactId>org.genivi.commonapi.dbus.releng</artifactId>
-        <version>3.1.11-SNAPSHOT</version>
+        <version>3.1.12-SNAPSHOT</version>
         <relativePath>../org.genivi.commonapi.dbus.releng</relativePath>
     </parent>
 </project>
diff --git a/org.genivi.commonapi.dbus.validator/META-INF/MANIFEST.MF b/org.genivi.commonapi.dbus.validator/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Commonapi DBus Validator
 Bundle-SymbolicName: org.genivi.commonapi.dbus.validator;singleton:=true
-Bundle-Version: 3.1.11.qualifier
+Bundle-Version: 3.1.12.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: BMW AG
 Require-Bundle: org.eclipse.xtext.builder;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.xtext.generator;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.xtext.ui;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.genivi.commonapi.core;bundle-version="3.1.11";visibility:=reexport,
- org.genivi.commonapi.dbus.ui;bundle-version="3.1.11";visibility:=reexport
+ org.genivi.commonapi.core;bundle-version="3.1.12";visibility:=reexport,
+ org.genivi.commonapi.dbus.ui;bundle-version="3.1.12";visibility:=reexport
 Export-Package: org.genivi.commonapi.dbus.validator
diff --git a/org.genivi.commonapi.dbus.validator/pom.xml b/org.genivi.commonapi.dbus.validator/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>commonapi</groupId>
         <artifactId>org.genivi.commonapi.dbus.releng</artifactId>
-        <version>3.1.11-SNAPSHOT</version>
+        <version>3.1.12-SNAPSHOT</version>
         <relativePath>../org.genivi.commonapi.dbus.releng</relativePath>
     </parent>
 </project>
diff --git a/org.genivi.commonapi.dbus.verification/CMakeLists.txt b/org.genivi.commonapi.dbus.verification/CMakeLists.txt
@@ -4,7 +4,7 @@ PROJECT(libdbusglue)
 
 SET( ${PROJECT_NAME}_MAJOR_VERSION 3 )
 SET( ${PROJECT_NAME}_MINOR_VERSION 1 )
-SET( ${PROJECT_NAME}_PATCH_LEVEL 11 )
+SET( ${PROJECT_NAME}_PATCH_LEVEL 12 )
 
 message("Project name: ${PROJECT_NAME}")
 

diff --git a/org.genivi.commonapi.dbus.verification/doit.sh b/org.genivi.commonapi.dbus.verification/doit.sh
diff --git a/org.genivi.commonapi.dbus/META-INF/MANIFEST.MF b/org.genivi.commonapi.dbus/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: GENIVI Common API D-Bus C++ Generator
 Bundle-Vendor: BMW AG
-Bundle-Version: 3.1.11.qualifier
+Bundle-Version: 3.1.12.qualifier
 Bundle-SymbolicName: org.genivi.commonapi.dbus;singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0",
  org.eclipse.xtext.generator;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.xtext.util;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.franca.core.dsl;bundle-version="[0.9.0,0.10.0)";visibility:=reexport,
  org.franca.deploymodel.dsl;bundle-version="[0.9.0,0.10.0)";visibility:=reexport,
- org.genivi.commonapi.core;bundle-version="3.1.11";visibility:=reexport,
+ org.genivi.commonapi.core;bundle-version="3.1.12";visibility:=reexport,
  org.eclipse.core.resources;bundle-version="[3.9.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.genivi.commonapi.dbus.generator,

diff --git a/org.genivi.commonapi.dbus/deployment/CommonAPI-DBus_deployment_spec.fdepl b/org.genivi.commonapi.dbus/deployment/CommonAPI-DBus_deployment_spec.fdepl
@@ -65,6 +65,10 @@ specification org.genivi.commonapi.dbus.deployment extends org.genivi.commonapi.
 		DBusVariantType: {DBus, CommonAPI} (default: CommonAPI);
 	}
 
+    for integers {
+        IsUnixFD: Boolean (default: false);
+    }
+
     // From here workaround for missing Franca deployment features.
 
     for attributes {

diff --git a/org.genivi.commonapi.dbus/pom.xml b/org.genivi.commonapi.dbus/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>commonapi</groupId>
         <artifactId>org.genivi.commonapi.dbus.releng</artifactId>
-        <version>3.1.11-SNAPSHOT</version>
+        <version>3.1.12-SNAPSHOT</version>
         <relativePath>../org.genivi.commonapi.dbus.releng</relativePath>
     </parent>
 </project>
diff --git a/...commonapi.dbus/src-gen/org/genivi/commonapi/dbus/DeploymentInterfacePropertyAccessor.java b/...commonapi.dbus/src-gen/org/genivi/commonapi/dbus/DeploymentInterfacePropertyAccessor.java
@@ -60,7 +60,9 @@ private DBusAttributeType convertDBusAttributeType (String val) {
 	public Boolean getIsObjectPath (EObject obj) {
 		return target.getBoolean(obj, "IsObjectPath");
 	}
-
+	public Boolean getIsUnixFD (EObject obj) {
+		return target.getBoolean(obj, "IsUnixFD");
+	}
 	public enum DBusVariantType {
 		DBus, CommonAPI
 	}

diff --git a/...napi.dbus/src-gen/org/genivi/commonapi/dbus/DeploymentTypeCollectionPropertyAccessor.java b/...napi.dbus/src-gen/org/genivi/commonapi/dbus/DeploymentTypeCollectionPropertyAccessor.java
@@ -42,7 +42,9 @@ private DBusDefaultAttributeType convertDBusDefaultAttributeType (String val) {
 	public Boolean getIsObjectPath (EObject obj) {
 		return target.getBoolean(obj, "IsObjectPath");
 	}
-
+	public Boolean getIsUnixFD (EObject obj) {
+		return target.getBoolean(obj, "IsUnixFD");
+	}
 	public enum DBusVariantType {
 		DBus, CommonAPI
 	}

diff --git a/org.genivi.commonapi.dbus/src/org/genivi/commonapi/dbus/deployment/PropertyAccessor.java b/org.genivi.commonapi.dbus/src/org/genivi/commonapi/dbus/deployment/PropertyAccessor.java
@@ -96,6 +96,18 @@ public Boolean getIsObjectPath (EObject obj) {
                 if (isObjectPath == null) isObjectPath = false;
 		return isObjectPath;
 	}
+	public Boolean getIsUnixFD (EObject obj) {
+		Boolean isUnixFD = false;
+		try {
+			if (type_ == DeploymentType.INTERFACE)
+				isUnixFD = dbusInterface_.getIsUnixFD(obj);
+			if (type_ == DeploymentType.TYPE_COLLECTION)
+				isUnixFD = dbusTypeCollection_.getIsUnixFD(obj);
+		}
+		catch (java.lang.NullPointerException e) {}
+            if (isUnixFD == null) isUnixFD = false;
+		return isUnixFD;
+	}	
 	public DBusVariantType getDBusVariantType (EObject obj) {
 		DBusVariantType variantType = DBusVariantType.CommonAPI;
 		try {

diff --git a/...commonapi.dbus/src/org/genivi/commonapi/dbus/generator/FInterfaceDBusProxyGenerator.xtend b/...commonapi.dbus/src/org/genivi/commonapi/dbus/generator/FInterfaceDBusProxyGenerator.xtend
@@ -96,6 +96,7 @@ class FInterfaceDBusProxyGenerator {
 
         #include <string>
 
+        # if defined(_MSC_VER)
         #  if _MSC_VER >= 1300
         /*
          * Diamond inheritance is used for the CommonAPI::Proxy base class.
@@ -105,6 +106,7 @@ class FInterfaceDBusProxyGenerator {
          */
         #    pragma warning( disable : 4250 )
         #  endif
+        # endif
 
         «fInterface.generateVersionNamespaceBegin»
         «fInterface.model.generateNamespaceBeginDeclaration»

diff --git a/...dbus/src/org/genivi/commonapi/dbus/generator/FTypeCollectionDBusDeploymentGenerator.xtend b/...dbus/src/org/genivi/commonapi/dbus/generator/FTypeCollectionDBusDeploymentGenerator.xtend
@@ -207,6 +207,10 @@ class FTypeCollectionDBusDeploymentGenerator {
         var String deployment = generateIndent(_indent)
         if (_type == FBasicTypeId.STRING)
             deployment = deployment + "CommonAPI::DBus::StringDeployment"
+        else if (_type == FBasicTypeId.UINT32)
+            deployment = deployment + "CommonAPI::DBus::IntegerDeployment"
+        else if (_type == FBasicTypeId.INT32)
+            deployment = deployment + "CommonAPI::DBus::IntegerDeployment"
         else
             deployment = deployment + "CommonAPI::EmptyDeployment"
 
@@ -415,9 +419,16 @@ class FTypeCollectionDBusDeploymentGenerator {
         if (_typeId == FBasicTypeId.STRING) {
             if (_accessor.getDBusIsObjectPathHelper(_source)) parameter = "true" else parameter = "false"
         }
+        if (_typeId == FBasicTypeId.UINT32 || _typeId == FBasicTypeId.INT32) {
+            if (_accessor.getDBusIsUnixFDHelper(_source)) parameter = "true" else parameter = "false"
+        }        
         return parameter
     }
 
+    def protected dispatch String getDeploymentParameter(FTypeDef _typeDef, EObject _source, PropertyAccessor _accessor) {
+        return _typeDef.getActualType().getDeploymentParameter(_source, _accessor)
+    }
+    
     def protected dispatch String getDeploymentParameter(FTypeRef _typeRef, EObject _source, PropertyAccessor _accessor) {
         if (_typeRef.derived != null) {
             return _typeRef.derived.getDeploymentParameter(_source, _accessor)