From efec47d82c80ada0350a53545be5defd76c83034 Mon Sep 17 00:00:00 2001 From: mattias Date: Fri, 30 Jun 2023 20:50:09 +0200 Subject: [PATCH] lazbuild: lowercase pkgname.compiled files --- packager/packagedefs.pas | 2 +- packager/packagesystem.pas | 4 ++-- packager/registration/fpmake.pp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packager/packagedefs.pas b/packager/packagedefs.pas index 4bda415496..f14757b0a6 100644 --- a/packager/packagedefs.pas +++ b/packager/packagedefs.pas @@ -3877,7 +3877,7 @@ end; function TLazPackage.GetStateFilename(UseOverride: boolean): string; begin - Result:=AppendPathDelim(GetOutputDirectory(UseOverride))+Name+'.compiled'; + Result:=AppendPathDelim(GetOutputDirectory(UseOverride))+lowercase(Name)+'.compiled'; end; function TLazPackage.GetSrcFilename: string; diff --git a/packager/packagesystem.pas b/packager/packagesystem.pas index b64b73e183..4922cec6be 100644 --- a/packager/packagesystem.pas +++ b/packager/packagesystem.pas @@ -4768,7 +4768,7 @@ begin s:=s+' -$(DEL) $(COMPILER_UNITTARGETDIR)/'+MainUnitName+'$(PPUEXT)'+e; s:=s+''+e; s:=s+'compiled:'+e; - s:=s+' $(CPPROG) -f Makefile.compiled $(COMPILER_UNITTARGETDIR)/'+APackage.Name+'.compiled'+e; + s:=s+' $(CPPROG) -f Makefile.compiled $(COMPILER_UNITTARGETDIR)/'+lowercase(APackage.Name)+'.compiled'+e; s:=s+''+e; s:=s+'all: cleartarget $(COMPILER_UNITTARGETDIR) '+MainUnitName+'$(PPUEXT) compiled'+e; if DistCleanDir<>'' then begin @@ -4951,7 +4951,7 @@ begin exit; end; FpmakeFPCFilename:=AppendPathDelim(APackage.Directory)+'fpmake.pp'; - FPmakeCompiledFilename:=AppendPathDelim(APackage.Directory)+APackage.Name+'.compiled'; + FPmakeCompiledFilename:=AppendPathDelim(APackage.Directory)+lowercase(APackage.Name)+'.compiled'; SrcFilename:=APackage.GetSrcFilename; diff --git a/packager/registration/fpmake.pp b/packager/registration/fpmake.pp index adbb000387..224a1678b4 100644 --- a/packager/registration/fpmake.pp +++ b/packager/registration/fpmake.pp @@ -50,8 +50,8 @@ begin T := P.Targets.AddImplicitUnit('lazaruspackageintf.pas'); // copy the compiled file, so the IDE knows how the package was compiled - P.Sources.AddSrc('FCL.compiled'); - P.InstallFiles.Add('FCL.compiled',AllOSes,'$(unitinstalldir)'); + P.Sources.AddSrc('fcl.compiled'); + P.InstallFiles.Add('fcl.compiled',AllOSes,'$(unitinstalldir)'); end; end;