paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-13 14:09:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

pas2js: pass PAS2JS env var to lazbuild project group compile

Browse Source
This commit is contained in:
mattias 2022-04-18 00:14:33 +02:00
parent 118216fc3d
commit 835a3a7f52
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
components/pas2js/pjscontroller.pp
View File

@ -11,7 +11,8 @@ uses
// LCL // LCL
Forms, Controls, LazHelpIntf, Forms, Controls, LazHelpIntf,
// IdeIntf // IdeIntf
MacroIntf, MacroDefIntf, ProjectIntf, CompOptsIntf, LazIDEIntf, MacroIntf, MacroDefIntf, ProjectIntf, CompOptsIntf, IDEExternToolIntf,
LazIDEIntf, ProjectGroupIntf,
// pas2js // pas2js
SimpleWebSrvController, StrPas2JSDesign, PJSDsgnOptions, CodeToolManager, SimpleWebSrvController, StrPas2JSDesign, PJSDsgnOptions, CodeToolManager,
CodeCache; CodeCache;
@ -30,6 +31,8 @@ Type
procedure OnLoadSaveCustomData(Sender: TObject; Load: boolean; procedure OnLoadSaveCustomData(Sender: TObject; Load: boolean;
CustomData: TStringToStringTree; PathDelimChanged: boolean); CustomData: TStringToStringTree; PathDelimChanged: boolean);
function OnProjectBuilding(Sender: TObject): TModalResult; function OnProjectBuilding(Sender: TObject): TModalResult;
function OnProjectGroupRunLazbuild({%H-}Target: TPGCompileTarget;
Tool: TAbstractExternalTool): boolean;
function OnRunDebugInit(Sender: TObject; var Handled: boolean function OnRunDebugInit(Sender: TObject; var Handled: boolean
): TModalResult; ): TModalResult;
function OnRunWithoutDebugInit(Sender: TObject; var Handled: boolean): TModalResult; function OnRunWithoutDebugInit(Sender: TObject; var Handled: boolean): TModalResult;
@ -173,6 +176,17 @@ begin
end; end;
end; end;
function TPJSController.OnProjectGroupRunLazbuild(Target: TPGCompileTarget;
Tool: TAbstractExternalTool): boolean;
var
Pas2jsFilename: String;
begin
Result:=true;
Pas2jsFilename:=PJSOptions.GetParsedCompilerFilename;
if Pas2jsFilename<>'' then
Tool.EnvironmentOverrides.Values['PAS2JS']:=Pas2jsFilename;
end;
function TPJSController.OnRunDebugInit(Sender: TObject; var Handled: boolean function TPJSController.OnRunDebugInit(Sender: TObject; var Handled: boolean
): TModalResult; ): TModalResult;
begin begin
@ -416,6 +430,7 @@ begin
LazarusIDE.AddHandlerOnRunDebugInit(@OnRunDebugInit); LazarusIDE.AddHandlerOnRunDebugInit(@OnRunDebugInit);
LazarusIDE.AddHandlerOnRunWithoutDebugInit(@OnRunWithoutDebugInit); LazarusIDE.AddHandlerOnRunWithoutDebugInit(@OnRunWithoutDebugInit);
LazarusIDE.AddHandlerOnLoadSaveCustomData(@OnLoadSaveCustomData); LazarusIDE.AddHandlerOnLoadSaveCustomData(@OnLoadSaveCustomData);
ProjectGroupManager.AddHandlerOnRunLazbuild(@OnProjectGroupRunLazbuild);
end; end;
procedure TPJSController.UnHook; procedure TPJSController.UnHook;