Set correct Dname to filter

ARM-software · Mar 9, 2017 · fa484cd · fa484cd
1 parent 360bea5
commit fa484cd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/com.arm.cmsis.pack/META-INF/MANIFEST.MF b/com.arm.cmsis.pack/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CMSIS Pack
 Bundle-SymbolicName: com.arm.cmsis.pack;singleton:=true
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 2.1.2.qualifier
 Bundle-Activator: com.arm.cmsis.pack.CpPlugIn
 Bundle-Vendor: ARM
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8

diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/RteModel.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/RteModel.java
@@ -569,6 +569,14 @@ protected void updateComponentFilter() {
 		fComponentFilter = new CpConditionContext();
 		if(fDeviceInfo != null) {
 			fComponentFilter.setAttributes(fDeviceInfo.attributes().getAttributesAsMap());
+			// Set proper Dname attribute for condition  evaluation
+			String deviceName = fDeviceInfo.getDeviceName();
+			int i = deviceName.indexOf(':');
+			if (i >= 0) {
+				deviceName = deviceName.substring(0, i);
+			}
+
+			fComponentFilter.setAttribute(CmsisConstants.DNAME, deviceName); 
 			fComponentFilter.removeAttribute(CmsisConstants.URL); // this attribute is not needed for filtering
 		}
 		if(fToolchainInfo != null) {