Skip to content

Commit bbed7d1

Browse files
kanami09HuPengtao
kanami09
authored and
HuPengtao
committed
fix: correct paths in Keil export when output dir differs from EIDE project root
- prompt user to choose the export path via save dialog - compute all paths (includes, source files, scatter file, output dir) relative to the chosen Keil project directory instead of the EIDE root
1 parent 972ed86 commit bbed7d1

3 files changed

Lines changed: 48 additions & 24 deletions

File tree

‎src/EIDEProject.ts‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3414,7 +3414,7 @@ $(OUT_DIR):
34143414

34153415
protected abstract create(option: CreateOptions): File;
34163416

3417-
abstract ExportToKeilProject(): File | undefined;
3417+
abstract ExportToKeilProject(saveFile?: File): File | undefined;
34183418

34193419
static NewProject(workspaceState: vscode.Memento): AbstractProject {
34203420
return new EIDEProject(workspaceState);
@@ -3813,7 +3813,7 @@ class EIDEProject extends AbstractProject {
38133813
return baseInfo.workspaceFile;
38143814
}
38153815

3816-
ExportToKeilProject(): File | undefined {
3816+
ExportToKeilProject(saveFile?: File): File | undefined {
38173817

38183818
let keilFile: File;
38193819

@@ -3826,8 +3826,8 @@ class EIDEProject extends AbstractProject {
38263826
const keilSuffix = prjConfig.type === 'C51' ? 'uvproj' : 'uvprojx';
38273827
const suffixFilter = [new RegExp('\\.' + keilSuffix + '$', 'i')];
38283828

3829-
// local keil file
3830-
const localKeilFile = File.fromArray([this.GetRootDir().path, `${prjConfig.name}.${keilSuffix}`]);
3829+
// use user-specified save path, or fall back to project root
3830+
const localKeilFile = saveFile ?? File.fromArray([this.GetRootDir().path, `${prjConfig.name}.${keilSuffix}`]);
38313831

38323832
// get from project root folder
38333833
if (localKeilFile.IsFile()) {
@@ -3892,10 +3892,13 @@ class EIDEProject extends AbstractProject {
38923892
// rm empty file groups for MDK
38933893
fileGroups = fileGroups.filter(g => g.files.length > 0);
38943894

3895+
const outDir = saveFile ? new File(NodePath.dirname(saveFile.path)) : this.GetRootDir();
3896+
const outName = saveFile ? saveFile.noSuffixName : localKeilFile.noSuffixName;
3897+
38953898
// set keil xml
3896-
keilParser.SetKeilXml(this, fileGroups, cDevice);
3899+
keilParser.SetKeilXml(this, fileGroups, outDir, cDevice);
38973900

3898-
return keilParser.Save(this.GetRootDir(), localKeilFile.noSuffixName);
3901+
return keilParser.Save(outDir, outName);
38993902
}
39003903

39013904
//////////////////////////////// overrride ///////////////////////////////////

‎src/EIDEProjectExplorer.ts‎

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4203,7 +4203,7 @@ export class ProjectExplorer implements CustomConfigurationProvider {
42034203
}
42044204
}
42054205

4206-
ExportKeilXml(prjItem: ProjTreeItem) {
4206+
async ExportKeilXml(prjItem: ProjTreeItem) {
42074207
try {
42084208
const prj = this.getProjectByTreeItem(prjItem);
42094209
if (!prj)
@@ -4221,7 +4221,26 @@ export class ProjectExplorer implements CustomConfigurationProvider {
42214221
return;
42224222
}
42234223

4224-
const xmlFile = prj.ExportToKeilProject();
4224+
const prjConfig = prj.GetConfiguration().config;
4225+
const keilSuffix = prjConfig.type === 'C51' ? 'uvproj' : 'uvprojx';
4226+
const defaultUri = vscode.Uri.file(NodePath.join(prj.GetRootDir().path, `${prjConfig.name}.${keilSuffix}`));
4227+
4228+
const uri = await vscode.window.showSaveDialog({
4229+
defaultUri: defaultUri,
4230+
filters: { 'Keil Project': [keilSuffix] }
4231+
});
4232+
if (!uri) return;
4233+
4234+
// warn if the chosen save path is on a different drive from the project root;
4235+
// in that case, cross-drive paths cannot be made relative and will be written as absolute paths
4236+
const saveDrive = NodePath.parse(uri.fsPath).root.toLowerCase();
4237+
const prjDrive = NodePath.parse(prj.GetRootDir().path).root.toLowerCase();
4238+
if (saveDrive !== prjDrive) {
4239+
GlobalEvent.emit('msg', newMessage('Warning',
4240+
`导出路径 (${saveDrive}) 与项目根目录 (${prjDrive}) 不在同一驱动器，此行为可能导致移动或复制项目后 Keil 无法正确识别文件。`));
4241+
}
4242+
4243+
const xmlFile = prj.ExportToKeilProject(new File(uri.fsPath));
42254244

42264245
if (xmlFile) {
42274246
GlobalEvent.emit('msg', newMessage('Info', export_keil_xml_ok + prj.toRelativePath(xmlFile.path)));

‎src/KeilXmlParser.ts‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ export abstract class KeilParser<T> {
306306

307307
abstract ParseData(): KeilParserResult<T>[];
308308

309-
abstract SetKeilXml(prj: AbstractProject, fileGroups: FileGroup[], deviceInfo?: CurrentDevice): void;
309+
abstract SetKeilXml(prj: AbstractProject, fileGroups: FileGroup[], keilOutputDir: File, deviceInfo?: CurrentDevice): void;
310310
}
311311

312312
//----
@@ -504,7 +504,7 @@ class C51Parser extends KeilParser<KeilC51Option> {
504504
}
505505
}
506506

507-
SetKeilXml(prj: AbstractProject, fileGroups: FileGroup[], deviceInfo?: CurrentDevice): void {
507+
SetKeilXml(prj: AbstractProject, fileGroups: FileGroup[], keilOutputDir: File, deviceInfo?: CurrentDevice): void {
508508

509509
const prjConfig: ProjectConfiguration<any> = prj.GetConfiguration();
510510
const target = this.doc.Project.Targets.Target[0];
@@ -534,14 +534,15 @@ class C51Parser extends KeilParser<KeilC51Option> {
534534
target.TargetOption.TargetCommonOption.Device = devName;
535535
target.TargetOption.TargetCommonOption.Vendor = vendor;
536536

537-
const outFolder = File.normalize(prjConfig.config.outDir);
538-
target.TargetOption.TargetCommonOption.OutputDirectory = `.\\${outFolder}\\Keil\\`;
539-
target.TargetOption.TargetCommonOption.ListingPath = `.\\${outFolder}\\Keil\\`;
537+
const outFolderAbs = prj.ToAbsolutePath(prjConfig.config.outDir);
538+
const outFolder = File.ToLocalPath(keilOutputDir.ToRelativePath(outFolderAbs) || outFolderAbs);
539+
target.TargetOption.TargetCommonOption.OutputDirectory = `${outFolder}\\Keil\\`;
540+
target.TargetOption.TargetCommonOption.ListingPath = `${outFolder}\\Keil\\`;
540541
target.TargetOption.TargetCommonOption.OutputName = target.TargetName;
541542

542543
target.TargetOption.Target51.C51.VariousControls.IncludePath = mergedDep.incList
543544
.map(s => prj.resolveEnvVar(s))
544-
.map(inc => File.ToLocalPath(prj.toRelativePath(inc)))
545+
.map(inc => { const abs = File.isAbsolute(inc) ? inc : prj.ToAbsolutePath(inc); return File.ToLocalPath(keilOutputDir.ToRelativePath(abs) || abs); })
545546
.join(';');
546547

547548
target.TargetOption.Target51.C51.VariousControls.Define = mergedDep.defineList.join(",");
@@ -563,7 +564,7 @@ class C51Parser extends KeilParser<KeilC51Option> {
563564
const fileElement = {
564565
FileName: _f.file.name,
565566
FileType: this.getFileType(_f.file).toString(),
566-
FilePath: prj.ToRelativePath(_f.file.path) || _f.file.path
567+
FilePath: File.ToLocalPath(keilOutputDir.ToRelativePath(_f.file.path) || _f.file.path)
567568
};
568569

569570
this.setFileDisableFlag(fileElement, _f.disabled);
@@ -1169,7 +1170,7 @@ class ARMParser extends KeilParser<KeilARMOption> {
11691170
return result;
11701171
}
11711172

1172-
private setOption(targetOptionObj: any, prj: AbstractProject) {
1173+
private setOption(targetOptionObj: any, prj: AbstractProject, keilOutputDir: File) {
11731174

11741175
const armAdsObj = targetOptionObj.TargetArmAds;
11751176
const prjConfig = <ProjectConfiguration<ArmBaseCompileData>>prj.GetConfiguration();
@@ -1213,7 +1214,7 @@ class ARMParser extends KeilParser<KeilARMOption> {
12131214
LDads.umfTarg = config.useCustomScatterFile ? '0' : '1';
12141215
if (config.scatterFilePath) {
12151216
const absPath = prj.ToAbsolutePath(config.scatterFilePath);
1216-
LDads.ScatterFile = this.ToRelativePath(absPath);
1217+
LDads.ScatterFile = File.ToLocalPath(keilOutputDir.ToRelativePath(absPath) || absPath);
12171218
} else {
12181219
LDads.ScatterFile = '';
12191220
}
@@ -1317,7 +1318,7 @@ class ARMParser extends KeilParser<KeilARMOption> {
13171318
}
13181319
}
13191320

1320-
SetKeilXml(prj: AbstractProject, fileGroups: FileGroup[], deviceInfo?: CurrentDevice): void {
1321+
SetKeilXml(prj: AbstractProject, fileGroups: FileGroup[], keilOutputDir: File, deviceInfo?: CurrentDevice): void {
13211322

13221323
const prjConfig: ProjectConfiguration<any> = prj.GetConfiguration();
13231324
const target = this.doc.Project.Targets.Target[0];
@@ -1369,14 +1370,15 @@ class ARMParser extends KeilParser<KeilARMOption> {
13691370
target.TargetOption.TargetCommonOption.Device = devName;
13701371
target.TargetOption.TargetCommonOption.Vendor = vendor;
13711372

1372-
const outFolder = File.normalize(prjConfig.config.outDir);
1373-
target.TargetOption.TargetCommonOption.OutputDirectory = `.\\${outFolder}\\Keil\\`;
1374-
target.TargetOption.TargetCommonOption.ListingPath = `.\\${outFolder}\\Keil\\`;
1373+
const outFolderAbs = prj.ToAbsolutePath(prjConfig.config.outDir);
1374+
const outFolder = File.ToLocalPath(keilOutputDir.ToRelativePath(outFolderAbs) || outFolderAbs);
1375+
target.TargetOption.TargetCommonOption.OutputDirectory = `${outFolder}\\Keil\\`;
1376+
target.TargetOption.TargetCommonOption.ListingPath = `${outFolder}\\Keil\\`;
13751377
target.TargetOption.TargetCommonOption.OutputName = target.TargetName;
13761378

13771379
target.TargetOption.TargetArmAds.Cads.VariousControls.IncludePath = mergedDep.incList
13781380
.map(s => prj.resolveEnvVar(s))
1379-
.map(inc => File.ToLocalPath(prj.toRelativePath(inc)))
1381+
.map(inc => { const abs = File.isAbsolute(inc) ? inc : prj.ToAbsolutePath(inc); return File.ToLocalPath(keilOutputDir.ToRelativePath(abs) || abs); })
13801382
.join(';');
13811383

13821384
target.TargetOption.TargetArmAds.Cads.VariousControls.Define = mergedDep.defineList.join(","); // C/CPP
@@ -1387,7 +1389,7 @@ class ARMParser extends KeilParser<KeilARMOption> {
13871389
target.TargetOption.TargetArmAds.Aads.VariousControls.Define = defines.join(","); // ASM
13881390
}
13891391

1390-
this.setOption(target.TargetOption, prj);
1392+
this.setOption(target.TargetOption, prj, keilOutputDir);
13911393

13921394
const nGroups: any[] = [];
13931395

@@ -1404,7 +1406,7 @@ class ARMParser extends KeilParser<KeilARMOption> {
14041406
const fileElement = {
14051407
FileName: _f.file.name,
14061408
FileType: this.getFileType(_f.file).toString(),
1407-
FilePath: prj.ToRelativePath(_f.file.path) || _f.file.path
1409+
FilePath: File.ToLocalPath(keilOutputDir.ToRelativePath(_f.file.path) || _f.file.path)
14081410
};
14091411

14101412
this.setFileDisableFlag(fileElement, _f.disabled);

0 commit comments

Comments
 (0)