Skip to content

Commit ca35a4f

Browse files
committed
force use ';' as the includePath delimiter for mdk
1 parent b28baaa commit ca35a4f

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

src/KeilXmlParser.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ export abstract class KeilParser<T> {
131131

132132
protected parseIncludePaths(str: string): string[] {
133133
if (typeof str !== 'string') return [];
134-
return this._splitPathSeparator(str, new RegExp(File.delimiter + '\\s*'))
134+
return this._splitPathSeparator(str, /;\s*/)
135135
.map<string>((path) => this.ToAbsolutePath(path));
136136
}
137137

@@ -538,7 +538,7 @@ class C51Parser extends KeilParser<KeilC51Option> {
538538
target.TargetOption.Target51.C51.VariousControls.IncludePath = mergedDep.incList
539539
.map(s => prj.resolveEnvVar(s))
540540
.map(inc => File.ToLocalPath(prj.toRelativePath(inc)))
541-
.join(File.delimiter);
541+
.join(';');
542542

543543
target.TargetOption.Target51.C51.VariousControls.Define = mergedDep.defineList.join(",");
544544

@@ -1362,7 +1362,7 @@ class ARMParser extends KeilParser<KeilARMOption> {
13621362
target.TargetOption.TargetArmAds.Cads.VariousControls.IncludePath = mergedDep.incList
13631363
.map(s => prj.resolveEnvVar(s))
13641364
.map(inc => File.ToLocalPath(prj.toRelativePath(inc)))
1365-
.join(File.delimiter);
1365+
.join(';');
13661366

13671367
target.TargetOption.TargetArmAds.Cads.VariousControls.Define = mergedDep.defineList.join(","); // C/CPP
13681368
target.TargetOption.TargetArmAds.Aads.VariousControls.Define = mergedDep.defineList.join(","); // ASM

0 commit comments

Comments
 (0)