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

* Patch from Henrique Werlang to allow setting log config page

Browse Source 
git-svn-id: trunk@47052 -
This commit is contained in:
michael 2020-10-05 17:37:45 +00:00
parent c4ab6b08cd
commit a8bc2f6947
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
packages/pastojs/src/pas2jslibcompiler.pp
View File

@ -67,6 +67,8 @@ Type
FOnWriteJSCallBack: TWriteJSCallBack; FOnWriteJSCallBack: TWriteJSCallBack;
FOnWriteJSData: Pointer; FOnWriteJSData: Pointer;
FReadBufferLen: Cardinal; FReadBufferLen: Cardinal;
function GetLogEncoding: String;
procedure SetLogEncoding(AValue: String);
Protected Protected
Function DoWriteJSFile(const DestFilename: String; aWriter: TPas2JSMapper): Boolean; override; Function DoWriteJSFile(const DestFilename: String; aWriter: TPas2JSMapper): Boolean; override;
Procedure GetLastError(AError : PAnsiChar; Var AErrorLength : Longint; Procedure GetLastError(AError : PAnsiChar; Var AErrorLength : Longint;
@ -80,6 +82,7 @@ Type
Function LibraryRun(ACompilerExe, AWorkingDir : PAnsiChar; CommandLine : PPAnsiChar; DoReset : Boolean) :Boolean; {$IFDEF UseCDecl}cdecl{$ELSE}stdcall{$ENDIF}; Function LibraryRun(ACompilerExe, AWorkingDir : PAnsiChar; CommandLine : PPAnsiChar; DoReset : Boolean) :Boolean; {$IFDEF UseCDecl}cdecl{$ELSE}stdcall{$ENDIF};
Property LastError : String Read FLastError Write FLastError; Property LastError : String Read FLastError Write FLastError;
Property LastErrorClass : String Read FLastErrorClass Write FLastErrorClass; Property LastErrorClass : String Read FLastErrorClass Write FLastErrorClass;
property LogEncoding: String read GetLogEncoding write SetLogEncoding;
Property OnLibLogCallBack : TLibLogCallBack Read FOnLibLogCallBack Write FOnLibLogCallBack; Property OnLibLogCallBack : TLibLogCallBack Read FOnLibLogCallBack Write FOnLibLogCallBack;
Property OnLibLogData : Pointer Read FOnLibLogData Write FOnLibLogData; Property OnLibLogData : Pointer Read FOnLibLogData Write FOnLibLogData;
Property OnWriteJSCallBack : TWriteJSCallBack Read FOnWriteJSCallBack Write FOnWriteJSCallBack; Property OnWriteJSCallBack : TWriteJSCallBack Read FOnWriteJSCallBack Write FOnWriteJSCallBack;
@ -107,6 +110,7 @@ Function RunPas2JSCompiler(P : PPas2JSCompiler; ACompilerExe, AWorkingDir : PAns
Procedure FreePas2JSCompiler(P : PPas2JSCompiler); {$IFDEF UseCDecl}cdecl{$ELSE}stdcall{$ENDIF}; Procedure FreePas2JSCompiler(P : PPas2JSCompiler); {$IFDEF UseCDecl}cdecl{$ELSE}stdcall{$ENDIF};
Function GetPas2JSCompiler : PPas2JSCompiler; {$IFDEF UseCDecl}cdecl{$ELSE}stdcall{$ENDIF}; Function GetPas2JSCompiler : PPas2JSCompiler; {$IFDEF UseCDecl}cdecl{$ELSE}stdcall{$ENDIF};
Procedure GetPas2JSCompilerLastError(P : PPas2JSCompiler; AError : PAnsiChar; Var AErrorLength : Longint; AErrorClass : PAnsiChar; Var AErrorClassLength : Longint); {$IFDEF UseCDecl}cdecl{$ELSE}stdcall{$ENDIF}; Procedure GetPas2JSCompilerLastError(P : PPas2JSCompiler; AError : PAnsiChar; Var AErrorLength : Longint; AErrorClass : PAnsiChar; Var AErrorClassLength : Longint); {$IFDEF UseCDecl}cdecl{$ELSE}stdcall{$ENDIF};
procedure SetPas2JSLogEncoding(P : PPas2JSCompiler; Enconding: PAnsiChar); {$IFDEF UseCDecl}cdecl{$ELSE}stdcall{$ENDIF};
implementation implementation
@ -120,6 +124,16 @@ begin
Result:=OnReadDir(FOnReadDirData,Dir,PAnsiChar(Dir.Path)); Result:=OnReadDir(FOnReadDirData,Dir,PAnsiChar(Dir.Path));
end; end;
function TLibraryPas2JSCompiler.GetLogEncoding: String;
begin
Result := Log.Encoding;
end;
procedure TLibraryPas2JSCompiler.SetLogEncoding(AValue: String);
begin
Log.Encoding := AValue;
end;
function TLibraryPas2JSCompiler.DoWriteJSFile(const DestFilename: String; aWriter: TPas2JSMapper): Boolean; function TLibraryPas2JSCompiler.DoWriteJSFile(const DestFilename: String; aWriter: TPas2JSMapper): Boolean;
Var Var
@ -344,5 +358,10 @@ begin
TLibraryPas2JSCompiler(P).GetLastError(AError,AErrorLength,AErrorClass,AErrorClassLength); TLibraryPas2JSCompiler(P).GetLastError(AError,AErrorLength,AErrorClass,AErrorClassLength);
end; end;
procedure SetPas2JSLogEncoding(P : PPas2JSCompiler; Enconding: PAnsiChar); {$IFDEF UseCDecl}cdecl{$ELSE}stdcall{$ENDIF};
begin
TLibraryPas2JSCompiler(P).LogEncoding := Enconding;
end;
end. end.

3
utils/pas2js/pas2jslib.pp
View File

@ -17,7 +17,8 @@ exports
AddPas2JSDirectoryEntry, AddPas2JSDirectoryEntry,
SetPas2JSUnitAliasCallBack, SetPas2JSUnitAliasCallBack,
SetPas2JSCompilerLogCallBack, SetPas2JSCompilerLogCallBack,
GetPas2JSCompilerLastError; GetPas2JSCompilerLastError,
SetPas2JSLogEncoding;
end. end.