Skip to content

Commit

Permalink
2.8.0 release
Browse files Browse the repository at this point in the history
  • Loading branch information
Evgueni Driouk committed Sep 28, 2022
1 parent e767fbc commit 41a193a
Show file tree
Hide file tree
Showing 123 changed files with 1,776 additions and 1,190 deletions.
2 changes: 1 addition & 1 deletion com.arm.cmsis.config.tests/META-INF/MANIFEST.MF
View file
Expand Up @@ -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.7.0.qualifier
Bundle-Version: 2.8.0.qualifier
Bundle-Vendor: Arm Limited
Fragment-Host: com.arm.cmsis.config
Bundle-RequiredExecutionEnvironment: JavaSE-11
Expand Down
4 changes: 2 additions & 2 deletions com.arm.cmsis.config.tests/pom.xml
View file
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>com.arm.cmsis</groupId>
<artifactId>com.arm.cmsis.parent</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
<relativePath>../com.arm.cmsis.parent</relativePath>
</parent>
<properties>
Expand All @@ -34,7 +34,7 @@
<artifact>
<groupId>com.arm.cmsis</groupId>
<artifactId>com.arm.cmsis.tests.target</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
</artifact>
</target>
<environments>
Expand Down
2 changes: 1 addition & 1 deletion com.arm.cmsis.config/META-INF/MANIFEST.MF
View file
Expand Up @@ -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.7.0.qualifier
Bundle-Version: 2.8.0.qualifier
Bundle-Activator: com.arm.cmsis.config.ConfigPlugIn
Bundle-Vendor: Arm Limited
Require-Bundle: org.eclipse.ui,
Expand Down
2 changes: 1 addition & 1 deletion com.arm.cmsis.config/pom.xml
View file
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.arm.cmsis</groupId>
<artifactId>com.arm.cmsis.parent.sign</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
<relativePath>../com.arm.cmsis.parent.sign</relativePath>
</parent>
</project>
2 changes: 1 addition & 1 deletion com.arm.cmsis.help/META-INF/MANIFEST.MF
View file
Expand Up @@ -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.7.0.qualifier
Bundle-Version: 2.8.0.qualifier
Bundle-Activator: com.arm.cmsis.help.HelpPlugIn
Bundle-Vendor: Arm Limited
Require-Bundle: org.eclipse.ui,
Expand Down
2 changes: 1 addition & 1 deletion com.arm.cmsis.help/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.arm.cmsis</groupId>
<artifactId>com.arm.cmsis.parent.sign</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
<relativePath>../com.arm.cmsis.parent.sign</relativePath>
</parent>
</project>
2 changes: 1 addition & 1 deletion com.arm.cmsis.pack.build.armcc/META-INF/MANIFEST.MF
View file
Expand Up @@ -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.7.0.qualifier
Bundle-Version: 2.8.0.qualifier
Bundle-Activator: com.arm.cmsis.pack.build.armcc.Activator
Bundle-Vendor: Arm Limited
Require-Bundle: org.eclipse.core.runtime,
Expand Down
2 changes: 1 addition & 1 deletion com.arm.cmsis.pack.build.armcc/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.arm.cmsis</groupId>
<artifactId>com.arm.cmsis.parent.sign</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
<relativePath>../com.arm.cmsis.parent.sign</relativePath>
</parent>
</project>
2 changes: 2 additions & 0 deletions com.arm.cmsis.pack.build.armcc/src/com/arm/cmsis/pack/build/armcc/ScatterFileGenerator.java
View file
Expand Up @@ -100,6 +100,8 @@ protected void generateRemainingRoms(IMemorySettings memorySetttings) {
ICpMemory m = e.getValue();
if (!m.isROM())
continue;
if (!m.isDefault())
continue;

generateAddressLine("LR_", id, " {", m, false); //$NON-NLS-1$//$NON-NLS-2$
generateAddressLine(" ER_", id, " { ; load address = execution address", m, false); //$NON-NLS-1$ //$NON-NLS-2$
Expand Down
2 changes: 1 addition & 1 deletion com.arm.cmsis.pack.build.armgcc/META-INF/MANIFEST.MF
View file
Expand Up @@ -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.7.0.qualifier
Bundle-Version: 2.8.0.qualifier
Bundle-Activator: com.arm.cmsis.pack.build.armgcc.Activator
Bundle-Vendor: Arm Limited
Require-Bundle: org.eclipse.core.runtime,
Expand Down
2 changes: 1 addition & 1 deletion com.arm.cmsis.pack.build.armgcc/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.arm.cmsis</groupId>
<artifactId>com.arm.cmsis.parent.sign</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
<relativePath>../com.arm.cmsis.parent.sign</relativePath>
</parent>
</project>
2 changes: 1 addition & 1 deletion com.arm.cmsis.pack.build.gnuarmeclipse/META-INF/MANIFEST.MF
View file
Expand Up @@ -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.7.0.qualifier
Bundle-Version: 2.8.0.qualifier
Bundle-Activator: com.arm.cmsis.pack.build.gnuarmeclipse.Activator
Bundle-Vendor: Arm Limited
Require-Bundle: org.eclipse.core.runtime,
Expand Down
2 changes: 1 addition & 1 deletion com.arm.cmsis.pack.build.gnuarmeclipse/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.arm.cmsis</groupId>
<artifactId>com.arm.cmsis.parent.sign</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
<relativePath>../com.arm.cmsis.parent.sign</relativePath>
</parent>
</project>
2 changes: 1 addition & 1 deletion com.arm.cmsis.pack.build.settings/META-INF/MANIFEST.MF
View file
Expand Up @@ -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.7.0.qualifier
Bundle-Version: 2.8.0.qualifier
Bundle-Activator: com.arm.cmsis.pack.build.settings.Activator
Bundle-Vendor: Arm Limited
Require-Bundle: org.eclipse.core.runtime,
Expand Down
2 changes: 1 addition & 1 deletion com.arm.cmsis.pack.build.settings/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.arm.cmsis</groupId>
<artifactId>com.arm.cmsis.parent.sign</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
<relativePath>../com.arm.cmsis.parent.sign</relativePath>
</parent>
</project>
18 changes: 12 additions & 6 deletions ....cmsis.pack.build.settings/src/com/arm/cmsis/pack/build/settings/RteToolChainAdapter.java
View file
Expand Up @@ -728,21 +728,27 @@ protected String getRteOptionValue(int oType, IBuildSettings buildSettings, IOpt
* @return CPU option string
*/
protected String getDeviceAttribute(int oType, IBuildSettings buildSettings) {
String value = null;
switch (oType) {
case IBuildSettings.CPU_OPTION:
return buildSettings.getDeviceAttribute(CmsisConstants.DCORE);
value = buildSettings.getDeviceAttribute(CmsisConstants.DCORE);
break;
case IBuildSettings.FPU_OPTION:
return buildSettings.getDeviceAttribute(CmsisConstants.DFPU);
value = buildSettings.getDeviceAttribute(CmsisConstants.DFPU);
break;
case IBuildSettings.DSP_OPTION:
return buildSettings.getDeviceAttribute(CmsisConstants.DDSP);
value = buildSettings.getDeviceAttribute(CmsisConstants.DDSP);
break;
case IBuildSettings.ENDIAN_OPTION:
return buildSettings.getDeviceAttribute(CmsisConstants.DENDIAN);
value = buildSettings.getDeviceAttribute(CmsisConstants.DENDIAN);
break;
case IBuildSettings.MVE_OPTION:
return buildSettings.getDeviceAttribute(CmsisConstants.DMVE);
value = buildSettings.getDeviceAttribute(CmsisConstants.DMVE);
break;
default:
break;
}
return null;
return value != null ? value : CmsisConstants.EMPTY_STRING;
}

/**
Expand Down
4 changes: 2 additions & 2 deletions com.arm.cmsis.pack.common.tests/META-INF/MANIFEST.MF
View file
Expand Up @@ -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.7.0.qualifier
Bundle-Version: 2.8.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.7.0",
Require-Bundle: com.arm.cmsis.pack.common;bundle-version="2.8.0",
org.junit;bundle-version="4.12.0"
2 changes: 1 addition & 1 deletion com.arm.cmsis.pack.common.tests/pom.xml
View file
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.arm.cmsis</groupId>
<artifactId>com.arm.cmsis.parent</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
<relativePath>../com.arm.cmsis.parent</relativePath>
</parent>

Expand Down
2 changes: 2 additions & 0 deletions com.arm.cmsis.pack.common.tests/src/com/arm/cmsis/pack/utils/WildCardsTest.java
View file
Expand Up @@ -65,6 +65,8 @@ public void testMatchStrings() {
assertFalse(WildCards.match("abcX-1", "abcX-3")); //$NON-NLS-1$ //$NON-NLS-2$
assertFalse(WildCards.match("abcX-1", "abcY-1")); //$NON-NLS-1$ //$NON-NLS-2$
assertFalse(WildCards.match("abcX-1", "abcY-2")); //$NON-NLS-1$ //$NON-NLS-2$
assertTrue(WildCards.match("{*}", "{somestring}")); //$NON-NLS-1$ //$NON-NLS-2$
assertTrue(WildCards.match("$*", "$somestring")); //$NON-NLS-1$ //$NON-NLS-2$
assertTrue(WildCards.match("abcX-1", "abc[XY]-[12]")); //$NON-NLS-1$ //$NON-NLS-2$
assertFalse(WildCards.match("abcZ-1", "abc[XY]-[12]")); //$NON-NLS-1$ //$NON-NLS-2$
assertTrue(WildCards.match("abcY-2", "abc[XY]-[12]")); //$NON-NLS-1$ //$NON-NLS-2$
Expand Down
2 changes: 1 addition & 1 deletion com.arm.cmsis.pack.common/META-INF/MANIFEST.MF
View file
Expand Up @@ -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.7.0.qualifier
Bundle-Version: 2.8.0.qualifier
Bundle-Vendor: Arm Limited
Bundle-RequiredExecutionEnvironment: JavaSE-11
Export-Package: com.arm.cmsis.pack.common,
Expand Down
2 changes: 1 addition & 1 deletion com.arm.cmsis.pack.common/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.arm.cmsis</groupId>
<artifactId>com.arm.cmsis.parent.sign</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
<relativePath>../com.arm.cmsis.parent.sign</relativePath>
</parent>
</project>
11 changes: 10 additions & 1 deletion com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/common/CmsisConstants.java
View file
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2021 ARM Ltd. and others
* Copyright (c) 2022 ARM Ltd. and others
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
Expand Down Expand Up @@ -102,6 +102,10 @@ public class CmsisConstants {
public static final String MAX_INSTANCES = "maxInstances"; //$NON-NLS-1$
public static final String IS_DEFAULT_VARIANT = "isDefaultVariant"; //$NON-NLS-1$

public static final String BNAME = "Bname"; //$NON-NLS-1$
public static final String BVENDOR = "Bvendor"; //$NON-NLS-1$
public static final String BREVISION = "Brevision"; //$NON-NLS-1$

public static final String DNAME = "Dname"; //$NON-NLS-1$
public static final String DFAMILY = "Dfamily"; //$NON-NLS-1$
public static final String DSUBFAMILY = "DsubFamily"; //$NON-NLS-1$
Expand Down Expand Up @@ -242,6 +246,7 @@ public class CmsisConstants {
public static final String RELEASES_TAG = "releases"; //$NON-NLS-1$
public static final String DEVICE_TAG = "device"; //$NON-NLS-1$
public static final String DEVICES_TAG = "devices"; //$NON-NLS-1$
public static final String DEVICES = "Devices"; //$NON-NLS-1$
public static final String FAMILY_TAG = "family"; //$NON-NLS-1$
public static final String SUBFAMILY_TAG = "subFamily"; //$NON-NLS-1$
public static final String VARIANT_TAG = "variant"; //$NON-NLS-1$
Expand Down Expand Up @@ -405,9 +410,12 @@ public class CmsisConstants {
// board tags and attributes
public static final String ALL_BOARDS = "All Boards"; //$NON-NLS-1$
public static final String ALL_DEVICES = "All Devices"; //$NON-NLS-1$
public static final String NO_BOARD = "- No Board -"; //$NON-NLS-1$

public static final String BOARD_TAG = "board"; //$NON-NLS-1$
public static final String BOARDS_TAG = "boards"; //$NON-NLS-1$
public static final String BOARDS = "Boards"; //$NON-NLS-1$
public static final String BOARD_ID = "boardId"; //$NON-NLS-1$
public static final String REVISION = "revision"; //$NON-NLS-1$
public static final String MOUNTED_DEVICE_TAG = "mountedDevice"; //$NON-NLS-1$
public static final String COMPATIBLE_DEVICE_TAG = "compatibleDevice"; //$NON-NLS-1$
Expand All @@ -417,6 +425,7 @@ public class CmsisConstants {
// configuration tags and attributes
public static final String INSTANCES = "instances"; //$NON-NLS-1$
public static final String DEVICE_DEPENDENT = "deviceDependent";//$NON-NLS-1$
public static final String BOARD_DEPENDENT = "boardeDependent";//$NON-NLS-1$

public static final String TOOLCHAIN_TAG = "toolchain"; //$NON-NLS-1$
public static final String CONFIGURATION_TAG = "configuration"; //$NON-NLS-1$
Expand Down
4 changes: 2 additions & 2 deletions com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/utils/DeviceVendor.java
View file
Expand Up @@ -133,7 +133,7 @@ public static String getVendorUrl(String vendor) {
String name = getOfficialVendorName(vendor);
String url = KEIL_DD2_URL;
if (name.startsWith("STMicro")) //$NON-NLS-1$
url += "st"; //$NON-NLS-1$
url += "stmicroelectronics"; //$NON-NLS-1$
else if (name.equals("Microchip")) //$NON-NLS-1$
url += "atmel"; // TODO: a temporary fix until web sites are updated //$NON-NLS-1$
else
Expand All @@ -151,7 +151,7 @@ public static String getBoardVendorUrl(String vendor) {
String name = getOfficialVendorName(vendor);
String url = KEIL_BOARD2_URL;
if (name.startsWith("STMicro")) //$NON-NLS-1$
url += "st"; //$NON-NLS-1$
url += "stmicroelectronics"; //$NON-NLS-1$
else
url += adjutsToUrl(name);
return url;
Expand Down
29 changes: 20 additions & 9 deletions com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/utils/WildCards.java
View file
Expand Up @@ -11,6 +11,8 @@

package com.arm.cmsis.pack.utils;

import java.util.regex.PatternSyntaxException;

/**
* Utility class provides method to compare two string that can contain wild
* cards
Expand Down Expand Up @@ -38,7 +40,7 @@
*/
public class WildCards {

protected static final String[] WILDCARDS_CHARS = new String[] { ".", "?", "*", "[", "]" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
protected static final String[] WILDCARDS_CHARS = new String[] { "?", "*", "[", "]" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$

/**
* Private constructor to prevent instantiating the utility class
Expand All @@ -65,13 +67,17 @@ public static boolean match(final String str1, final String str2) {
if (str1.equals(str2)) {
return true;
}
// check if str1 contains wildcard
if (isWildCard(str1) && str2.matches(toRegEx(str1))) {
return true;
}
// check if str2 contains wildcard
if (isWildCard(str2) && str1.matches(toRegEx(str2))) {
return true;
try {
// check if str1 contains wildcard
if (isWildCard(str1) && str2.matches(toRegEx(str1))) {
return true;
}
// check if str2 contains wildcard
if (isWildCard(str2) && str1.matches(toRegEx(str2))) {
return true;
}
} catch (PatternSyntaxException e) {
return false; // invalid expression cannot be matched
}
return false;
}
Expand All @@ -92,7 +98,12 @@ public static boolean isWildCard(String str) {
* @return regular expression string
*/
public static String toRegEx(String str) {
return str.replace(".", "\\.").replace('?', '.').replace("*", ".*"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
return str.replace(".", "\\."). //$NON-NLS-1$
replace("$", "\\$"). //$NON-NLS-1$
replace("}", "\\}"). //$NON-NLS-1$
replace("{", "\\{"). //$NON-NLS-1$
replace('?', '.'). // $NON-NLS-1$
replace("*", ".*"); //$NON-NLS-1$
}

/**
Expand Down
2 changes: 1 addition & 1 deletion com.arm.cmsis.pack.data/META-INF/MANIFEST.MF
View file
Expand Up @@ -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.7.0.qualifier
Bundle-Version: 2.8.0.qualifier
Bundle-Vendor: Arm Limited
Bundle-RequiredExecutionEnvironment: JavaSE-11
Export-Package: com.arm.cmsis.pack.build,
Expand Down
2 changes: 1 addition & 1 deletion com.arm.cmsis.pack.data/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.arm.cmsis</groupId>
<artifactId>com.arm.cmsis.parent.sign</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
<relativePath>../com.arm.cmsis.parent.sign</relativePath>
</parent>
</project>

0 comments on commit 41a193a

Please sign in to comment.