From 1180638f66ecd05493ad098aabcb123d92a5c504 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Van=20Canneyt?= Date: Tue, 25 Jul 2023 11:57:08 +0200 Subject: [PATCH] * Add possibility to specify output filename, and allow not to write package name --- utils/fpcm/fpcmake.pp | 30 +++++++++++++++++++----------- utils/fpcm/fpcmpkg.pp | 2 +- utils/fpcm/fpcmwr.pp | 9 ++++++--- 3 files changed, 26 insertions(+), 15 deletions(-) diff --git a/utils/fpcm/fpcmake.pp b/utils/fpcm/fpcmake.pp index 9a606ac8c8..bf4bdc0a23 100644 --- a/utils/fpcm/fpcmake.pp +++ b/utils/fpcm/fpcmake.pp @@ -38,7 +38,9 @@ program fpcmake; ParaMode : TMode; ParaVerboseLevel : TVerboseLevel; ParaTargets : string; + ParaOutputFileName : string; ParaRecursive : boolean; + ParaSkipPackageInfo : Boolean; {***************************************************************************** @@ -81,7 +83,7 @@ program fpcmake; Makefile output *****************************************************************************} - procedure ProcessFile_Makefile(const fn:string); + procedure ProcessFile_Makefile(const fn:string; const aOutputfile : string); var CurrFPCMake : TFPCMakeConsole; CurrMakefile : TMakefileWriter; @@ -129,7 +131,8 @@ program fpcmake; end; { Write Makefile } - CurrMakefile:=TMakefileWriter.Create(CurrFPCMake,ExtractFilePath(fn)+'Makefile'); + CurrMakefile:=TMakefileWriter.Create(CurrFPCMake,ExtractFilePath(fn)+aOutputFile); + CurrMakefile.SkipPackageInfo:=ParaSkipPackageInfo; CurrMakefile.WriteGenericMakefile; CurrMakefile.Free; @@ -153,7 +156,7 @@ program fpcmake; s:=GetToken(subdirs,' '); if s='' then break; - ProcessFile_Makefile(ExtractFilePath(fn)+s+'/Makefile.fpc'); + ProcessFile_Makefile(ExtractFilePath(fn)+s+'/Makefile.fpc',aOutputFile); until false; end; @@ -163,7 +166,7 @@ program fpcmake; Package.fpc output *****************************************************************************} - procedure ProcessFile_PackageFpc(const fn:string); + procedure ProcessFile_PackageFpc(const fn:string; const aOutputFile : string); var CurrFPCMake : TFPCMakeConsole; CurrPackageFpc : TPackageFpcWriter; @@ -181,7 +184,7 @@ program fpcmake; // CurrFPCMake.Print; { Write Package.fpc } - CurrPackageFpc:=TPackageFpcWriter.Create(CurrFPCMake,ExtractFilePath(fn)+'Package.fpc'); + CurrPackageFpc:=TPackageFpcWriter.Create(CurrFPCMake,ExtractFilePath(fn)+aOutputFile); CurrPackageFpc.WritePackageFpc; CurrPackageFpc.Free; @@ -197,16 +200,16 @@ program fpcmake; end; - procedure ProcessFile(const fn:string); + procedure ProcessFile(const fn:string; const aOutputFile : string); begin Show(V_Verbose,TitleDate); case ParaMode of m_None : Error('No operation specified, see -h for help'); m_Makefile : - ProcessFile_Makefile(fn); + ProcessFile_Makefile(fn,aOutputFile); m_PackageFpc : - ProcessFile_PackageFpc(fn); + ProcessFile_PackageFpc(fn,aOutputFile); end; end; @@ -219,7 +222,7 @@ begin fn:='Makefile.fpc' else fn:='makefile.fpc'; - ProcessFile(fn); + ProcessFile(fn,ParaOutputFilename); end; @@ -228,7 +231,7 @@ var i : integer; begin for i:=OptInd to ParamCount do - ProcessFile(ParamStr(i)); + ProcessFile(ParamStr(i),ParaOutputFilename); end; @@ -248,6 +251,8 @@ begin writeln(' supported. If omitted only default target is supported'); writeln(' -r Recursively process target directories from Makefile.fpc'); writeln(' -v Be more verbose'); + writeln(' -ooutputfile Use outputfile as filename instead of the default Makefile or Package.fpc'); + writeln(' -s Skip writing package name'); writeln(' -q Be quiet'); writeln(' -h This help screen'); Halt(0); @@ -266,11 +271,12 @@ Procedure ProcessOpts; Process command line opions, and checks if command line options OK. } const - ShortOpts = 'pwqrvh?VT:'; + ShortOpts = 'pwqrvh?VsT:o:'; var C : char; begin { Reset } + ParaSkipPackageInfo:=False; ParaMode:=m_Makefile; ParaVerboseLevel:=v_default; ParaTargets:=LowerCase({$I %FPCTARGETCPU})+'-'+LowerCase({$I %FPCTARGETOS}); @@ -281,8 +287,10 @@ begin EndOfOptions : break; 'p' : ParaMode:=m_PackageFpc; 'w' : ParaMode:=m_Makefile; + 'o' : ParaOutputFileName:=OptArg; 'q' : ParaVerboseLevel:=v_quiet; 'r' : ParaRecursive:=true; + 's' : ParaSkipPackageInfo:=True; 'v' : ParaVerboseLevel:=v_verbose; 'T' : ParaTargets:=OptArg; '?' : Usage; diff --git a/utils/fpcm/fpcmpkg.pp b/utils/fpcm/fpcmpkg.pp index a73d6ec729..e8ffcc1bcf 100644 --- a/utils/fpcm/fpcmpkg.pp +++ b/utils/fpcm/fpcmpkg.pp @@ -101,7 +101,7 @@ implementation end; { write to disk } - FInput.Verbose(FPCMakeInfo,'Writing Package.fpc'); + FInput.Verbose(FPCMakeInfo,'Writing '+FFileName); FOutput.SaveToFile(FFileName); end; diff --git a/utils/fpcm/fpcmwr.pp b/utils/fpcm/fpcmwr.pp index b364452217..5bf4a888b3 100644 --- a/utils/fpcm/fpcmwr.pp +++ b/utils/fpcm/fpcmwr.pp @@ -75,6 +75,7 @@ interface FOutput : TStringList; FPhony : string; FHasSection : array[tsections] of boolean; + FSkipPackageInfo: Boolean; procedure LoadFPCMakeIni; procedure AddIniSection(const s:string); procedure AddCustomSection(const s:string); @@ -96,6 +97,7 @@ interface constructor Create(AFPCMake:TFPCMake;const AFileName:string); destructor Destroy;override; procedure WriteGenericMakefile; + property SkipPackageInfo : Boolean Read FSkipPackageInfo Write FSkipPackageInfo; end; @@ -758,8 +760,9 @@ implementation AddIniSection('fpcdircheckenv'); AddIniSection('fpcdirdetect'); AddIniSection('fpmakefpcdetect'); - { Package } - AddVariable('package_name'); + { Package info } + if not SkipPackageInfo then + AddVariable('package_name'); AddVariable('package_version'); AddVariable('package_targets'); { Directory of main package } @@ -888,7 +891,7 @@ implementation AddStrings(TFPCMakeSection(FInput['rules']).List); end; { write to disk } - FInput.Verbose(FPCMakeInfo,'Writing Makefile'); + FInput.Verbose(FPCMakeInfo,'Writing '+FFileName); Fixtab(FOutput); FOutput.SaveToFile(FFileName); end;