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

Changed the map file name to keep all um UTF-8.

Browse Source
This commit is contained in:
Henrique Gottardi Werlang 2023-07-14 16:04:58 -03:00 committed by Michael Van Canneyt
parent cd8af229a8
commit 55ecd471c8
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/pastojs/src/fppjssrcmap.pp
View File

@ -65,7 +65,7 @@ type
public public
property SrcMap: TPas2JSSrcMap read FSrcMap write SetSrcMap; property SrcMap: TPas2JSSrcMap read FSrcMap write SetSrcMap;
destructor Destroy; override; destructor Destroy; override;
procedure SaveJSToStream(WithUTF8BOM: boolean; const MapFilename: string; s: TFPJSStream); procedure SaveJSToStream(WithUTF8BOM: boolean; const MapFilename: TJSWriterString; s: TFPJSStream);
procedure WriteFile(Src, Filename: string); procedure WriteFile(Src, Filename: string);
// Final destination filename. Usually unit, unless combining javascript in single file. // Final destination filename. Usually unit, unless combining javascript in single file.
property DestFileName : String read FDestFileName Write FDestFileName; property DestFileName : String read FDestFileName Write FDestFileName;
@ -226,14 +226,13 @@ begin
inherited Destroy; inherited Destroy;
end; end;
procedure TPas2JSMapper.SaveJSToStream(WithUTF8BOM: boolean; procedure TPas2JSMapper.SaveJSToStream(WithUTF8BOM: boolean; const MapFilename: TJSWriterString; s: TFPJSStream);
const MapFilename: string; s: TFPJSStream);
var var
MapSrc: string; MapSrc: TJSWriterString;
{$ifdef pas2js} {$ifdef pas2js}
i: integer; i: integer;
{$ELSE} {$ELSE}
bom: string; bom: TJSWriterString;
{$endif} {$endif}
begin begin
if MapFilename<>'' then if MapFilename<>'' then

2
packages/pastojs/src/pas2jscompiler.pp
View File

@ -2482,7 +2482,7 @@ begin
{$ENDIF} {$ENDIF}
try try
WithUTF8BOM:=(Log.Encoding='') or (Log.Encoding='utf8'); WithUTF8BOM:=(Log.Encoding='') or (Log.Encoding='utf8');
aFileWriter.SaveJSToStream(WithUTF8BOM,ExtractFilename(MapFilename),buf); aFileWriter.SaveJSToStream(WithUTF8BOM, TJSWriterString(ExtractFilename(MapFilename)), buf);
{$IFDEF Pas2js} {$IFDEF Pas2js}
{$ELSE} {$ELSE}
buf.Position:=0; buf.Position:=0;