From 9669c1cad3af216a812bdee5701e3c4ffbb078a9 Mon Sep 17 00:00:00 2001 From: marco Date: Sun, 21 Jan 2001 20:45:09 +0000 Subject: [PATCH] * Rename fest II FCL version. --- fcl/Makefile | 65 +++++++++++++++++++++++++++++++++++++++-- fcl/freebsd/classes.pp | 7 +++-- fcl/freebsd/process.inc | 7 +++-- fcl/freebsd/thread.inc | 9 ++++-- fcl/inc/ssockets.pp | 7 +++-- fcl/linux/classes.pp | 7 +++-- fcl/linux/process.inc | 7 +++-- fcl/linux/thread.inc | 9 ++++-- fcl/unix/asyncioh.inc | 7 +++-- fcl/unix/ezcgi.inc | 9 ++++-- fcl/unix/pipes.inc | 7 +++-- 11 files changed, 116 insertions(+), 25 deletions(-) diff --git a/fcl/Makefile b/fcl/Makefile index 91ab853802..3fe895ee57 100644 --- a/fcl/Makefile +++ b/fcl/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v1.00 [2000/12/19] +# Makefile generated by fpcmake v1.00 [2000/12/23] # defaultrule: all @@ -153,7 +153,7 @@ endif # Targets -override DIROBJECTS+=$(wildcard go32v2 linux win32 os2) +override DIROBJECTS+=$(wildcard go32v2 linux win32 os2 freebsd) override EXAMPLEDIROBJECTS+=tests shedit/gtk # Clean @@ -623,6 +623,7 @@ OBJECTDIRGO32V2=1 OBJECTDIRLINUX=1 OBJECTDIRWIN32=1 OBJECTDIROS2=1 +OBJECTDIRFREEBSD=1 # Dir go32v2 @@ -863,6 +864,66 @@ os2_require: os2_info: $(MAKE) -C os2 info endif + +# Dir freebsd + +ifdef OBJECTDIRFREEBSD +.PHONY: freebsd_all freebsd_debug freebsd_examples freebsd_test freebsd_smart freebsd_shared freebsd_showinstall freebsd_install freebsd_sourceinstall freebsd_exampleinstall freebsd_zipinstall freebsd_zipsourceinstall freebsd_zipexampleinstall freebsd_clean freebsd_distclean freebsd_cleanall freebsd_require freebsd_info + +freebsd_all: + $(MAKE) -C freebsd all + +freebsd_debug: + $(MAKE) -C freebsd debug + +freebsd_examples: + $(MAKE) -C freebsd examples + +freebsd_test: + $(MAKE) -C freebsd test + +freebsd_smart: + $(MAKE) -C freebsd smart + +freebsd_shared: + $(MAKE) -C freebsd shared + +freebsd_showinstall: + $(MAKE) -C freebsd showinstall + +freebsd_install: + $(MAKE) -C freebsd install + +freebsd_sourceinstall: + $(MAKE) -C freebsd sourceinstall + +freebsd_exampleinstall: + $(MAKE) -C freebsd exampleinstall + +freebsd_zipinstall: + $(MAKE) -C freebsd zipinstall + +freebsd_zipsourceinstall: + $(MAKE) -C freebsd zipsourceinstall + +freebsd_zipexampleinstall: + $(MAKE) -C freebsd zipexampleinstall + +freebsd_clean: + $(MAKE) -C freebsd clean + +freebsd_distclean: + $(MAKE) -C freebsd distclean + +freebsd_cleanall: + $(MAKE) -C freebsd cleanall + +freebsd_require: + $(MAKE) -C freebsd require + +freebsd_info: + $(MAKE) -C freebsd info +endif EXAMPLEDIRTESTS=1 EXAMPLEDIRSHEDIT/GTK=1 diff --git a/fcl/freebsd/classes.pp b/fcl/freebsd/classes.pp index 0ae6a6c7dc..21fcadd816 100644 --- a/fcl/freebsd/classes.pp +++ b/fcl/freebsd/classes.pp @@ -32,7 +32,7 @@ uses implementation uses - linux; + Unix; { OS - independent class implementations are in /inc directory. } {$i classes.inc} @@ -50,7 +50,10 @@ finalization end. { $Log$ - Revision 1.2 2000-10-26 22:30:21 peter + Revision 1.3 2001-01-21 20:45:09 marco + * Rename fest II FCL version. + + Revision 1.2 2000/10/26 22:30:21 peter * freebsd update * classes.rst diff --git a/fcl/freebsd/process.inc b/fcl/freebsd/process.inc index 14133f721f..6a992e819a 100644 --- a/fcl/freebsd/process.inc +++ b/fcl/freebsd/process.inc @@ -14,7 +14,7 @@ **********************************************************************} -uses linux; +uses Unix; Function TProcess.GetRunning : Boolean; @@ -106,7 +106,10 @@ end; { $Log$ - Revision 1.2 2000-10-26 22:30:21 peter + Revision 1.3 2001-01-21 20:45:09 marco + * Rename fest II FCL version. + + Revision 1.2 2000/10/26 22:30:21 peter * freebsd update * classes.rst diff --git a/fcl/freebsd/thread.inc b/fcl/freebsd/thread.inc index aa657bc21d..9e81793e44 100644 --- a/fcl/freebsd/thread.inc +++ b/fcl/freebsd/thread.inc @@ -217,7 +217,7 @@ var P: Integer; I: TThreadPriority; begin - P := Linux.GetPriority(Prio_Process,FHandle); + P := Unix.GetPriority(Prio_Process,FHandle); Result := tpNormal; for I := Low(TThreadPriority) to High(TThreadPriority) do if Priorities[I] = P then @@ -227,7 +227,7 @@ end; procedure TThread.SetPriority(Value: TThreadPriority); begin - Linux.SetPriority(Prio_Process,FHandle, Priorities[Value]); + Unix.SetPriority(Prio_Process,FHandle, Priorities[Value]); end; @@ -283,7 +283,10 @@ end; { $Log$ - Revision 1.2 2000-10-26 22:30:21 peter + Revision 1.3 2001-01-21 20:45:09 marco + * Rename fest II FCL version. + + Revision 1.2 2000/10/26 22:30:21 peter * freebsd update * classes.rst diff --git a/fcl/inc/ssockets.pp b/fcl/inc/ssockets.pp index b37eaf7fc5..90535da8b1 100644 --- a/fcl/inc/ssockets.pp +++ b/fcl/inc/ssockets.pp @@ -144,7 +144,7 @@ type Implementation -uses inet,linux; +uses inet,Unix; Const SocketWouldBlock = -2; @@ -497,7 +497,10 @@ end. { $Log$ - Revision 1.3 2000-11-17 13:40:53 sg + Revision 1.4 2001-01-21 20:45:09 marco + * Rename fest II FCL version. + + Revision 1.3 2000/11/17 13:40:53 sg * Fixed header and log section Revision 1.2 2000/07/13 11:33:00 michael diff --git a/fcl/linux/classes.pp b/fcl/linux/classes.pp index e51b20f41c..1d63d2777d 100644 --- a/fcl/linux/classes.pp +++ b/fcl/linux/classes.pp @@ -32,7 +32,7 @@ uses implementation uses - linux; + Unix; { OS - independent class implementations are in /inc directory. } {$i classes.inc} @@ -50,7 +50,10 @@ finalization end. { $Log$ - Revision 1.2 2000-07-13 11:33:01 michael + Revision 1.3 2001-01-21 20:45:09 marco + * Rename fest II FCL version. + + Revision 1.2 2000/07/13 11:33:01 michael + removed logs } diff --git a/fcl/linux/process.inc b/fcl/linux/process.inc index 7f0b2d3789..d97d57b868 100644 --- a/fcl/linux/process.inc +++ b/fcl/linux/process.inc @@ -14,7 +14,7 @@ **********************************************************************} -uses linux; +uses Unix; Function TProcess.GetRunning : Boolean; @@ -106,7 +106,10 @@ end; { $Log$ - Revision 1.2 2000-07-13 11:33:01 michael + Revision 1.3 2001-01-21 20:45:09 marco + * Rename fest II FCL version. + + Revision 1.2 2000/07/13 11:33:01 michael + removed logs } diff --git a/fcl/linux/thread.inc b/fcl/linux/thread.inc index f688dce253..40f6c4c11f 100644 --- a/fcl/linux/thread.inc +++ b/fcl/linux/thread.inc @@ -217,7 +217,7 @@ var P: Integer; I: TThreadPriority; begin - P := Linux.GetPriority(Prio_Process,FHandle); + P := Unix.GetPriority(Prio_Process,FHandle); Result := tpNormal; for I := Low(TThreadPriority) to High(TThreadPriority) do if Priorities[I] = P then @@ -227,7 +227,7 @@ end; procedure TThread.SetPriority(Value: TThreadPriority); begin - Linux.SetPriority(Prio_Process,FHandle, Priorities[Value]); + Unix.SetPriority(Prio_Process,FHandle, Priorities[Value]); end; @@ -283,7 +283,10 @@ end; { $Log$ - Revision 1.2 2000-07-13 11:33:01 michael + Revision 1.3 2001-01-21 20:45:09 marco + * Rename fest II FCL version. + + Revision 1.2 2000/07/13 11:33:01 michael + removed logs } diff --git a/fcl/unix/asyncioh.inc b/fcl/unix/asyncioh.inc index 02af521c91..8c713ebfec 100644 --- a/fcl/unix/asyncioh.inc +++ b/fcl/unix/asyncioh.inc @@ -12,7 +12,7 @@ **********************************************************************} -uses linux,classes; +uses Unix,classes; const MaxHandle = SizeOf(TFDSet) * 8 - 1; @@ -25,7 +25,10 @@ Type { $Log$ - Revision 1.2 2000-10-26 22:30:21 peter + Revision 1.3 2001-01-21 20:45:09 marco + * Rename fest II FCL version. + + Revision 1.2 2000/10/26 22:30:21 peter * freebsd update * classes.rst diff --git a/fcl/unix/ezcgi.inc b/fcl/unix/ezcgi.inc index a54a38411a..2598a67042 100644 --- a/fcl/unix/ezcgi.inc +++ b/fcl/unix/ezcgi.inc @@ -13,7 +13,7 @@ **********************************************************************} -Uses Linux; +Uses Unix; { Declared EXPLICITLY with Ansistring, so NO mistaking is possible } @@ -23,7 +23,7 @@ Var P : Pchar; begin // Linux version returns pchar. - p:=linux.getenv(EnvVar); + p:=Unix.getenv(EnvVar); if P<>nil then getenv:=strpas(p) else @@ -32,7 +32,10 @@ end; { $Log$ - Revision 1.2 2000-10-26 22:30:21 peter + Revision 1.3 2001-01-21 20:45:09 marco + * Rename fest II FCL version. + + Revision 1.2 2000/10/26 22:30:21 peter * freebsd update * classes.rst diff --git a/fcl/unix/pipes.inc b/fcl/unix/pipes.inc index 6d03d609e5..b7f6950df2 100644 --- a/fcl/unix/pipes.inc +++ b/fcl/unix/pipes.inc @@ -14,7 +14,7 @@ **********************************************************************} -uses linux; +uses Unix; Function CreatePipeHandles (Var Inhandle,OutHandle : Longint) : Boolean; @@ -24,7 +24,10 @@ end; { $Log$ - Revision 1.2 2000-10-26 22:30:21 peter + Revision 1.3 2001-01-21 20:45:09 marco + * Rename fest II FCL version. + + Revision 1.2 2000/10/26 22:30:21 peter * freebsd update * classes.rst