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

rtl-objpas: clean up all the identical varutils variants and made all platforms except Windows to use the common one

Browse Source 
git-svn-id: trunk@34686 -
This commit is contained in:
Károly Balogh 2016-10-09 06:37:54 +00:00
parent 710da4cc13
commit 0af22b9177
14 changed files with 5 additions and 476 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.gitattributes vendored
View File

@ -7142,8 +7142,6 @@ packages/rtl-objpas/Makefile.fpc svneol=native#text/plain
packages/rtl-objpas/Makefile.fpc.fpcmake 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/fpmake.pp svneol=native#text/plain
packages/rtl-objpas/src/common/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 packages/rtl-objpas/src/inc/convutil.inc svneol=native#text/plain
packages/rtl-objpas/src/inc/convutil.pp svneol=native#text/plain packages/rtl-objpas/src/inc/convutil.pp svneol=native#text/plain
packages/rtl-objpas/src/inc/convutils.pp svneol=native#text/plain packages/rtl-objpas/src/inc/convutils.pp svneol=native#text/plain
@ -7159,17 +7157,7 @@ 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/varutilh.inc svneol=native#text/plain
packages/rtl-objpas/src/inc/varutils.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/inc/widestrutils.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
packages/rtl-objpas/src/netware/varutils.pp svneol=native#text/plain
packages/rtl-objpas/src/netwlibc/varutils.pp svneol=native#text/plain
packages/rtl-objpas/src/os2commn/varutils.pp svneol=native#text/plain
packages/rtl-objpas/src/unix/varutils.pp svneol=native#text/plain
packages/rtl-objpas/src/watcom/varutils.pp svneol=native#text/plain
packages/rtl-objpas/src/wii/varutils.pp svneol=native#text/plain
packages/rtl-objpas/src/win/varutils.pp svneol=native#text/plain packages/rtl-objpas/src/win/varutils.pp svneol=native#text/plain
packages/rtl-objpas/src/wince/varutils.pp svneol=native#text/plain
packages/rtl-unicode/Makefile svneol=native#text/plain packages/rtl-unicode/Makefile svneol=native#text/plain
packages/rtl-unicode/Makefile.fpc svneol=native#text/plain packages/rtl-unicode/Makefile.fpc svneol=native#text/plain
packages/rtl-unicode/fpmake.pp svneol=native#text/plain packages/rtl-unicode/fpmake.pp svneol=native#text/plain

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

@ -14,7 +14,7 @@ Const
// AllUnixOSes = [Linux,FreeBSD,NetBSD,OpenBSD,Darwin,QNX,BeOS,Solaris,Haiku,iphonesim,aix,Android]; // AllUnixOSes = [Linux,FreeBSD,NetBSD,OpenBSD,Darwin,QNX,BeOS,Solaris,Haiku,iphonesim,aix,Android];
// unixlikes-[beos]; // unixlikes-[beos];
// //
StrUtilsOSes = [atari,emx,gba,go32v2,msdos,nds,netware,wince,nativent,os2,netwlibc,win32,win64]+UnixLikes+AllAmigaLikeOSes; 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; 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]; ConvUtilsOSes = [nativent,netware,netwlibc,win32,win64,wince]+AllAmigaLikeOSes+UnixLikes-[BeOS];
@ -28,6 +28,8 @@ Const
VarutilsOses + ConvutilsOSes + ConvutilOSes + StdConvsOSes+ VarutilsOses + ConvutilsOSes + ConvutilOSes + StdConvsOSes+
FmtBCDOSes + StrUtilsOSes; FmtBCDOSes + StrUtilsOSes;
CommonSrcOSes = [atari,emx,gba,go32v2,msdos,nds,netware,wince,nativent,os2,netwlibc,watcom,wii]+UnixLikes+AllAmigaLikeOSes;
Var Var
P : TPackage; P : TPackage;
T : TTarget; T : TTarget;
@ -49,17 +51,12 @@ begin
P.SourcePath.Add('src/inc'); P.SourcePath.Add('src/inc');
P.SourcePath.Add('src/$(OS)'); P.SourcePath.Add('src/$(OS)');
P.SourcePath.Add('src/darwin',[iphonesim]);
P.SourcePath.Add('src/unix',AllUnixOSes);
P.SourcePath.Add('src/os2commn',[os2,emx]);
P.SourcePath.Add('src/win',[win32,win64]); P.SourcePath.Add('src/win',[win32,win64]);
P.SourcePath.Add('src/common',AllAmigaLikeOSes+[atari]); P.SourcePath.Add('src/common',CommonSrcOSes);
P.IncludePath.Add('src/inc'); P.IncludePath.Add('src/inc');
P.IncludePath.Add('src/unix',AllUnixOSes);
P.IncludePath.Add('src/$(OS)'); P.IncludePath.Add('src/$(OS)');
P.IncludePath.Add('src/darwin',[iphonesim]); P.IncludePath.Add('src/common',CommonSrcOSes);
P.IncludePath.Add('src/common',AllAmigaLikeOSes+[atari]);
T:=P.Targets.AddUnit('strutils.pp',StrUtilsOses); T:=P.Targets.AddUnit('strutils.pp',StrUtilsOses);
T:=P.Targets.AddUnit('widestrutils.pp',StrUtilsOses-ConvUtilOSes); T:=P.Targets.AddUnit('widestrutils.pp',StrUtilsOses-ConvUtilOSes);

38
packages/rtl-objpas/src/gba/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.

38
packages/rtl-objpas/src/go32v2/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.

38
packages/rtl-objpas/src/msdos/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.

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

@ -1,38 +0,0 @@
{
This file is part of the Free Pascal run time library.
Copyright (c) 2010 by Sven Barth
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.

38
packages/rtl-objpas/src/nds/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.

38
packages/rtl-objpas/src/netware/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.

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

@ -1,38 +0,0 @@
{
This file is part of the Free Pascal run time library.
Copyright (c) 1999-2004 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.

38
packages/rtl-objpas/src/os2commn/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.

38
packages/rtl-objpas/src/unix/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.

38
packages/rtl-objpas/src/watcom/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.

38
packages/rtl-objpas/src/wii/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.

38
packages/rtl-objpas/src/wince/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.