paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-09 00:08:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

+ Add Debug message when resource file is found, but not registered.

Browse Source 
+ Add missing "T.ResourceStrings:=True;" for all source units
    that generate the new debug message above.

git-svn-id: trunk@40365 -
This commit is contained in:
pierre 2018-11-24 15:14:57 +00:00
parent db80944f47
commit deb3d5a0a9
12 changed files with 49 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/fcl-base/fpmake.pp
View File

@ -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');

2
packages/fcl-db/fpmake.pp
View File

@ -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');

1
packages/fcl-image/fpmake.pp
View File

@ -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

1
packages/fcl-passrc/fpmake.pp
View File

@ -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');

4
packages/fcl-pdf/fpmake.pp
View File

@ -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');

2
packages/fcl-web/fpmake.pp
View File

@ -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');

31
packages/fpmkunit/src/fpmkunit.pp
View File

@ -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;

1
packages/mysql/fpmake.pp
View File

@ -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');

1
packages/openssl/fpmake.pp
View File

@ -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');

1
packages/pastojs/fpmake.pp
View File

@ -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');

1
packages/rtl-objpas/fpmake.pp
View File

@ -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

1
packages/winunits-base/fpmake.pp
View File

@ -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');