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

rtl-objpas: remove system-specific varutils for Amiga-like systems which were in fact identical, added a common implementation and enable the package for atari as well

Browse Source 
git-svn-id: trunk@34673 -
This commit is contained in:
Károly Balogh 2016-10-08 18:00:20 +00:00
parent a725887d0e
commit f6222e44ef
5 changed files with 12 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitattributes vendored
View File

@ -7141,8 +7141,7 @@ packages/rtl-objpas/Makefile svneol=native#text/plain
packages/rtl-objpas/Makefile.fpc svneol=native#text/plain
packages/rtl-objpas/Makefile.fpc.fpcmake svneol=native#text/plain
packages/rtl-objpas/fpmake.pp svneol=native#text/plain
packages/rtl-objpas/src/amiga/varutils.pp svneol=native#text/plain
packages/rtl-objpas/src/aros/varutils.pp svneol=native#text/plain
packages/rtl-objpas/src/common/varutils.pp svneol=native#text/plain
packages/rtl-objpas/src/gba/varutils.pp svneol=native#text/plain
packages/rtl-objpas/src/go32v2/varutils.pp svneol=native#text/plain
packages/rtl-objpas/src/inc/convutil.inc svneol=native#text/plain
@ -7160,7 +7159,6 @@ packages/rtl-objpas/src/inc/variants.pp svneol=native#text/plain
packages/rtl-objpas/src/inc/varutilh.inc svneol=native#text/plain
packages/rtl-objpas/src/inc/varutils.inc svneol=native#text/plain
packages/rtl-objpas/src/inc/widestrutils.pp svneol=native#text/plain
packages/rtl-objpas/src/morphos/varutils.pp svneol=native#text/plain
packages/rtl-objpas/src/msdos/varutils.pp svneol=native#text/plain
packages/rtl-objpas/src/nativent/varutils.pp svneol=native#text/pascal
packages/rtl-objpas/src/nds/varutils.pp svneol=native#text/plain

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

@ -15,18 +15,18 @@ Const
// AllUnixOSes = [Linux,FreeBSD,NetBSD,OpenBSD,Darwin,QNX,BeOS,Solaris,Haiku,iphonesim,aix,Android];
// unixlikes-[beos];
//
StrUtilsOSes = [amiga,aros,emx,gba,go32v2,msdos,nds,netware,wince,morphos,nativent,os2,netwlibc,win32,win64]+UnixLikes;
VarUtilsOSes = [amiga,aros,emx,gba,go32v2,msdos,nds,netware,wince,morphos,nativent,os2,netwlibc,watcom,wii,win32,win64]+UnixLikes;
ConvUtilsOSes = [nativent,netware,netwlibc,win32,win64,wince]+UnixLikes-[BeOS];
ConvUtilOSes = [Go32v2,msdos,os2,emx];
DateUtilsOSes = [Amiga,aros,gba,morphos,nativent,nds,netware,netwlibc,wii,win32,win64,wince]+UnixLikes;
DateUtilOSes = [Go32v2,msdos,os2,emx];
StrUtilsOSes = [atari,emx,gba,go32v2,msdos,nds,netware,wince,nativent,os2,netwlibc,win32,win64]+UnixLikes+AllAmigaLikeOSes;
VarUtilsOSes = [atari,emx,gba,go32v2,msdos,nds,netware,wince,nativent,os2,netwlibc,watcom,wii,win32,win64]+UnixLikes+AllAmigaLikeOSes;
ConvUtilsOSes = [nativent,netware,netwlibc,win32,win64,wince]+AllAmigaLikeOSes+UnixLikes-[BeOS];
ConvUtilOSes = [atari,Go32v2,msdos,os2,emx];
DateUtilsOSes = [gba,nativent,nds,netware,netwlibc,wii,win32,win64,wince]+UnixLikes+AllAmigaLikeOSes;
DateUtilOSes = [atari,Go32v2,msdos,os2,emx];
StdConvsOSes = [NativeNT,Win32,win64,os2,msdos,go32v2]+UnixLikes-[BeOS];
FmtBCDOSes = [amiga,aros,emx,gba,go32v2,morphos,msdos,nativent,nds,netware,netwlibc,os2,win32,win64,wince]+UnixLikes;
VariantsOSes = [amiga,aros,emx,gba,go32v2,morphos,msdos,nativent,nds,netware,netwlibc,os2,watcom,wii,win32,win64,wince]+UnixLikes;
FmtBCDOSes = [atari,emx,gba,go32v2,msdos,nativent,nds,netware,netwlibc,os2,win32,win64,wince]+UnixLikes+AllAmigaLikeOSes;
VariantsOSes = [atari,emx,gba,go32v2,msdos,nativent,nds,netware,netwlibc,os2,watcom,wii,win32,win64,wince]+UnixLikes+AllAmigaLikeOSes;
AllTargetsObjPas = DateUtilsOses +DateUtilOSes+
VarutilsOses + ConvutilsOSes + ConvutilOSes + StdConvsOSes+
FmtBCDOSes + StrUtilsOSes;
FmtBCDOSes + StrUtilsOSes;
Var
P : TPackage;
@ -53,12 +53,13 @@ begin
P.SourcePath.Add('src/unix',AllUnixOSes);
P.SourcePath.Add('src/os2commn',[os2,emx]);
P.SourcePath.Add('src/win',[win32,win64]);
P.SourcePath.Add('src/common',AllAmigaLikeOSes+[atari]);
P.IncludePath.Add('src/inc');
P.IncludePath.Add('src/unix',AllUnixOSes);
P.IncludePath.Add('src/$(OS)');
P.IncludePath.Add('src/darwin',[iphonesim]);
P.IncludePath.Add('src/common',AllAmigaLikeOSes+[atari]);
T:=P.Targets.AddUnit('strutils.pp',StrUtilsOses);
T:=P.Targets.AddUnit('widestrutils.pp',StrUtilsOses-ConvUtilOSes);

38
packages/rtl-objpas/src/aros/varutils.pp
View File

@ -1,38 +0,0 @@
{
This file is part of the Free Pascal run time library.
Copyright (c) 1999-2000 by the Free Pascal development team
Interface and OS-dependent part of variant support
See the file COPYING.FPC, included in this distribution,
for details about the copyright.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
**********************************************************************}
{$MODE ObjFPC}
Unit varutils;
Interface
Uses sysutils;
// Read definitions.
{$i varutilh.inc}
Implementation
// Code common to all platforms.
{$i cvarutil.inc}
// Code common to non-win32 platforms.
{$i varutils.inc}
end.

0
packages/rtl-objpas/src/amiga/varutils.pp → packages/rtl-objpas/src/common/varutils.pp
View File

38
packages/rtl-objpas/src/morphos/varutils.pp
View File

@ -1,38 +0,0 @@
{
This file is part of the Free Pascal run time library.
Copyright (c) 1999-2000 by the Free Pascal development team
Interface and OS-dependent part of variant support
See the file COPYING.FPC, included in this distribution,
for details about the copyright.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
**********************************************************************}
{$MODE ObjFPC}
Unit varutils;
Interface
Uses sysutils;
// Read definitions.
{$i varutilh.inc}
Implementation
// Code common to all platforms.
{$i cvarutil.inc}
// Code common to non-win32 platforms.
{$i varutils.inc}
end.