Skip to content

Commit

Permalink
Version 2.7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Evgueni Driouk committed Jun 14, 2022
1 parent 947ea17 commit e767fbc
Show file tree
Hide file tree
Showing 67 changed files with 252 additions and 344 deletions.
2 changes: 1 addition & 1 deletion com.arm.cmsis.config.tests/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
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.6.1.qualifier
Bundle-Version: 2.7.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
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>com.arm.cmsis</groupId>
<artifactId>com.arm.cmsis.parent</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.7.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.6.1-SNAPSHOT</version>
<version>2.7.0-SNAPSHOT</version>
</artifact>
</target>
<environments>
Expand Down
2 changes: 1 addition & 1 deletion com.arm.cmsis.config/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
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.6.1.qualifier
Bundle-Version: 2.7.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
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.arm.cmsis</groupId>
<artifactId>com.arm.cmsis.parent.sign</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.7.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
Original file line number Diff line number Diff line change
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.6.1.qualifier
Bundle-Version: 2.7.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
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.arm.cmsis</groupId>
<artifactId>com.arm.cmsis.parent.sign</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.7.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
Original file line number Diff line number Diff line change
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.6.1.qualifier
Bundle-Version: 2.7.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
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.arm.cmsis</groupId>
<artifactId>com.arm.cmsis.parent.sign</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.7.0-SNAPSHOT</version>
<relativePath>../com.arm.cmsis.parent.sign</relativePath>
</parent>
</project>
10 changes: 6 additions & 4 deletions com.arm.cmsis.pack.build.armcc/src/com/arm/cmsis/pack/build/armcc/ArmccToolChainAdapter.java
View file
Original file line number Diff line number Diff line change
@@ -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 @@ -742,6 +742,7 @@ protected String getCpuPrefix(String cpu, String mve) {
bMve = true;
break;
case "Cortex-M55": //$NON-NLS-1$
case "Cortex-M85": //$NON-NLS-1$
bMve = true;
break;
default:
Expand All @@ -768,7 +769,7 @@ protected String getCpuPrefix(String cpu, String mve) {
*
* @param cpu device info's Dcore attribute
* @param fpu device info's Dfpu attribute
* @param mve device info's Ddsp attribute
* @param dsp device info's Ddsp attribute
* @param mve device info's Dmve attribute
* @return resulting FPU string
*/
Expand All @@ -777,7 +778,7 @@ public String getFpuSuffix(String cpu, String fpu, String dsp, String mve) {
if (CmsisConstants.FP_MVE.equals(mve)) {
return "FP16.FP32"; //$NON-NLS-1$
}
if ("Cortex-M33".equals(cpu)) { //$NON-NLS-1$
if ("Cortex-M33".equals(cpu) || "Star-MC1".equals(cpu)) { //$NON-NLS-1$
if (!CmsisConstants.DSP.equals(dsp)) {
return NoDSP_NoFPU;
}
Expand Down Expand Up @@ -835,12 +836,13 @@ public String getFpuSuffix(String cpu, String fpu, String dsp, String mve) {
case "ARMV81MML": //$NON-NLS-1$
return dp ? "FP16.FP32.FP64" : "FP16.FP32"; //$NON-NLS-1$ //$NON-NLS-2$
case "Cortex-M55": //$NON-NLS-1$
case "Cortex-M85": //$NON-NLS-1$
return "FP16.FP32.FP64"; // $NON-NLS-2$

case "Cortex-M35P": //$NON-NLS-1$
case "Cortex-M33": //$NON-NLS-1$
case "Star-MC1": //$NON-NLS-1$
return "FPv5_SP_D16"; //$NON-NLS-1$

}
return NoFPU;
}
Expand Down
2 changes: 1 addition & 1 deletion com.arm.cmsis.pack.build.armgcc/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
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.6.1.qualifier
Bundle-Version: 2.7.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
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.arm.cmsis</groupId>
<artifactId>com.arm.cmsis.parent.sign</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.7.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
Original file line number Diff line number Diff line change
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.6.1.qualifier
Bundle-Version: 2.7.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
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.arm.cmsis</groupId>
<artifactId>com.arm.cmsis.parent.sign</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.7.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
Original file line number Diff line number Diff line change
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.6.1.qualifier
Bundle-Version: 2.7.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
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.arm.cmsis</groupId>
<artifactId>com.arm.cmsis.parent.sign</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.7.0-SNAPSHOT</version>
<relativePath>../com.arm.cmsis.parent.sign</relativePath>
</parent>
</project>
4 changes: 2 additions & 2 deletions com.arm.cmsis.pack.common.tests/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
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.6.1.qualifier
Bundle-Version: 2.7.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.6.1",
Require-Bundle: com.arm.cmsis.pack.common;bundle-version="2.7.0",
org.junit;bundle-version="4.12.0"
2 changes: 1 addition & 1 deletion com.arm.cmsis.pack.common.tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.arm.cmsis</groupId>
<artifactId>com.arm.cmsis.parent</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.7.0-SNAPSHOT</version>
<relativePath>../com.arm.cmsis.parent</relativePath>
</parent>

Expand Down
122 changes: 78 additions & 44 deletions com.arm.cmsis.pack.common.tests/src/com/arm/cmsis/pack/utils/WildCardsTest.java
View file
Original file line number Diff line number Diff line change
@@ -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 All @@ -18,59 +18,93 @@

public class WildCardsTest {

private String[] baseStrings = new String[] { "a*d", "STM32F10[123]?[CDE]", "*", "a*", "a*d", "*d", "abcd", "abcd",
"abcd", "ab?d", "abc?", "abc[XY]-[12]", "abc[XY]-[12]", "abc[XY]-[12]" };
private String[] matchedStrings = new String[] { "a.d", "STM32F103ZE", "x", "ab", "axd", "xd", "abcd", "abcd",
"?bcd", "ab??", "abcx", "abcX-1", "abcY-1", "abcY-1" };
private String[] noMatchedStrings = new String[] { "a.d.d", "STM32F103ZF", "", "bb", "axe", "xf", "abxx", "abxyz",
"xycd", "?bce", "abc??", "abcX-13", "abcY-13", "abcZ-1" };
private String[] matchedStringsNoCase = new String[] { "a.D", "STM32F103Ze", "X", "Ab", "Axd", "Xd", "Abcd", "Abcd",
"?Bcd", "Ab??", "Abcx", "AbcX-1", "AbcY-1", "AbcY-1" };
private String[] noMatchedStringsNoCase = new String[] { "a.D.d", "STM32F103Zf", "", "Bb", "Axe", "Xf", "Abxx",
"Abxyz", "Xycd", "?Bce", "Abc??", "AbcX-13", "AbcY-13", "AbcZ-1" };
private String[] baseStrings = new String[] { "STM32F10[123]?[CDE]", "*", "?*", "*?*", "**?" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
private String[] matchedStrings = new String[] { "STM32F103ZE", "*?", "?*?", "**", "**" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$

@Test
public void testMatch() {
boolean result = false;
String msg = null;
for (int i = 0; i < baseStrings.length; i++) {
result = WildCards.match(baseStrings[i], matchedStrings[i]);
msg = result ? "Strings match" : "Strings do not match";
assertTrue(msg, result);
assertTrue(WildCards.match(baseStrings[i], matchedStrings[i]));
}
}

@Test
public void testNoMatch() {
boolean result = false;
String msg = null;
for (int i = 0; i < baseStrings.length; i++) {
result = WildCards.match(baseStrings[i], noMatchedStrings[i]);
msg = result ? "Strings match" : "Strings do not match";
assertFalse(msg, result);
}
}

@Test
public void testMatchNoCase() {
boolean result = false;
String msg = null;
for (int i = 0; i < baseStrings.length; i++) {
result = WildCards.matchNoCase(baseStrings[i], matchedStringsNoCase[i]);
msg = result ? "Strings match (no case)" : "Strings do not match";
assertTrue(msg, result);
}
public void testMatchStrings() {
assertTrue(WildCards.match("a", "a")); //$NON-NLS-1$ //$NON-NLS-2$
assertFalse(WildCards.match("a", "")); //$NON-NLS-1$ //$NON-NLS-2$
assertFalse(WildCards.match("", "d")); //$NON-NLS-1$ //$NON-NLS-2$
assertFalse(WildCards.match("", "*")); //$NON-NLS-1$ //$NON-NLS-2$
assertTrue(WildCards.match("a*", "a*d")); //$NON-NLS-1$ //$NON-NLS-2$
assertFalse(WildCards.match("a*", "*d")); //$NON-NLS-1$ //$NON-NLS-2$
assertTrue(WildCards.match("a*", "abcd")); //$NON-NLS-1$ //$NON-NLS-2$
assertFalse(WildCards.match("a*", "xycd")); //$NON-NLS-1$ //$NON-NLS-2$
assertTrue(WildCards.match("a*d", "*d")); //$NON-NLS-1$ //$NON-NLS-2$
assertTrue(WildCards.match("a*d", "abcd")); //$NON-NLS-1$ //$NON-NLS-2$
assertFalse(WildCards.match("a*d", "abxx")); //$NON-NLS-1$ //$NON-NLS-2$
assertFalse(WildCards.match("a*d", "abxyz")); //$NON-NLS-1$ //$NON-NLS-2$
assertFalse(WildCards.match("a*d", "xycd")); //$NON-NLS-1$ //$NON-NLS-2$
assertTrue(WildCards.match("*d", "abcd")); //$NON-NLS-1$ //$NON-NLS-2$
assertTrue(WildCards.match("*d", "d")); //$NON-NLS-1$ //$NON-NLS-2$
assertTrue(WildCards.match("*c*", "abcd")); //$NON-NLS-1$ //$NON-NLS-2$
assertTrue(WildCards.match("abcd", "a**d")); //$NON-NLS-1$ //$NON-NLS-2$
assertTrue(WildCards.match("abcd", "a??d")); //$NON-NLS-1$ //$NON-NLS-2$
assertTrue(WildCards.match("abcd", "?bc?")); //$NON-NLS-1$ //$NON-NLS-2$
assertTrue(WildCards.match("abc?", "abc*")); //$NON-NLS-1$ //$NON-NLS-2$
assertTrue(WildCards.match("ab?d", "ab??")); //$NON-NLS-1$ //$NON-NLS-2$
assertFalse(WildCards.match("ab?d", "abc??")); //$NON-NLS-1$ //$NON-NLS-2$
assertFalse(WildCards.match("?bcd", "abc??")); //$NON-NLS-1$ //$NON-NLS-2$
assertTrue(WildCards.match("?bcd", "*bcd")); //$NON-NLS-1$ //$NON-NLS-2$
assertFalse(WildCards.match("?bcd", "abc???")); //$NON-NLS-1$ //$NON-NLS-2$
assertTrue(WildCards.match("abc?", "ab??")); //$NON-NLS-1$ //$NON-NLS-2$
assertFalse(WildCards.match("abc?", "abc??")); //$NON-NLS-1$ //$NON-NLS-2$
assertFalse(WildCards.match("ab??", "abc??")); //$NON-NLS-1$ //$NON-NLS-2$
assertTrue(WildCards.match("abc*", "ab*?")); //$NON-NLS-1$ //$NON-NLS-2$
assertTrue(WildCards.match("abc*", "abc?*")); //$NON-NLS-1$ //$NON-NLS-2$
assertTrue(WildCards.match("ab*?", "abc?*")); //$NON-NLS-1$ //$NON-NLS-2$
assertFalse(WildCards.match("abcX-1", "abcX-2")); //$NON-NLS-1$ //$NON-NLS-2$
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("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$
assertTrue(WildCards.match("Prefix_*_Suffix", "Prefix_Mid_Suffix")); //$NON-NLS-1$ //$NON-NLS-2$
assertTrue(WildCards.match("Prefix_*_Suffix", "Prefix_Mid_V_Suffix")); //$NON-NLS-1$ //$NON-NLS-2$
assertTrue(WildCards.match("Prefix_*_Suffix", "Prefix_Mid_Suffix_Suffix")); //$NON-NLS-1$ //$NON-NLS-2$
assertTrue(WildCards.match("Prefix*_Suffix", "Prefix_Mid_Suffix")); //$NON-NLS-1$ //$NON-NLS-2$
assertTrue(WildCards.match("Prefix*Suffix", "Prefix_Mid_Suffix")); //$NON-NLS-1$ //$NON-NLS-2$
assertTrue(WildCards.match("Prefix*Suffix", "Prefix_Mid_Suffix_Suffix")); //$NON-NLS-1$ //$NON-NLS-2$
assertTrue(WildCards.match("Prefix_*Suffix", "Prefix_Mid_Suffix")); //$NON-NLS-1$ //$NON-NLS-2$
assertTrue(WildCards.match("Prefix.*.Suffix", "Prefix.Mid.Suffix")); //$NON-NLS-1$ //$NON-NLS-2$
}

@Test
public void testNoMatchNoCase() {
boolean result = false;
String msg = null;
for (int i = 0; i < baseStrings.length; i++) {
result = WildCards.matchNoCase(baseStrings[i], noMatchedStringsNoCase[i]);
msg = result ? "Strings match (no case)" : "Strings do not match";
assertFalse(msg, result);
}
public void testMatchStringsNoCase() {
assertTrue(WildCards.match("a", "A", true)); //$NON-NLS-1$ //$NON-NLS-2$
assertFalse(WildCards.match("a", "A", false)); //$NON-NLS-1$ //$NON-NLS-2$
assertTrue(WildCards.match("a*", "A*?", true)); //$NON-NLS-1$ //$NON-NLS-2$
assertFalse(WildCards.match("a*", "A*?", false)); //$NON-NLS-1$ //$NON-NLS-2$
assertTrue(WildCards.match("?*a", "?*?A", true)); //$NON-NLS-1$ //$NON-NLS-2$
assertFalse(WildCards.match("?*a", "?*?A", false)); //$NON-NLS-1$ //$NON-NLS-2$
assertTrue(WildCards.match("*?*a", "**A", true)); //$NON-NLS-1$ //$NON-NLS-2$
assertFalse(WildCards.match("*?*a", "**A", false)); //$NON-NLS-1$ //$NON-NLS-2$
assertTrue(WildCards.match("**?a", "**A", true)); //$NON-NLS-1$ //$NON-NLS-2$
assertFalse(WildCards.match("**?a", "**A", false)); //$NON-NLS-1$ //$NON-NLS-2$
assertTrue(WildCards.match("Prefix_*_Suffix", "PREFIX_Mid_SUFFIX", true)); //$NON-NLS-1$ //$NON-NLS-2$
assertFalse(WildCards.match("Prefix_*_Suffix", "PREFIX_MID_SUFFIX", false)); //$NON-NLS-1$ //$NON-NLS-2$
assertTrue(WildCards.match("Prefix_*_Suffix", "PREFIX_Mid_SUFFIX", true)); //$NON-NLS-1$ //$NON-NLS-2$
assertFalse(WildCards.match("Prefix_*_Suffix", "PREFIX_MID_SUFFIX", false)); //$NON-NLS-1$ //$NON-NLS-2$
assertTrue(WildCards.match("Prefix_*_Suffix", "PREFIX_MID_V_SUFFIX", true)); //$NON-NLS-1$ //$NON-NLS-2$
assertFalse(WildCards.match("Prefix_*_Suffix", "PREFIX_MID_V_SUFFIX", false)); //$NON-NLS-1$ //$NON-NLS-2$
assertTrue(WildCards.match("Prefix_*_Suffix", "PREFIX_MID_SUFFIX_SUFFIX", true)); //$NON-NLS-1$ //$NON-NLS-2$
assertFalse(WildCards.match("Prefix_*_Suffix", "PREFIX_MID_SUFFIX_SUFFIX", false)); //$NON-NLS-1$ //$NON-NLS-2$
assertTrue(WildCards.match("Prefix*_Suffix", "PREFIX_MID_SUFFIX", true)); //$NON-NLS-1$ //$NON-NLS-2$
assertFalse(WildCards.match("Prefix*_Suffix", "PREFIX_MID_SUFFIX", false)); //$NON-NLS-1$ //$NON-NLS-2$
assertTrue(WildCards.match("Prefix*Suffix", "PREFIX_MID_SUFFIX_SUFFIX", true)); //$NON-NLS-1$ //$NON-NLS-2$
assertFalse(WildCards.match("Prefix*Suffix", "PREFIX_MID_SUFFIX_SUFFIX", false)); //$NON-NLS-1$ //$NON-NLS-2$
assertTrue(WildCards.match("Prefix_*Suffix", "PREFIX_MID_SUFFIX", true)); //$NON-NLS-1$ //$NON-NLS-2$
assertFalse(WildCards.match("Prefix_*Suffix", "PREFIX_MID_SUFFIX", false)); //$NON-NLS-1$ //$NON-NLS-2$
assertTrue(WildCards.match("Prefix.*.Suffix", "PREFIX.MID.SUFFIX", true)); //$NON-NLS-1$ //$NON-NLS-2$
assertFalse(WildCards.match("Prefix.*.Suffix", "PREFIX.MID.SUFFIX", false)); //$NON-NLS-1$ //$NON-NLS-2$
}

}
2 changes: 1 addition & 1 deletion com.arm.cmsis.pack.common/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
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.6.1.qualifier
Bundle-Version: 2.7.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
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.arm.cmsis</groupId>
<artifactId>com.arm.cmsis.parent.sign</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.7.0-SNAPSHOT</version>
<relativePath>../com.arm.cmsis.parent.sign</relativePath>
</parent>
</project>
1 change: 1 addition & 0 deletions com.arm.cmsis.pack.common/resources/deviceVendors.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@
18 = Nuvoton
11|78 = NXP|NXP (founded by Philips)|Freescale|Freescale Semiconductor|Freescale Semiconductors
108 = OKI SEMICONDUCTOR CO.,LTD.
141 = onsemi|ONSemiconductor
44 = Oregano Systems
105= PalmChip
79 = Philips
Expand Down
Loading

0 comments on commit e767fbc

Please sign in to comment.