v2.9.0

com.arm.cmsis.config.tests/META-INF/MANIFEST.MF

@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Tests
 Bundle-SymbolicName: com.arm.cmsis.config.tests
 Automatic-Module-Name: com.arm.cmsis.config.tests
-Bundle-Version: 2.8.0.qualifier
+Bundle-Version: 2.9.0.qualifier
 Bundle-Vendor: Arm Limited
 Fragment-Host: com.arm.cmsis.config
 Bundle-RequiredExecutionEnvironment: JavaSE-11

com.arm.cmsis.config.tests/pom.xml

@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>com.arm.cmsis</groupId>
 		<artifactId>com.arm.cmsis.parent</artifactId>
-		<version>2.8.0-SNAPSHOT</version>
+		<version>2.9.0-SNAPSHOT</version>
 		<relativePath>../com.arm.cmsis.parent</relativePath>
 	</parent>
 	<properties>
@@ -34,7 +34,7 @@
 						<artifact>
 							<groupId>com.arm.cmsis</groupId>
 							<artifactId>com.arm.cmsis.tests.target</artifactId>
-							<version>2.8.0-SNAPSHOT</version>
+							<version>2.9.0-SNAPSHOT</version>
 						</artifact>
 					</target>
 					<environments>

com.arm.cmsis.config/META-INF/MANIFEST.MF

@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: CMSIS Config
 Bundle-SymbolicName: com.arm.cmsis.config;singleton:=true
 Automatic-Module-Name: com.arm.cmsis.config
-Bundle-Version: 2.8.0.qualifier
+Bundle-Version: 2.9.0.qualifier
 Bundle-Activator: com.arm.cmsis.config.ConfigPlugIn
 Bundle-Vendor: Arm Limited
 Require-Bundle: org.eclipse.ui,

com.arm.cmsis.config/pom.xml

@@ -6,8 +6,8 @@
 	<packaging>eclipse-plugin</packaging>
 	<parent>
 		<groupId>com.arm.cmsis</groupId>
-		<artifactId>com.arm.cmsis.parent.sign</artifactId>
-		<version>2.8.0-SNAPSHOT</version>
-		<relativePath>../com.arm.cmsis.parent.sign</relativePath>
+		<artifactId>com.arm.cmsis.parent</artifactId>
+		<version>2.9.0-SNAPSHOT</version>
+		<relativePath>../com.arm.cmsis.parent</relativePath>
 	</parent>
 </project>

com.arm.cmsis.help/META-INF/MANIFEST.MF

@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Help
 Bundle-SymbolicName: com.arm.cmsis.help;singleton:=true
 Automatic-Module-Name: com.arm.cmsis.help
-Bundle-Version: 2.8.0.qualifier
+Bundle-Version: 2.9.0.qualifier
 Bundle-Activator: com.arm.cmsis.help.HelpPlugIn
 Bundle-Vendor: Arm Limited
 Require-Bundle: org.eclipse.ui,

com.arm.cmsis.help/pom.xml

@@ -5,7 +5,7 @@
   <parent>
   	<groupId>com.arm.cmsis</groupId>
   	<artifactId>com.arm.cmsis.parent.sign</artifactId>
-  	<version>2.8.0-SNAPSHOT</version>
+  	<version>2.9.0-SNAPSHOT</version>
   	<relativePath>../com.arm.cmsis.parent.sign</relativePath>
   </parent>
 </project>

com.arm.cmsis.pack.build.armcc/META-INF/MANIFEST.MF

@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Armcc Toolchain Adapter
 Bundle-SymbolicName: com.arm.cmsis.pack.build.armcc;singleton:=true
 Automatic-Module-Name: com.arm.cmsis.pack.build.armcc
-Bundle-Version: 2.8.0.qualifier
+Bundle-Version: 2.9.0.qualifier
 Bundle-Activator: com.arm.cmsis.pack.build.armcc.Activator
 Bundle-Vendor: Arm Limited
 Require-Bundle: org.eclipse.core.runtime,

com.arm.cmsis.pack.build.armcc/pom.xml

@@ -5,7 +5,7 @@
   <parent>
   	<groupId>com.arm.cmsis</groupId>
   	<artifactId>com.arm.cmsis.parent.sign</artifactId>
-  	<version>2.8.0-SNAPSHOT</version>
+  	<version>2.9.0-SNAPSHOT</version>
   	<relativePath>../com.arm.cmsis.parent.sign</relativePath>
   </parent>
 </project>

com.arm.cmsis.pack.build.armgcc/META-INF/MANIFEST.MF

@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Arm GCC Toolchain Adapter
 Bundle-SymbolicName: com.arm.cmsis.pack.build.armgcc;singleton:=true
 Automatic-Module-Name: com.arm.cmsis.pack.build.armgcc
-Bundle-Version: 2.8.0.qualifier
+Bundle-Version: 2.9.0.qualifier
 Bundle-Activator: com.arm.cmsis.pack.build.armgcc.Activator
 Bundle-Vendor: Arm Limited
 Require-Bundle: org.eclipse.core.runtime,

com.arm.cmsis.pack.build.armgcc/pom.xml

@@ -5,7 +5,7 @@
   <parent>
   	<groupId>com.arm.cmsis</groupId>
   	<artifactId>com.arm.cmsis.parent.sign</artifactId>
-  	<version>2.8.0-SNAPSHOT</version>
+  	<version>2.9.0-SNAPSHOT</version>
   	<relativePath>../com.arm.cmsis.parent.sign</relativePath>
   </parent>
 </project>

com.arm.cmsis.pack.build.gnuarmeclipse/META-INF/MANIFEST.MF

@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Toolchain Adapter for GNU ARM C/C++ Cross Compiler
 Bundle-SymbolicName: com.arm.cmsis.pack.build.gnuarmeclipse;singleton:=true
 Automatic-Module-Name: com.arm.cmsis.pack.build.gnuarmeclipse
-Bundle-Version: 2.8.0.qualifier
+Bundle-Version: 2.9.0.qualifier
 Bundle-Activator: com.arm.cmsis.pack.build.gnuarmeclipse.Activator
 Bundle-Vendor: Arm Limited
 Require-Bundle: org.eclipse.core.runtime,

com.arm.cmsis.pack.build.gnuarmeclipse/pom.xml

@@ -5,7 +5,7 @@
   <parent>
   	<groupId>com.arm.cmsis</groupId>
   	<artifactId>com.arm.cmsis.parent.sign</artifactId>
-  	<version>2.8.0-SNAPSHOT</version>
+  	<version>2.9.0-SNAPSHOT</version>
   	<relativePath>../com.arm.cmsis.parent.sign</relativePath>
   </parent>
 </project>

com.arm.cmsis.pack.build.gnuarmeclipse/src/com/arm/cmsis/pack/build/gnuarmeclipse/GnuarmeclipseToolChainAdapter.java

@@ -110,11 +110,35 @@ protected String getRteOptionValue(int oType, IBuildSettings buildSettings, IOpt
         return super.getRteOptionValue(oType, buildSettings, option);
     }
 
+    @Override
+    protected List<String> cleanStringList(List<String> value, int oType) {
+        switch (oType) {
+        case IBuildSettings.RTE_DEFINES:
+            value = removeRtePathEntries(value);
+            break;
+        default:
+            value = super.cleanStringList(value, oType);
+            break;
+        }
+        return value;
+    }
+
     @Override
     protected Collection<String> getStringListValue(IBuildSettings buildSettings, int type) {
         if (type == IBuildSettings.RTE_LIBRARIES || type == IBuildSettings.RTE_LIBRARY_PATHS) {
             return null; // we add libraries as objects => ignore libs and lib
                          // paths
+        } else if (type == IBuildSettings.RTE_DEFINES) {
+            // escape defines by adding "${cmsis_rte}" prefix
+            Collection<String> defines = buildSettings.getStringListValue(IBuildSettings.RTE_DEFINES);
+            List<String> value = new LinkedList<String>();
+            if (defines != null && !defines.isEmpty()) {
+                for (String s : defines) {
+                    value.add(CmsisConstants.CMSIS_RTE_VAR + s);
+                }
+            }
+            return value;
+
         } else if (type == IBuildSettings.RTE_OBJECTS) {
             Collection<String> objs = buildSettings.getStringListValue(IBuildSettings.RTE_OBJECTS);
             List<String> value = new LinkedList<String>();

com.arm.cmsis.pack.build.settings/META-INF/MANIFEST.MF

@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Build settings and toolchain integration support
 Bundle-SymbolicName: com.arm.cmsis.pack.build.settings;singleton:=true
 Automatic-Module-Name: com.arm.cmsis.pack.build.settings
-Bundle-Version: 2.8.0.qualifier
+Bundle-Version: 2.9.0.qualifier
 Bundle-Activator: com.arm.cmsis.pack.build.settings.Activator
 Bundle-Vendor: Arm Limited
 Require-Bundle: org.eclipse.core.runtime,

com.arm.cmsis.pack.build.settings/pom.xml

@@ -5,7 +5,7 @@
   <parent>
   	<groupId>com.arm.cmsis</groupId>
   	<artifactId>com.arm.cmsis.parent.sign</artifactId>
-  	<version>2.8.0-SNAPSHOT</version>
+  	<version>2.9.0-SNAPSHOT</version>
   	<relativePath>../com.arm.cmsis.parent.sign</relativePath>
   </parent>
 </project>

com.arm.cmsis.pack.common.tests/META-INF/MANIFEST.MF

@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests
 Bundle-SymbolicName: com.arm.cmsis.pack.common.tests
-Bundle-Version: 2.8.0.qualifier
+Bundle-Version: 2.9.0.qualifier
 Bundle-Vendor: Arm Limited
 Automatic-Module-Name: com.arm.cmsis.pack.common.tests
 Bundle-RequiredExecutionEnvironment: JavaSE-11
-Require-Bundle: com.arm.cmsis.pack.common;bundle-version="2.8.0",
+Require-Bundle: com.arm.cmsis.pack.common;bundle-version="2.9.0",
  org.junit;bundle-version="4.12.0"

com.arm.cmsis.pack.common.tests/pom.xml

@@ -6,7 +6,7 @@
 <parent>
   	<groupId>com.arm.cmsis</groupId>
   	<artifactId>com.arm.cmsis.parent</artifactId>
-  	<version>2.8.0-SNAPSHOT</version>
+  	<version>2.9.0-SNAPSHOT</version>
   	<relativePath>../com.arm.cmsis.parent</relativePath>
   </parent>
 

com.arm.cmsis.pack.common/META-INF/MANIFEST.MF

@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Common
 Bundle-SymbolicName: com.arm.cmsis.pack.common
 Automatic-Module-Name: com.arm.cmsis.pack.common
-Bundle-Version: 2.8.0.qualifier
+Bundle-Version: 2.9.0.qualifier
 Bundle-Vendor: Arm Limited
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: com.arm.cmsis.pack.common,

com.arm.cmsis.pack.common/pom.xml

@@ -5,7 +5,7 @@
   <parent>
   	<groupId>com.arm.cmsis</groupId>
   	<artifactId>com.arm.cmsis.parent.sign</artifactId>
-  	<version>2.8.0-SNAPSHOT</version>
+  	<version>2.9.0-SNAPSHOT</version>
   	<relativePath>../com.arm.cmsis.parent.sign</relativePath>
   </parent>
 </project>

com.arm.cmsis.pack.common/resources/deviceVendors.txt

@@ -2,6 +2,7 @@
 // default device vendor list mapping
 // Format: 
 // ID = name[|alias][|alias]
+0 = NO_VENDOR
 126 = ABOV|ABOV Semiconductor
 20 = Acer Labs
 56 = Actel

com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/common/CmsisConstants.java

@@ -123,6 +123,9 @@ public class CmsisConstants {
     public static final String DMVE = "Dmve"; //$NON-NLS-1$
     public static final String DCDECP = "Dcdecp"; //$NON-NLS-1$
 
+    public static final String NO_VENDOR = "NO_VENDOR:0"; //$NON-NLS-1$
+    public static final String NO_MCU = "NO_MCU"; //$NON-NLS-1$
+
     public static final String MVE = "MVE"; //$NON-NLS-1$
     public static final String NO_MVE = "NO_MVE"; //$NON-NLS-1$
     public static final String FP_MVE = "FP_MVE"; //$NON-NLS-1$

com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/utils/DeviceVendor.java

@@ -197,6 +197,8 @@ public static boolean match(final String v0, final String v1) {
             return false;
         if (v0.isEmpty() || v1.isEmpty())
             return true;
+        if (v0 == v1)
+            return true;
 
         String id0 = getOfficialVendorId(getVendorId(v0));
         String id1 = getOfficialVendorId(getVendorId(v1));

com.arm.cmsis.pack.data/META-INF/MANIFEST.MF

@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: CMSIS data types
 Bundle-SymbolicName: com.arm.cmsis.pack.data
 Automatic-Module-Name: com.arm.cmsis.pack.data
-Bundle-Version: 2.8.0.qualifier
+Bundle-Version: 2.9.0.qualifier
 Bundle-Vendor: Arm Limited
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: com.arm.cmsis.pack.build,

com.arm.cmsis.pack.data/pom.xml

@@ -5,7 +5,7 @@
   <parent>
   	<groupId>com.arm.cmsis</groupId>
   	<artifactId>com.arm.cmsis.parent.sign</artifactId>
-  	<version>2.8.0-SNAPSHOT</version>
+  	<version>2.9.0-SNAPSHOT</version>
   	<relativePath>../com.arm.cmsis.parent.sign</relativePath>
   </parent>
 </project>

com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpAttributes.java

@@ -36,7 +36,8 @@ public CpAttributes(IAttributes copyFrom) {
 
     @Override
     public boolean matchAttribute(String key, String value, String pattern) {
-        if (CmsisConstants.DVENDOR.equals(key)) {
+        if (CmsisConstants.DVENDOR.equals(key) || CmsisConstants.BVENDOR.equals(key)
+                || CmsisConstants.VENDOR.equals(key)) {
             return DeviceVendor.match(value, pattern);
         }
         if (CmsisConstants.DCDECP.equals(key)) { // CDE support

com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpBoard.java

@@ -60,6 +60,23 @@ public boolean hasCompatibleDevice(IAttributes deviceAttributes) {
         return containsDevice(deviceAttributes, false);
     }
 
+    @Override
+    public boolean hasMcu() {
+        Collection<? extends ICpItem> children = getChildren();
+        if (children == null) {
+            return false;
+        }
+        for (ICpItem item : children) {
+            if (CmsisConstants.COMPATIBLE_DEVICE_TAG.equals(item.getTag())) {
+                String dname = item.getDeviceName();
+                if (!dname.isEmpty() && CmsisConstants.NO_MCU.equals(dname)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
     protected boolean containsDevice(IAttributes deviceAttributes, boolean bOnlyMounted) {
         Collection<? extends ICpItem> children = getChildren();
         if (children == null) {

com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpConditionContext.java

@@ -30,13 +30,11 @@ public class CpConditionContext extends CpAttributes implements ICpConditionCont
 
     // temporary variables
     private Set<ICpCondition> tConditionsBeingEvaluated = new HashSet<>(); // to prevent recursion
-    protected boolean tbDeny = false; // flag is set when deny expression is evaluated
 
     @Override
     public void resetResult() {
         fResult = EEvaluationResult.IGNORED;
         fResults = null;
-        tbDeny = false;
         tConditionsBeingEvaluated.clear();
     }
 
@@ -113,10 +111,11 @@ public EEvaluationResult evaluateExpression(ICpExpression expression) {
             return b ? EEvaluationResult.FULFILLED : EEvaluationResult.FAILED;
         case ICpExpression.REFERENCE_EXPRESSION:
             return evaluate(expression.getCondition());
+        case ICpExpression.HW_EXPRESSION:
         default:
             break;
         }
-        return EEvaluationResult.ERROR;
+        return EEvaluationResult.IGNORED; // ignore unknown expressions
     }
 
     @Override
@@ -133,11 +132,7 @@ public EEvaluationResult evaluateCondition(ICpCondition condition) {
             if (!(child instanceof ICpExpression))
                 continue;
             ICpExpression expr = (ICpExpression) child;
-            boolean bDeny = tbDeny; // save deny context
-            if (expr.getExpressionType() == ICpExpression.DENY_EXPRESSION)
-                tbDeny = !tbDeny; // invert the deny context
             EEvaluationResult res = evaluate(expr);
-            tbDeny = bDeny; // restore deny context
             if (res == EEvaluationResult.IGNORED || res == EEvaluationResult.UNDEFINED)
                 continue;
             else if (res == EEvaluationResult.ERROR)