From deb3d5a0a934af3cf88ee0707c9c31487d322035 Mon Sep 17 00:00:00 2001 From: pierre Date: Sat, 24 Nov 2018 15:14:57 +0000 Subject: [PATCH] + Add Debug message when resource file is found, but not registered. + Add missing "T.ResourceStrings:=True;" for all source units that generate the new debug message above. git-svn-id: trunk@40365 - --- packages/fcl-base/fpmake.pp | 5 +++++ packages/fcl-db/fpmake.pp | 2 ++ packages/fcl-image/fpmake.pp | 1 + packages/fcl-passrc/fpmake.pp | 1 + packages/fcl-pdf/fpmake.pp | 4 ++++ packages/fcl-web/fpmake.pp | 2 ++ packages/fpmkunit/src/fpmkunit.pp | 31 +++++++++++++++++++++++++++++-- packages/mysql/fpmake.pp | 1 + packages/openssl/fpmake.pp | 1 + packages/pastojs/fpmake.pp | 1 + packages/rtl-objpas/fpmake.pp | 1 + packages/winunits-base/fpmake.pp | 1 + 12 files changed, 49 insertions(+), 2 deletions(-) diff --git a/packages/fcl-base/fpmake.pp b/packages/fcl-base/fpmake.pp index 06639b1950..5d0f326c1e 100644 --- a/packages/fcl-base/fpmake.pp +++ b/packages/fcl-base/fpmake.pp @@ -78,12 +78,14 @@ begin AddUnit('inifiles'); end; T:=P.Targets.AddUnit('inifiles.pp'); + T.ResourceStrings:=true; with T.Dependencies do begin AddUnit('contnrs'); end; T:=P.Targets.AddUnit('iostream.pp'); T:=P.Targets.AddUnit('nullstream.pp'); + T.ResourceStrings:=true; T:=P.Targets.AddUnit('maskutils.pp'); T.ResourceStrings:=true; T:=P.Targets.AddUnit('pooledmm.pp'); @@ -96,11 +98,13 @@ begin T:=P.Targets.AddUnit('streamcoll.pp'); T.ResourceStrings:=true; T:=P.Targets.AddUnit('streamex.pp'); + T.ResourceStrings:=true; T:=P.Targets.AddUnit('streamio.pp'); T.ResourceStrings:=true; T:=P.Targets.AddUnit('fptemplate.pp'); T.ResourceStrings:=true; T:=P.Targets.AddUnit('syncobjs.pp',AllOSes-[go32v2,nativent,atari]); + T.ResourceStrings:=true; T:=P.Targets.AddUnit('uriparser.pp'); T:=P.Targets.AddUnit('wformat.pp'); T:=P.Targets.AddUnit('whtml.pp'); @@ -117,6 +121,7 @@ begin T.ResourceStrings:=true; T:=P.Targets.AddUnit('fileinfo.pp'); + T.ResourceStrings:=true; T:=P.Targets.addUnit('fpmimetypes.pp'); T:=P.Targets.AddUnit('csvreadwrite.pp'); T:=P.Targets.addUnit('csvdocument.pp'); diff --git a/packages/fcl-db/fpmake.pp b/packages/fcl-db/fpmake.pp index 9f7567241f..65c1ad12bb 100644 --- a/packages/fcl-db/fpmake.pp +++ b/packages/fcl-db/fpmake.pp @@ -749,6 +749,7 @@ begin AddUnit('bufdataset'); end; T:=P.Targets.AddUnit('pqeventmonitor.pp', SqldbConnectionOSes); + T.ResourceStrings:=true; with T.Dependencies do begin AddUnit('sqldb'); @@ -780,6 +781,7 @@ begin AddUnit('sqltypes'); end; T:=P.Targets.AddUnit('sqldblib.pp'); + T.ResourceStrings:=true; with T.Dependencies do begin AddUnit('sqldb'); diff --git a/packages/fcl-image/fpmake.pp b/packages/fcl-image/fpmake.pp index 5b78927fac..4481dbb809 100644 --- a/packages/fcl-image/fpmake.pp +++ b/packages/fcl-image/fpmake.pp @@ -227,6 +227,7 @@ begin T:=P.Targets.AddUnit('freetypeh.pp',[solaris,iphonesim,darwin,freebsd,openbsd,netbsd,linux,haiku,beos,win32,win64,aix,dragonfly]); T.Dependencies.AddInclude('libfreetype.inc'); T:=P.Targets.AddUnit('freetypehdyn.pp',[solaris,iphonesim,darwin,freebsd,openbsd,netbsd,linux,haiku,beos,win32,win64,aix,dragonfly]); + T.ResourceStrings:=true; T.Dependencies.AddInclude('libfreetype.inc'); T:=P.Targets.AddUnit('freetype.pp',[solaris,iphonesim,darwin,freebsd,openbsd,netbsd,linux,haiku,beos,win32,win64,aix,dragonfly]); with T.Dependencies do diff --git a/packages/fcl-passrc/fpmake.pp b/packages/fcl-passrc/fpmake.pp index 01918888f3..8148cd44e1 100644 --- a/packages/fcl-passrc/fpmake.pp +++ b/packages/fcl-passrc/fpmake.pp @@ -36,6 +36,7 @@ begin T:=P.Targets.AddUnit('pscanner.pp'); T.ResourceStrings := True; T:=P.Targets.AddUnit('pparser.pp'); + T.ResourceStrings:=true; with T.Dependencies do begin AddUnit('pastree'); diff --git a/packages/fcl-pdf/fpmake.pp b/packages/fcl-pdf/fpmake.pp index e8c518215b..53928782e0 100644 --- a/packages/fcl-pdf/fpmake.pp +++ b/packages/fcl-pdf/fpmake.pp @@ -37,17 +37,21 @@ begin P.Version:='3.3.1'; T:=P.Targets.AddUnit('src/fpttfencodings.pp'); T:=P.Targets.AddUnit('src/fpparsettf.pp'); + T.ResourceStrings:=true; T:=P.Targets.AddUnit('src/fpfonttextmapping.pp'); With T do Dependencies.AddUnit('fpttfencodings'); T:=P.Targets.AddUnit('src/fpttfsubsetter.pp'); + T.ResourceStrings:=true; With T do begin Dependencies.AddUnit('fpparsettf'); Dependencies.AddUnit('fpfonttextmapping'); end; T:=P.Targets.AddUnit('src/fpttf.pp'); + T.ResourceStrings:=true; T:=P.Targets.AddUnit('src/fppdf.pp'); + T.ResourceStrings:=true; With T do begin Dependencies.AddUnit('fpparsettf'); diff --git a/packages/fcl-web/fpmake.pp b/packages/fcl-web/fpmake.pp index 425914acd2..ae4365893b 100644 --- a/packages/fcl-web/fpmake.pp +++ b/packages/fcl-web/fpmake.pp @@ -50,6 +50,7 @@ begin T.Dependencies.AddUnit('httpprotocol'); T:=P.Targets.AddUnit('httproute.pp'); + T.ResourceStrings:=true; T.Dependencies.AddUnit('httpdefs'); T:=P.Targets.AddUnit('cgiapp.pp'); @@ -269,6 +270,7 @@ begin T:=P.Targets.AddUnit('fpwebclient.pp'); T:=P.Targets.AddUnit('fpjwt.pp'); T:=P.Targets.AddUnit('fpoauth2.pp'); + T.ResourceStrings:=true; T.Dependencies.AddUnit('fpwebclient'); T.Dependencies.AddUnit('fpjwt'); T:=P.Targets.AddUnit('fpoauth2ini.pp'); diff --git a/packages/fpmkunit/src/fpmkunit.pp b/packages/fpmkunit/src/fpmkunit.pp index 478eb0a059..7de46b6e12 100644 --- a/packages/fpmkunit/src/fpmkunit.pp +++ b/packages/fpmkunit/src/fpmkunit.pp @@ -1683,6 +1683,7 @@ ResourceString SWarnNoFCLProcessSupport= 'No FCL-Process support'; SWarnRetryRemDirectory = 'Failed to remove directory "%s". Retry after a short delay'; SWarnCombinedPathAndUDir= 'Warning: Better do not combine the SearchPath and Global/Local-UnitDir parameters'; + SWarnUnregisteredResource= 'Warning: Adding resource file "%s", which is not registered.'; SInfoPackageAlreadyProcessed = 'Package %s is already processed'; SInfoCompilingTarget = 'Compiling target %s'; @@ -8694,7 +8695,20 @@ begin List.Add(APrefixU + RSJFileName) else List.Add(APrefixU + RSTFileName); - end; + end + else + begin + if FileExists(APrefixU + RSJFileName) then + begin + Installer.Log(VlDebug,Format(SWarnUnregisteredResource,[APrefixU + RSJFileName])); + List.Add(APrefixU + RSJFileName); + end + else if FileExists(APrefixU + RSTFileName) then + begin + Installer.Log(VlDebug,Format(SWarnUnregisteredResource,[APrefixU + RSTFileName])); + List.Add(APrefixU + RSTFileName); + end; + end; // Maybe add later ? AddConditionalStrings(List,CleanFiles); end; @@ -8726,7 +8740,20 @@ begin List.Add(APrefixU + RSJFileName) else List.Add(APrefixU + RSTFileName); - end; + end + else + begin + if FileExists(UnitsDir + RSJFileName) then + begin + Installer.Log(VlDebug,Format(SWarnUnregisteredResource,[APrefixU + RSJFileName])); + List.Add(APrefixU + RSJFileName); + end + else if FileExists(UnitsDir + RSTFileName) then + begin + Installer.Log(VlDebug,Format(SWarnUnregisteredResource,[APrefixU + RSTFileName])); + List.Add(APrefixU + RSTFileName); + end; + end; end; diff --git a/packages/mysql/fpmake.pp b/packages/mysql/fpmake.pp index 8c5040abb0..f36ee03852 100644 --- a/packages/mysql/fpmake.pp +++ b/packages/mysql/fpmake.pp @@ -120,6 +120,7 @@ begin AddInclude('mysql.inc'); end; T:=P.Targets.AddUnit('mysql51dyn.pp'); + T.ResourceStrings:=true; with T.Dependencies do begin AddInclude('mysql.inc'); diff --git a/packages/openssl/fpmake.pp b/packages/openssl/fpmake.pp index bc81398100..9279c97dfb 100644 --- a/packages/openssl/fpmake.pp +++ b/packages/openssl/fpmake.pp @@ -28,6 +28,7 @@ begin T:=P.Targets.AddUnit('openssl.pas'); T:=P.Targets.AddUnit('fpopenssl.pp'); + T.ResourceStrings:=true; P.ExamplePath.Add('examples'); P.Targets.AddExampleProgram('test1.pas'); diff --git a/packages/pastojs/fpmake.pp b/packages/pastojs/fpmake.pp index ee996ff006..93acacae31 100644 --- a/packages/pastojs/fpmake.pp +++ b/packages/pastojs/fpmake.pp @@ -42,6 +42,7 @@ begin T:=P.Targets.AddUnit('pas2jsfiler.pp'); T:=P.Targets.AddUnit('fppas2js.pp'); + T.ResourceStrings:=true; T:=P.Targets.AddUnit('fppjssrcmap.pp'); T:=P.Targets.AddUnit('pas2jsfilecache.pp'); T:=P.Targets.AddUnit('pas2jsfileutils.pp'); diff --git a/packages/rtl-objpas/fpmake.pp b/packages/rtl-objpas/fpmake.pp index 9d208c1e42..db0e5822ba 100644 --- a/packages/rtl-objpas/fpmake.pp +++ b/packages/rtl-objpas/fpmake.pp @@ -64,6 +64,7 @@ begin P.IncludePath.Add('src/common',CommonSrcOSes); T:=P.Targets.AddUnit('strutils.pp',StrUtilsOses); + T.ResourceStrings:=true; T:=P.Targets.AddUnit('widestrutils.pp',StrUtilsOses-ConvUtilOSes); T:=P.Targets.AddUnit('varutils.pp',VarUtilsOses); with T.Dependencies do diff --git a/packages/winunits-base/fpmake.pp b/packages/winunits-base/fpmake.pp index 3faa745ade..a8121cf697 100644 --- a/packages/winunits-base/fpmake.pp +++ b/packages/winunits-base/fpmake.pp @@ -77,6 +77,7 @@ begin T:=P.Targets.AddImplicitUnit('activex.pp'); T:=P.Targets.AddImplicitUnit('urlmon.pp'); T:=P.Targets.AddImplicitUnit('comconst.pp'); + T.ResourceStrings:=true; T:=P.Targets.AddImplicitUnit('commctrl.pp'); T:=P.Targets.AddImplicitUnit('commdlg.pp'); T:=P.Targets.AddImplicitUnit('comobj.pp');