update code for SmartMDSD Toolchain release v3.12

Author: alex-lotz

CHANGELOG

@@ -1,3 +1,10 @@
+SmartMDSD Toolchain v3.12
+	* Fixed bug in Plain OPC UA Code generation that now supports one-dimensional arrays for method calls
+	* Fixed bug in deployment script that now also copies the SmartSoft library
+	* Fixed minor issue in component code generation that now sorts extensions for a uniform generation order
+	* Updated contents in the Welcome page to now show the Release Notes (aka What's New) properly
+-- Thu, 5 Dec. 2019
+
 SmartMDSD Toolchain v3.11
 	* Updated Welcome Pages (see Help->Welcome)
 	* Updated C++ code geenrators to support updated background infrastructure (SmartSoft API v1.1 and ACE/SmartSoft Kernel v3.2)

ReleaseNotes.md

@@ -2,6 +2,10 @@
 
 This file contains the release notes for the SmartMDSD Toolchain version 3.x. For each release, it provides important information to users to support them in switching from one specific version the previous version. This includes information and instructions how to migrate content from one version to another.
 
+## v3.12
+
+This is a hotfix release where several internal code generation bugs are fixed. We recommend to manually trigger the code generation for your existing projects by selecting the project in the SmartMDSD Project Explorer and using the Eclipse menu: **SmartMDSD** -> **Run Code-Generation**. This will update your src-gen folders so you also might want rebuilding your projects by using the Eclipse menu **SmartMDSD** -> **Build Project** (alternatively, you can use the Eclipse menu: **Project** -> **Build All** to rebuild all your projects in the workspace at once). There are no other changes in the models or user-code required.
+
 ## v3.11
 
 This is a maintainance release mostly motivated by the updated background infrastructure. Most notably, the **SmartSoft Component Developer API** has been updated from version 1.0 to **version 1.1**, and the **ACE/SmartSoft Kernel** has been updated from version 3.1 to **version 3.2**. Therefore the Toolchain's internal C++ code generators have been updated and now generate consistently towards the updated background infrastructure. This also means that if you have not yet updated your current background infrastructure, then you should do so **before** using this new Toolchain update.

org.smartmdsd.infrastructure/org.smartmdsd.branding/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: SmartMDSD
 Bundle-SymbolicName: org.smartmdsd.branding;singleton:=true
-Bundle-Version: 3.7.0.qualifier
+Bundle-Version: 3.9.0.qualifier
 Bundle-Activator: org.smartmdsd.branding.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,

org.smartmdsd.infrastructure/org.smartmdsd.branding/splash.bmp

@@ -2,7 +2,7 @@
 <feature
       id="org.smartmdsd.toolchain"
       label="SmartMDSD-Toolchain"
-      version="3.11.0.qualifier"
+      version="3.12.0.qualifier"
       provider-name="Servicerobotics Ulm"
       plugin="org.smartmdsd.branding"
       os="linux,win32"

org.smartmdsd.infrastructure/org.smartmdsd.branding/splash.xcf

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: OpcUaXmlCompiler
 Bundle-SymbolicName: org.open62541.xml.compiler
-Bundle-Version: 3.7.0.qualifier
+Bundle-Version: 3.8.0.qualifier
 Bundle-Vendor: Servicerobotics Ulm
 Automatic-Module-Name: org.open62541.xml.compiler
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8

org.smartmdsd.infrastructure/org.smartmdsd.feature/feature.xml

@@ -236,29 +236,33 @@ class OpcUaClientImpl implements OpcUaClient {
 		«ENDFOR»
 
 		«FOR method: methodList»
-		 OPCUA::StatusCode «objectName»::call«method.name.toFirstUpper»(«method.cppMethodArgumentsDef»)
-		 {
-		 	std::vector<OPCUA::Variant> inputArguments(«method.inputArguments.size»);
-		 	«var count1=-1»
-		 	«FOR arg: method.inputArguments»
-		 	inputArguments[«count1=count1+1»] = «arg.name»;
-		 	«ENDFOR»
-		 	std::vector<OPCUA::Variant> outputArguments;
-		 	OPCUA::StatusCode status = callMethod(std::string("«method.name»"), inputArguments, outputArguments);
-		 	if(status == OPCUA::StatusCode::ALL_OK)
-		 	{
-		 		«var count2=-1»
-		 		«FOR arg: method.outputArguments»
-		 			«IF arg.DataTypeIdentifier == OpcUaXmlParser.SeRoNetARGUMENT.UA_TYPES_STRING»
-		 			«arg.name» = outputArguments[«count2=count2+1»].toString();
-		 			«ELSE»
-		 			«arg.name» = outputArguments[«count2=count2+1»];
-		 			«ENDIF»
+		OPCUA::StatusCode «objectName»::call«method.name.toFirstUpper»(«method.cppMethodArgumentsDef»)
+		{
+			std::vector<OPCUA::Variant> inputArguments(«method.inputArguments.size»);
+			«var count1=-1»
+			«FOR arg: method.inputArguments»
+			inputArguments[«count1=count1+1»] = «arg.name»;
+			«ENDFOR»
+			std::vector<OPCUA::Variant> outputArguments;
+			OPCUA::StatusCode status = callMethod(std::string("«method.name»"), inputArguments, outputArguments);
+			if(status == OPCUA::StatusCode::ALL_OK)
+			{
+				«var count2=-1»
+				«FOR arg: method.outputArguments»
+					«IF arg.ValueRank == 1»
+						«arg.name» = outputArguments[«count2=count2+1»].getArrayValuesAs<«arg.DataTypeString»>();
+					«ELSE»
+						«IF arg.DataTypeIdentifier == OpcUaXmlParser.SeRoNetARGUMENT.UA_TYPES_STRING»
+							«arg.name» = outputArguments[«count2=count2+1»].toString();
+						«ELSE»
+							«arg.name» = outputArguments[«count2=count2+1»];
+						«ENDIF»
+					«ENDIF»
 				«ENDFOR»
-		 	}
-		 	return status;
-		 }
-		 
+			}
+			return status;
+		}
+		
 		«ENDFOR»
 	'''
 	
@@ -325,4 +329,4 @@ class OpcUaClientImpl implements OpcUaClient {
 		)
 	'''
 
-}
+}

org.xtend.generators/org.open62541.xml.compiler/META-INF/MANIFEST.MF

@@ -595,7 +595,15 @@ class OpcUaXmlParser {
 	def String getCppMethodArgumentsDef(SeRoNetMETHOD method) {
 		var result = ""
 		for(argIn: method.inputArguments) {
-			result = result + "const "+argIn.DataTypeString()+" &"+argIn.name
+			result = result + "const "
+			if(argIn.ValueRank == 1) {
+				// one dimensional array
+				result = result + "std::vector<"+argIn.DataTypeString()+">"
+			} else {
+				// we assume it is a scalar type
+				result = result + argIn.DataTypeString()
+			}
+			result = result + " &"+argIn.name
 			if(argIn != method.inputArguments.last) {
 				result = result + ", "
 			}
@@ -608,7 +616,14 @@ class OpcUaXmlParser {
 			} else {
 				result = result + ", "
 			}
-			result = result + argOut.DataTypeString()+" &"+argOut.name
+			if(argOut.ValueRank == 1) {
+				// one dimensional array
+				result = result + "std::vector<"+argOut.DataTypeString()+">"
+			} else {
+				// we assume it is a scalar type
+				result = result + argOut.DataTypeString()
+			}
+			result = result + " &"+argOut.name
 		}
 		return result
 	}
@@ -633,4 +648,4 @@ class OpcUaXmlParser {
 		}
 		return result
 	}
-}
+}

org.xtend.generators/org.open62541.xml.compiler/src/org/open62541/xml/compiler/OpcUaClientImpl.xtend

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: SmartSoftGenerator
 Bundle-SymbolicName: org.xtend.smartsoft.generator;singleton:=true
-Bundle-Version: 3.11.0.qualifier
+Bundle-Version: 3.12.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.xtext.xbase.lib,