From 495ae94cd4bae600f702e335a2956cf8e684337d Mon Sep 17 00:00:00 2001
From: juha <juha@lazarus-ide.org>
Date: Tue, 28 Aug 2018 06:23:02 +0000
Subject: [PATCH] IDE: Make sure path delims are '/' when publishing module.
 Support .dfm files.

git-svn-id: trunk@58793 -
---
 ide/publishprojectdlg.pas | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/ide/publishprojectdlg.pas b/ide/publishprojectdlg.pas
index 04b8132dcb..ceced450cd 100644
--- a/ide/publishprojectdlg.pas
+++ b/ide/publishprojectdlg.pas
@@ -210,6 +210,7 @@ var
   RelPath: string;
   Adjusted: Boolean;
 begin
+  Assert(Pos('\',AFileName) = 0, 'AdjustTopDir: File name contains a backslash.');
   RelPath := ExtractRelativePath(FTopDir, AFilename);
   Adjusted := False;
   while Copy(RelPath, 1, 3) = '../' do
@@ -238,9 +239,15 @@ begin
   begin
     FCopiedFiles.Add(AFilename);
     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');
-      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.
     end;
   end