paweld/pas2js
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/pas2js.git synced 2025-08-30 19:10:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

releasecreator: put second libpas2js into sub folder

Browse Source
This commit is contained in:
mattias 2024-01-11 14:55:24 +01:00
parent a78fce978e
commit 743ee36859
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/releasecreator/Pas2jsReleaseCreator.lpr
View File

@ -463,7 +463,7 @@ end;
procedure TPas2jsReleaseCreator.BuildTools(const TargetOS, TargetCPU: string); procedure TPas2jsReleaseCreator.BuildTools(const TargetOS, TargetCPU: string);
var var
WorkDir, SrcCompilerDir, PkgSrcDir, UnitOutDir: String; WorkDir, SrcCompilerDir, PkgSrcDir, UnitOutDir, CurBinDir: String;
SharedParams, TheParams: TStringList; SharedParams, TheParams: TStringList;
begin begin
SharedParams:=TStringList.Create; SharedParams:=TStringList.Create;
@ -506,10 +506,12 @@ begin
if FPC2Filename<>'' then begin if FPC2Filename<>'' then begin
// compile second libpas2js // compile second libpas2js
CurBinDir:=BuildDir_Bin+FPC2TargetCPU+'-'+FPC2TargetOS+PathDelim;
ForceDir(CurBinDir,'sub folder for second libpas2js');
TheParams.Assign(SharedParams); TheParams.Assign(SharedParams);
if SameText(FPC2TargetOS,'linux') then if SameText(FPC2TargetOS,'linux') then
TheParams.Add('-fPIC'); TheParams.Add('-fPIC');
TheParams.Add('-o'+BuildDir_Bin+'libpas2js-'+FPC2TargetCPU+'-'+FPC2TargetOS+GetLibExt(TargetOS)); TheParams.Add('-o'+CurBinDir+'libpas2js'+GetLibExt(TargetOS));
TheParams.Add('-P'); TheParams.Add('-P');
TheParams.Add(FPC2TargetCPU); TheParams.Add(FPC2TargetCPU);
TheParams.Add('-T'); TheParams.Add('-T');
@ -736,6 +738,7 @@ end;
procedure TPas2jsReleaseCreator.ForceDir(Dir, DirTitle: string); procedure TPas2jsReleaseCreator.ForceDir(Dir, DirTitle: string);
begin begin
Dir:=ChompPathDelim(Dir);
if DirectoryExists(Dir) then exit; if DirectoryExists(Dir) then exit;
if Simulate then exit; if Simulate then exit;
if ForceDirectories(Dir) then exit; if ForceDirectories(Dir) then exit;