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

more for #10, get output filename

This commit is contained in:
Basile Burg 2015-09-19 09:04:47 +02:00
parent ed3022016b
commit 845053b5e0
1 changed files with 43 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/ce_dubproject.pas
View File

@ -27,6 +27,7 @@ type
fBinKind: TProjectBinaryKind;
fBasePath: string;
fModificationCount: integer;
fOutputFileName: string;
//
procedure doModified;
procedure updateFields;
@ -35,6 +36,7 @@ type
procedure updateSourcesFromJson;
procedure updateTargetKindFromJson;
procedure updateImportPathsFromJson;
procedure updateOutputNameFromJson;
function findTargetKindInd(value: TJSONObject): boolean;
procedure dubProcOutput(proc: TProcess);
function getCurrentCustomConfig: TJSONObject;
@ -213,8 +215,7 @@ end;
function TCEDubProject.outputFilename: string;
begin
//TODO-cDUB: implement outputFilename
exit('');
exit(fOutputFileName);
end;
{$ENDREGION --------------------------------------------------------------------}
@ -604,6 +605,45 @@ begin
if assigned(conf) then addFrom(conf);
end;
procedure TCEDubProject.updateOutputNameFromJson;
procedure setFrom(obj: TJSONObject);
var
item: TJSONData;
begin
item := obj.Find('targetPath');
if assigned(item) then
fOutputFileName := item.AsString;
item := obj.Find('targetName');
if assigned(item) then
fOutputFileName += DirectorySeparator + item.AsString;
end;
var
conf: TJSONObject;
item: TJSONData;
begin
fOutputFileName := '';
setFrom(fJSON);
conf := getCurrentCustomConfig;
if assigned(conf) then setFrom(conf);
if fOutputFileName <> '' then
begin
patchPlateformPath(fOutputFileName);
expandFilenameEx(fBasePath, fOutputFileName);
end
else
begin
item := fJSON.Find('name');
if assigned(item) then
fOutputFileName := item.AsString;
end;
case fBinKind of
executable: fOutputFileName += exeExt;
staticlib: fOutputFileName += libExt;
obj: fOutputFileName += objExt;
sharedlib: fOutputFileName += dynExt;
end;
end;
procedure TCEDubProject.updateFields;
begin
updatePackageNameFromJson;
@ -611,6 +651,7 @@ begin
updateSourcesFromJson;
updateTargetKindFromJson;
updateImportPathsFromJson;
updateOutputNameFromJson;
end;
procedure TCEDubProject.beginModification;