forks
/
dexed
mirror of https://gitlab.com/basile.b/dexed.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ce project, outputFilename, path option forceExtension not applied 

propagated to symstring `<CPO>`
This commit is contained in:
Basile Burg 2016-11-20 19:41:28 +01:00
parent f939160d08
commit e979a68154
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/ce_ceproject.pas
View File

@ -641,8 +641,17 @@ begin
end; end;
procedure TCENativeProject.updateOutFilename; procedure TCENativeProject.updateOutFilename;
var
fe: boolean = false;
begin begin
fOutputFilename := currentConfiguration.pathsOptions.outputFilename; fOutputFilename := currentConfiguration.pathsOptions.outputFilename;
fe := currentConfiguration.pathsOptions.forceExtension;
if currentConfiguration.isOverriddenConfiguration and fOutputFilename.isEmpty and
fBaseConfig.isNotNil then
begin
fOutputFilename := fBaseConfig.pathsOptions.outputFilename;
fe := fBaseConfig.pathsOptions.forceExtension;
end;
// field is specified // field is specified
if fOutputFilename.isNotEmpty then if fOutputFilename.isNotEmpty then
begin begin
@ -668,14 +677,15 @@ begin
fOutputFilename := fileName.extractFilePath + fOutputFilename fOutputFilename := fileName.extractFilePath + fOutputFilename
else else
fOutputFilename := GetTempDir(false) + fOutputFilename; fOutputFilename := GetTempDir(false) + fOutputFilename;
// force extension fe := true;
case currentConfiguration.outputOptions.binaryKind of end;
//
if fe then case currentConfiguration.outputOptions.binaryKind of
executable: fOutputFilename := ChangeFileExt(fOutputFilename, exeExt); executable: fOutputFilename := ChangeFileExt(fOutputFilename, exeExt);
staticlib: fOutputFilename := ChangeFileExt(fOutputFilename, libExt); staticlib: fOutputFilename := ChangeFileExt(fOutputFilename, libExt);
sharedlib: fOutputFilename := ChangeFileExt(fOutputFilename, dynExt); sharedlib: fOutputFilename := ChangeFileExt(fOutputFilename, dynExt);
obj: fOutputFilename := ChangeFileExt(fOutputFilename, objExt); obj: fOutputFilename := ChangeFileExt(fOutputFilename, objExt);
end; end;
end;
// //
fCanBeRun := false; fCanBeRun := false;
if currentConfiguration.outputOptions.binaryKind = executable then if currentConfiguration.outputOptions.binaryKind = executable then