Group merge of changes to fpmake.pp for pacakges and utils

  with fpmkunit change.

------------------------------------------------------------------------
r40365 | pierre | 2018-11-24 15:14:57 +0000 (Sat, 24 Nov 2018) | 4 lines

  + 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.

------------------------------------------------------------------------
--- Merging r40365 into '.':
U    packages/mysql/fpmake.pp
U    packages/fcl-base/fpmake.pp
U    packages/fcl-web/fpmake.pp
U    packages/fcl-db/fpmake.pp
U    packages/fcl-pdf/fpmake.pp
U    packages/fcl-image/fpmake.pp
U    packages/pastojs/fpmake.pp
U    packages/fcl-passrc/fpmake.pp
U    packages/rtl-objpas/fpmake.pp
U    packages/openssl/fpmake.pp
U    packages/winunits-base/fpmake.pp
U    packages/fpmkunit/src/fpmkunit.pp
--- Recording mergeinfo for merge of r40365 into '.':
 U   .
------------------------------------------------------------------------
r40391 | pierre | 2018-11-28 23:45:35 +0000 (Wed, 28 Nov 2018) | 1 line

 Add several missing unit references in fpmake files
------------------------------------------------------------------------
--- Merging r40391 into '.':
U    utils/pas2ut/fpmake.pp
U    utils/fpdoc/fpmake.pp
U    utils/pas2js/fpmake.pp
U    utils/fppkg/fpmake.pp
U    utils/fpcmkcfg/fpmake.pp
U    utils/fpmake.pp
U    utils/unicode/fpmake.pp
--- Recording mergeinfo for merge of r40391 into '.':
 G   .
------------------------------------------------------------------------
r40899 | pierre | 2019-01-19 10:26:51 +0000 (Sat, 19 Jan 2019) | 1 line

 Activate fpc-web package for android OS, except for jvm compiler
------------------------------------------------------------------------
--- Merging r40899 into '.':
G    packages/fcl-web/fpmake.pp
--- Recording mergeinfo for merge of r40899 into '.':
 G   .
------------------------------------------------------------------------
r41069 | pierre | 2019-01-25 12:58:21 +0000 (Fri, 25 Jan 2019) | 1 line

 Disable targets that do not support fcl-base for utils packages that need fcl-base
------------------------------------------------------------------------
--- Merging r41069 into '.':
G    utils/pas2ut/fpmake.pp
G    utils/fpdoc/fpmake.pp
U    utils/json2pas/fpmake.pp
U    utils/fpcreslipo/fpmake.pp
G    utils/fpcmkcfg/fpmake.pp
G    utils/fpmake.pp
U    utils/fpcres/fpmake.pp
U    utils/fpcm/fpmake.pp
G    utils/unicode/fpmake.pp
U    utils/pas2fpm/fpmake.pp
U    utils/instantfpc/fpmake.pp
U    utils/importtl/fpmake.pp
--- Recording mergeinfo for merge of r41069 into '.':
 G   .
------------------------------------------------------------------------
r41070 | pierre | 2019-01-25 14:39:12 +0000 (Fri, 25 Jan 2019) | 1 line

 Enable paszlib package and disable utils/fpcm and utils/fpcmkcfg for nativent OS
------------------------------------------------------------------------
--- Merging r41070 into '.':
U    packages/paszlib/fpmake.pp
G    utils/fpcmkcfg/fpmake.pp
G    utils/fpcm/fpmake.pp
--- Recording mergeinfo for merge of r41070 into '.':
 G   .
------------------------------------------------------------------------
r41076 | pierre | 2019-01-26 10:17:58 +0000 (Sat, 26 Jan 2019) | 1 line

 Also use installed ppudump for ppu testing in utils directory
------------------------------------------------------------------------
--- Merging r41076 into '.':
U    utils/Makefile.fpc
U    utils/Makefile
--- Recording mergeinfo for merge of r41076 into '.':
 G   .
------------------------------------------------------------------------
r41104 | pierre | 2019-01-28 17:43:15 +0000 (Mon, 28 Jan 2019) | 1 line

 -Xr is also supported for systems_android
------------------------------------------------------------------------
--- Merging r41104 into '.':
U    compiler/options.pas
--- Recording mergeinfo for merge of r41104 into '.':
 G   .
------------------------------------------------------------------------
r41106 | pierre | 2019-01-29 09:01:42 +0000 (Tue, 29 Jan 2019) | 1 line

 Disable jvm-android and jvm-java targets for fprcp, h2pas and tply packages because they use memory allocation or fpc_get_output
------------------------------------------------------------------------
--- Merging r41106 into '.':
U    utils/fprcp/fpmake.pp
U    utils/h2pas/fpmake.pp
U    utils/tply/fpmake.pp
--- Recording mergeinfo for merge of r41106 into '.':
 G   .
------------------------------------------------------------------------
r41119 | pierre | 2019-01-29 13:46:43 +0000 (Tue, 29 Jan 2019) | 1 line

 Disable palmos in fprcp, h2pas and tply packages
------------------------------------------------------------------------
--- Merging r41119 into '.':
G    utils/fprcp/fpmake.pp
G    utils/h2pas/fpmake.pp
G    utils/tply/fpmake.pp
--- Recording mergeinfo for merge of r41119 into '.':
 G   .
------------------------------------------------------------------------
r41120 | pierre | 2019-01-29 14:08:03 +0000 (Tue, 29 Jan 2019) | 1 line

 Disable fprcp, h2pas and tply pacakges for msdos and win16 because the programs are too big
------------------------------------------------------------------------
--- Merging r41120 into '.':
G    utils/fprcp/fpmake.pp
G    utils/h2pas/fpmake.pp
G    utils/tply/fpmake.pp
--- Recording mergeinfo for merge of r41120 into '.':
 G   .
------------------------------------------------------------------------
r41121 | pierre | 2019-01-29 14:17:53 +0000 (Tue, 29 Jan 2019) | 1 line

 Disable atari target for fpcm and fpcmkcfg because it depends on unsupported fpmkunit package
------------------------------------------------------------------------
--- Merging r41121 into '.':
G    utils/fpcmkcfg/fpmake.pp
G    utils/fpcm/fpmake.pp
--- Recording mergeinfo for merge of r41121 into '.':
 G   .
------------------------------------------------------------------------
r41122 | pierre | 2019-01-29 14:32:28 +0000 (Tue, 29 Jan 2019) | 1 line

 Disable some packages for avr-embedded and i8086-embedded targets
------------------------------------------------------------------------
--- Merging r41122 into '.':
G    utils/fprcp/fpmake.pp
G    utils/h2pas/fpmake.pp
G    utils/tply/fpmake.pp
--- Recording mergeinfo for merge of r41122 into '.':
 G   .
------------------------------------------------------------------------
r41142 | pierre | 2019-01-30 12:55:04 +0000 (Wed, 30 Jan 2019) | 1 line

 Disable jvm-android as fcl-json is not supported for this target
------------------------------------------------------------------------
--- Merging r41142 into '.':
G    utils/pas2js/fpmake.pp
--- Recording mergeinfo for merge of r41142 into '.':
 G   .
------------------------------------------------------------------------
r41150 | pierre | 2019-01-31 11:20:34 +0000 (Thu, 31 Jan 2019) | 1 line

 Disable pas2js for jvm compiler
------------------------------------------------------------------------
--- Merging r41150 into '.':
G    utils/pas2js/fpmake.pp
--- Recording mergeinfo for merge of r41150 into '.':
 G   .

git-svn-id: branches/fixes_3_2@41193 -

compiler/options.pas

@@ -137,7 +137,7 @@ const
                         + [system_i386_netbsd]
                         + [system_i386_wdosx];
 
-  suppported_targets_x_smallr = systems_linux + systems_solaris
+  suppported_targets_x_smallr = systems_linux + systems_solaris + systems_android
                              + [system_i386_haiku]
                              + [system_i386_beos]
                              + [system_m68k_amiga];

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

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

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

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

packages/fcl-pdf/fpmake.pp

@@ -37,17 +37,21 @@ begin
     P.Version:='3.2.0-beta';
     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');

packages/fcl-web/fpmake.pp

@@ -18,7 +18,10 @@ begin
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='3.2.0-beta';
-    P.OSes := [beos,haiku,freebsd,darwin,iphonesim,solaris,netbsd,openbsd,linux,win32,win64,wince,aix,amiga,aros,morphos,dragonfly];
+    P.OSes := [beos,haiku,freebsd,darwin,iphonesim,solaris,netbsd,openbsd,linux,win32,win64,wince,aix,amiga,aros,morphos,dragonfly,android];
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
+
     P.Dependencies.Add('fcl-base');
     P.Dependencies.Add('fcl-db');
     P.Dependencies.Add('fcl-xml');
@@ -50,6 +53,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 +273,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');

packages/fpmkunit/src/fpmkunit.pp

@@ -8804,12 +8804,12 @@ begin
     begin
       if FileExists(UnitsDir + RSJFileName) then
         begin
-          Installer.Log(VlDebug,Format(SDbgUNregisteredResource,[APrefixU + RSJFileName]));
+          Installer.Log(VlDebug,Format(SDbgUnregisteredResource,[APrefixU + RSJFileName]));
           List.Add(APrefixU + RSJFileName);
         end
       else if FileExists(UnitsDir + RSTFileName) then
         begin
-          Installer.Log(VlDebug,Format(SDbgUNregisteredResource,[APrefixU + RSTFileName]));
+          Installer.Log(VlDebug,Format(SDbgUnregisteredResource,[APrefixU + RSTFileName]));
           List.Add(APrefixU + RSTFileName);
         end;
      end;

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

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

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

packages/paszlib/fpmake.pp

@@ -20,7 +20,7 @@ begin
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='3.2.0-beta';
-    P.OSes := P.OSes - [embedded,nativent,msdos,win16,macos,palmos];
+    P.OSes := P.OSes - [embedded,msdos,win16,macos,palmos];
     if Defaults.CPU=jvm then
       P.OSes := P.OSes - [java,android];
 

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

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

utils/Makefile

@@ -2509,8 +2509,8 @@ ppulogs : $(PPULOGLIST)
 vpath %.ppu $(ALLPPUDIRS)
 vpath %.log-ppu $(ALLPPUDIRS)
 vpath %.rm-log-ppu $(ALLPPUDIRS)
-%.log-ppu : %.ppu ../compiler/utils/ppudump$(EXEEXT)
-	..$(PATHSEP)compiler$(PATHSEP)utils$(PATHSEP)ppudump -VA -M $< > $@
+%.log-ppu : %.ppu
+	ppudump -VA -M $< > $@
 %.rm-log-ppu : %.ppu ../compiler/utils/ppudump$(EXEEXT)
 	-$(RMPROG) $<
 ../compiler/utils/ppudump$(EXEEXT):

utils/Makefile.fpc

@@ -133,8 +133,9 @@ vpath %.ppu $(ALLPPUDIRS)
 vpath %.log-ppu $(ALLPPUDIRS)
 vpath %.rm-log-ppu $(ALLPPUDIRS)
 
-%.log-ppu : %.ppu ../compiler/utils/ppudump$(EXEEXT)
-	..$(PATHSEP)compiler$(PATHSEP)utils$(PATHSEP)ppudump -VA -M $< > $@
+# Do not try to recompile ppudump, as this does not work if trying to test cross-compiled units
+%.log-ppu : %.ppu
+	ppudump -VA -M $< > $@
 
 %.rm-log-ppu : %.ppu ../compiler/utils/ppudump$(EXEEXT)
 	-$(RMPROG) $<

utils/fpcm/fpmake.pp

@@ -210,6 +210,9 @@ begin
     begin
     P:=AddPackage('utils-fpcm');
     P.ShortName:='fpcm';
+    P.OSes:=AllOSes-[embedded,msdos,nativent,win16,macos,atari,palmos];
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
 
     P.Author := '<various>';
     P.License := 'LGPL with modification';

utils/fpcmkcfg/fpmake.pp

@@ -17,6 +17,9 @@ begin
     begin
     P:=AddPackage('utils-fpcmkcfg');
     P.ShortName:='fcmk';
+    P.OSes:=AllOSes-[embedded,msdos,nativent,win16,atari,macos,palmos];
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
 
     P.Author := '<various>';
     P.License := 'LGPL with modification';
@@ -39,6 +42,7 @@ begin
     p.Commands.AddCommand(caBeforeCompile, Data2IncBin, '-b -s default.cft default.inc fppkg_default','default.inc','default.cft');
 
     T:=P.Targets.AddProgram('fpcmkcfg.pp');
+    T.ResourceStrings:=true;
     T.Dependencies.AddInclude('fpccfg.inc');
     T.Dependencies.AddInclude('fpcfg.inc');
     T.Dependencies.AddInclude('fpini.inc');

utils/fpcres/fpmake.pp

@@ -16,6 +16,9 @@ begin
     begin
     P:=AddPackage('utils-fpcres');
     P.ShortName:='fpres';
+    P.OSes:=AllOSes-[embedded,msdos,win16,macos,palmos];
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
 
     P.Author := 'Giulio Bernardi';
     P.License := 'LGPL with modification';

utils/fpcreslipo/fpmake.pp

@@ -16,6 +16,9 @@ begin
     begin
     P:=AddPackage('utils-fpcreslipo');
     P.ShortName:='fpcreslipo';
+    P.OSes:=AllOSes-[embedded,msdos,win16,macos,palmos];
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
 
     P.Author := 'Giulio Bernardi';
     P.License := 'LGPL with modification';

utils/fpdoc/fpmake.pp

@@ -18,6 +18,9 @@ begin
     begin
     P:=AddPackage('utils-fpdoc');
     P.ShortName:='fpdoc';
+    P.OSes:=AllOSes-[embedded,msdos,win16,macos,palmos];
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
 
     P.Author := '<various>';
     P.License := 'LGPL with modification';
@@ -60,7 +63,9 @@ begin
     T.Dependencies.AddUnit('dglobals');
 
     T:=P.Targets.AddProgram('unitdiff.pp');
+    T.ResourceStrings:=true;
     T:=P.Targets.AddProgram('fpclasschart.pp');
+    T.ResourceStrings:=true;
 
     T := P.Targets.AddUnit('dglobals.pp');
     T.install:=false;
@@ -77,13 +82,16 @@ begin
     P.Targets.AddUnit('dw_xml.pp').install:=false;
     P.Targets.AddUnit('sh_pas.pp').install:=false;
     P.Targets.AddUnit('dw_html.pp').install:=false;
-    P.Targets.AddUnit('dw_latex.pp').install:=false;
+    T:=P.Targets.AddUnit('dw_latex.pp');
+    T.install:=false;
+    T.ResourceStrings:=true;
     P.Targets.AddUnit('dw_txt.pp').install:=false;
     P.Targets.AddUnit('dw_man.pp').install:=false;
     P.Targets.AddUnit('dwlinear.pp').install:=false;
     P.Targets.AddUnit('dw_linrtf.pp').install:=false;
     P.Targets.AddUnit('dw_dxml.pp').install:=false;
     P.Targets.AddUnit('fpdocproj.pas').install:=false;
+    P.Targets.AddUnit('fpdocclasstree.pp').install:=false;
     P.Targets.AddUnit('mkfpdoc.pp').install:=false;
     P.Targets.AddUnit('dw_ipflin.pas').install:=false;
 

utils/fpmake.pp

@@ -50,6 +50,10 @@ begin
   With Installer do
     begin
     P:=AddPackage('utils');
+    P.OSes:=AllOSes-[embedded,msdos,win16,macos,palmos];
+    P.OSes:=AllOSes-[embedded,msdos,win16,macos,palmos];
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
 
     P.Author := '<various>';
     P.License := 'LGPL with modification';
@@ -69,7 +73,7 @@ begin
 
     P.Dependencies.Add('rtl-extra');
     P.Dependencies.Add('rtl-objpas');
-	
+
     P.Version:='3.2.0-beta';
 
     T:=P.Targets.AddProgram('ptop.pp');
@@ -77,7 +81,8 @@ begin
     T.ResourceStrings:=true;
 
     P.Targets.AddProgram('ppdep.pp');
-    P.Targets.AddProgram('rstconv.pp');
+    T:=P.Targets.AddProgram('rstconv.pp');
+    T.ResourceStrings:=true;
     P.Targets.AddProgram('data2inc.pp');
     P.Targets.AddProgram('delp.pp');
     P.Targets.AddProgram('bin2obj.pp');
@@ -87,6 +92,7 @@ begin
     P.Targets.AddProgram('grab_vcsa.pp',[linux]);
     T:=P.Targets.AddProgram('fpcsubst.pp');
     T.Dependencies.AddUnit('usubst');
+    T.ResourceStrings:=true;
     P.Targets.AddUnit('usubst.pp').install:=false;
     P.Targets.AddUnit('ptopu.pp').install:=false;
     end;

utils/fppkg/fpmake.pp

@@ -9,7 +9,7 @@ procedure add_fppkg_util(const ADirectory: string);
 
 const
   lnetOSes = [linux,beos,haiku,freebsd,netbsd,openbsd,darwin,iphonesim,solaris,win32,win64,wince,aix];
-
+  WindowsOSes = [win32,win64,wince];
 Var
   P : TPackage;
   T : TTarget;
@@ -71,6 +71,7 @@ begin
     P.Targets.AddUnit('lnet/lnet.pp', lnetOSes).install:=false;
     P.Targets.AddUnit('lnet/lstrbuffer.pp', lnetOSes).install:=false;
     P.Targets.AddUnit('lnet/ltimer.pp', lnetOSes).install:=false;
+    P.Targets.AddUnit('lnet/lws2tcpip.pp', WindowsOSes).install:=false;
 
     P.Sources.AddSrc('lnet/lsmtp.pp');
     P.Sources.AddSrc('lnet/lwebserver.pp');

utils/fprcp/fpmake.pp

@@ -16,6 +16,18 @@ begin
     begin
     P:=AddPackage('utils-fprcp');
     P.ShortName:='fprcp';
+    { java and jvm-android do not support 
+      getmem/freemem and new/dispose used in
+      these sources }
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
+    { palmos does not have classes }
+    P.OSes := P.OSes - [palmos];
+    { Program does not fit in 16-bit memory constraints }
+    P.OSes := P.OSes - [msdos,win16];
+    { avr-embedded and i8086-embedded have not floating point support by default }
+    if Defaults.CPU in [avr,i8086] then
+      P.OSes := P.OSes - [embedded];
 
     P.Author := '<various>';
     P.License := 'LGPL with modification';

utils/h2pas/fpmake.pp

@@ -16,6 +16,17 @@ begin
     begin
     P:=AddPackage('utils-h2pas');
     P.ShortName:='h2pas';
+    { java and jvm-android do not support 
+      fpc_get_output used in these sources }
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
+    { palmos does not support command line parameters }
+    P.OSes := P.OSes - [palmos];
+    { Program does not fit in 16-bit memory constraints }
+    P.OSes := P.OSes - [msdos,win16];
+    { avr-embedded and i8086-embedded do not support all needed features by default }
+    if Defaults.CPU in [avr,i8086] then
+      P.OSes := P.OSes - [embedded];
 
     P.Author := '<various>';
     P.License := 'LGPL with modification';

utils/importtl/fpmake.pp

@@ -16,6 +16,9 @@ begin
     begin
     P:=AddPackage('utils-importtl');
     P.ShortName:='importttl';
+    P.OSes:=AllOSes-[embedded,msdos,win16,macos,palmos];
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
 
     P.Author := '<various>';
     P.License := 'LGPL with modification';

utils/instantfpc/fpmake.pp

@@ -16,6 +16,9 @@ begin
     begin
     P:=AddPackage('utils-instantfpc');
     P.ShortName:='instantfpc';
+    P.OSes:=AllOSes-[embedded,msdos,win16,macos,palmos];
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
 
     P.Author := '<various>';
     P.License := 'LGPL with modification';

utils/json2pas/fpmake.pp

@@ -18,6 +18,9 @@ begin
     P.Dependencies.Add('fcl-json');
 
     P.ShortName:='json2pas';
+    P.OSes:=AllOSes-[embedded,msdos,win16,macos,palmos];
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
 
     P.Author := 'Michael Van Canneyt';
     P.License := 'LGPL with modification';

utils/pas2fpm/fpmake.pp

@@ -16,6 +16,9 @@ begin
     begin
     P:=AddPackage('utils-pas2fpm');
     p.ShortName:='p2fm';
+    P.OSes:=AllOSes-[embedded,msdos,win16,macos,palmos];
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
 
     P.Author := 'Free Pascal Team';
     P.License := 'LGPL with modification';

utils/pas2js/fpmake.pp

@@ -26,6 +26,8 @@ begin
     P.Directory:=ADirectory;
     P.Version:='3.2.0-beta';
     P.OSes:=AllUnixOSes+AllBSDOSes+AllWindowsOSes-[WinCE];
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [android];
     P.Dependencies.Add('fcl-json');
     P.Dependencies.Add('fcl-js');
     P.Dependencies.Add('fcl-passrc');
@@ -34,9 +36,11 @@ begin
     P.Dependencies.Add('webidl');
     PT:=P.Targets.AddProgram('pas2js.pp');
     PT:=P.Targets.AddLibrary('pas2jslib.pp');
+    PT:=P.Targets.AddUnit('dirwatch.pp');
     PT:=P.Targets.AddUnit('httpcompiler.pp');
+    PT.Dependencies.AddUnit('dirwatch');
     PT:=P.Targets.AddProgram('compileserver.pp');
-    PT.Dependencies.AddUnit('httpcompiler');    
+    PT.Dependencies.AddUnit('httpcompiler');
     PT:=P.Targets.AddProgram('webidl2pas.pp');
     end;
 end;

utils/pas2ut/fpmake.pp

@@ -16,6 +16,9 @@ begin
     begin
     P:=AddPackage('utils-pas2ut');
     P.ShortName:='p2ut';
+    P.OSes:=AllOSes-[embedded,msdos,win16,macos,palmos];
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
 
     P.Author := 'Free Pascal Team';
     P.License := 'LGPL with modification';
@@ -29,6 +32,7 @@ begin
     P.Dependencies.Add('fcl-passrc');
 
     T:=P.Targets.AddProgram('pas2ut.pp');
+    T.ResourceStrings:=true;
     end;
 end;
 

utils/tply/fpmake.pp

@@ -17,6 +17,17 @@ begin
     begin
     P:=AddPackage('utils-lexyacc');
     P.ShortName:='tply';
+    { java and jvm-android do not support 
+      fpc_get_output used in these sources }
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
+    { palmos does not support command line parameters }
+    P.OSes := P.OSes - [palmos];
+    { Program does not fit in 16-bit memory constraints }
+    P.OSes := P.OSes - [msdos,win16];
+    { avr-embedded and i8086-embedded do not meet needed requirements }
+    if Defaults.CPU in [avr,i8086] then
+      P.OSes := P.OSes - [embedded];
 
     P.Author := '<various>';
     P.License := 'LGPL with modification';

utils/unicode/fpmake.pp

@@ -16,6 +16,9 @@ begin
     begin
     P:=AddPackage('utils-unicode');
     P.ShortName:='ucode';
+    P.OSes:=AllOSes-[embedded,msdos,win16,macos,palmos];
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
 
     P.Author := 'Inoussa OUEDRAOGO';
     P.License := 'LGPL with modification';
@@ -36,6 +39,7 @@ begin
     T := P.Targets.AddImplicitUnit('helper.pas');
     T.ResourceStrings := true;
     T.Install := false;
+    T := P.Targets.AddImplicitUnit('cldrtxt.pas');
     T.Install := false;
     T := P.Targets.AddImplicitUnit('cldrxml.pas');
     T.Install := false;
@@ -46,6 +50,7 @@ begin
     T.Install := false;
     T := P.Targets.AddImplicitUnit('cldrhelper.pas');
     T.Install := false;
+    T.ResourceStrings:=true;
     T := P.Targets.AddImplicitUnit('cldrtest.pas');
     T.Install := false;
     T := P.Targets.AddImplicitUnit('grbtree.pas');