From c018cdeda07ff7b6f2625532c89d51494916a3c3 Mon Sep 17 00:00:00 2001 From: juha Date: Mon, 22 Nov 2010 00:00:25 +0000 Subject: [PATCH] Converter: Preserve .dpr suffix of main project file when target is Lazarus/Delphi. Fixes #17982. git-svn-id: trunk@28383 - --- converter/convertdelphi.pas | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/converter/convertdelphi.pas b/converter/convertdelphi.pas index d342ae1ca6..59a0e226b7 100644 --- a/converter/convertdelphi.pas +++ b/converter/convertdelphi.pas @@ -1400,19 +1400,21 @@ end; function TConvertDelphiProject.CreateMainSourceFile: TModalResult; // if .lpr does not exists, copy the .dpr file to the .lpr // adds the .lpr as main unit to the project, if not already done -const - LprExt='.lpr'; var MainUnitInfo: TUnitInfo; begin // Converter for main LPR file. fMainUnitConverter:=TConvertDelphiUnit.Create(Self,fOrigPFilename,[]); - fMainUnitConverter.LazFileExt:=LprExt; + if fSettings.Target in [ctLazarusDelphi, ctLazarusDelphiSameDfm] then + fMainUnitConverter.LazFileExt:=ExtractFileExt(fOrigPFilename) + else + fMainUnitConverter.LazFileExt:='.lpr'; fMainUnitConverter.CopyAndLoadFile; if LazProject.MainUnitInfo=nil then begin // add .lpr file to project as main unit MainUnitInfo:=TUnitInfo.Create(fMainUnitConverter.fPascalBuffer); - MainUnitInfo.DefaultSyntaxHighlighter:=ExtensionToLazSyntaxHighlighter(LprExt); + MainUnitInfo.DefaultSyntaxHighlighter:= + ExtensionToLazSyntaxHighlighter(fMainUnitConverter.LazFileExt); MainUnitInfo.IsPartOfProject:=true; LazProject.AddFile(MainUnitInfo,false); LazProject.MainFileID:=0;