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

IDE: Make sure path delims are '/' when publishing module. Support .dfm files.

Browse Source 
git-svn-id: trunk@58793 -
This commit is contained in:
juha 2018-08-28 06:23:02 +00:00
parent c8db4ff99b
commit 495ae94cd4
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ide/publishprojectdlg.pas
View File

@ -210,6 +210,7 @@ var
RelPath: string; RelPath: string;
Adjusted: Boolean; Adjusted: Boolean;
begin begin
Assert(Pos('\',AFileName) = 0, 'AdjustTopDir: File name contains a backslash.');
RelPath := ExtractRelativePath(FTopDir, AFilename); RelPath := ExtractRelativePath(FTopDir, AFilename);
Adjusted := False; Adjusted := False;
while Copy(RelPath, 1, 3) = '../' do while Copy(RelPath, 1, 3) = '../' do
@ -238,9 +239,15 @@ begin
begin begin
FCopiedFiles.Add(AFilename); FCopiedFiles.Add(AFilename);
if FilenameIsPascalUnit(AFilename) then if FilenameIsPascalUnit(AFilename) then
begin // Copy .lfm file even if it is not part of project/package. begin // Copy .lfm or .dfm file even if it is not part of project/package.
LfmFile := ChangeFileExt(AFilename, '.lfm'); LfmFile := ChangeFileExt(AFilename, '.lfm');
if FileExistsUTF8(LfmFile) then if not FileExistsUTF8(LfmFile) then
begin
LfmFile := ChangeFileExt(AFilename, '.dfm');
if not FileExistsUTF8(LfmFile) then
LfmFile := '';
end;
if LfmFile <> '' then
Result := CopyAFile(LfmFile); // Recursive call. Result := CopyAFile(LfmFile); // Recursive call.
end; end;
end end