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

pas2jsdsgn: push WebServerFileName to simplewebservergui

Browse Source
This commit is contained in:
mattias 2022-04-11 10:55:48 +02:00
parent af36d4da8f
commit 19d03a5ea8
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
components/pas2js/pjscontroller.pp
View File

@ -282,13 +282,23 @@ begin
aProject:=LazarusIDE.ActiveProject; aProject:=LazarusIDE.ActiveProject;
if aProject=nil then exit; if aProject=nil then exit;
if not WithDebug then
exit; // compile normally and run the run parameters
IsWebProject:=aProject.CustomData[PJSProjectWebBrowser]='1'; IsWebProject:=aProject.CustomData[PJSProjectWebBrowser]='1';
if not IsWebProject then if not IsWebProject then
exit; exit;
if SimpleWebServerController.Options.ServerExe='compileserver'+GetExeExt then
begin
// simplewebservergui package has default value
if CompareFilenames(ExtractFilename(PJSOptions.WebServerFileName),'compileserver'+GetExeExt)=0 then
begin
// this package has a compileserver -> for compatibility set our value
SimpleWebServerController.Options.ServerExe:=PJSOptions.WebServerFileName;
end;
end;
if not WithDebug then
exit; // compile normally and run the run parameters
ServerPort:=StrToIntDef(aProject.CustomData[PJSProjectPort],-1); ServerPort:=StrToIntDef(aProject.CustomData[PJSProjectPort],-1);
URL:=aProject.CustomData[PJSProjectURL]; URL:=aProject.CustomData[PJSProjectURL];
if (ServerPort<0) and (URL='') then if (ServerPort<0) and (URL='') then

2
components/pas2js/regpas2jsatom.pas
View File

@ -175,7 +175,9 @@ Const
Var Var
S : String; S : String;
{$IFDEF UNIX}
L : String; L : String;
{$ENDIF}
begin begin
FPackageDir:=IncludeLeadingPathDelimiter(FPackageDir); FPackageDir:=IncludeLeadingPathDelimiter(FPackageDir);