From aa583a3c0b2b8ee9d19655567cba635c0e9a547b Mon Sep 17 00:00:00 2001 From: peter Date: Fri, 1 Sep 2000 22:02:10 +0000 Subject: [PATCH] * build also db --- fcl/db/Makefile.fpc | 13 +++---- fcl/db/tests/Makefile.fpc | 16 ++++++++ fcl/db/{ => tests}/createds.pp | 39 ++++++++++++++----- fcl/db/{ => tests}/mtest.pp | 57 +++++++++++++++++---------- fcl/db/{ => tests}/testds.pp | 59 ++++++++++++++++++---------- fcl/db/{ => tests}/tested.pp | 70 ++++++++++++++++++++++++---------- fcl/go32v2/Makefile.fpc | 14 ++----- fcl/linux/Makefile.fpc | 14 ++----- fcl/os2/Makefile.fpc | 16 ++------ fcl/shedit/Makefile.fpc | 21 ++++++++++ fcl/shedit/Makefile.inc | 6 --- fcl/win32/Makefile.fpc | 14 ++----- fcl/xml/Makefile.fpc | 18 +++++++++ fcl/xml/Makefile.inc | 5 --- 14 files changed, 229 insertions(+), 133 deletions(-) create mode 100644 fcl/db/tests/Makefile.fpc rename fcl/db/{ => tests}/createds.pp (70%) rename fcl/db/{ => tests}/mtest.pp (82%) rename fcl/db/{ => tests}/testds.pp (80%) rename fcl/db/{ => tests}/tested.pp (82%) create mode 100644 fcl/shedit/Makefile.fpc delete mode 100644 fcl/shedit/Makefile.inc create mode 100644 fcl/xml/Makefile.fpc delete mode 100644 fcl/xml/Makefile.inc diff --git a/fcl/db/Makefile.fpc b/fcl/db/Makefile.fpc index 45c136bb71..5c79944c1d 100644 --- a/fcl/db/Makefile.fpc +++ b/fcl/db/Makefile.fpc @@ -6,20 +6,17 @@ units=db ddg_ds ddg_rec mysqldb examples=testds createds mtest tested -[defaults] -defaultcpu=i386 - [require] options=-S2 packages=fcl mysql +[install] +unitsubdir=fcl +packagename=fcl + [dirs] fpcdir=../.. -targetdir=. - -[libs] -libgcc=1 - +targetdir=../$(OS_TARGET) [rules] db$(PPUEXT): db.pp fields.inc dataset.inc dbs.inc diff --git a/fcl/db/tests/Makefile.fpc b/fcl/db/tests/Makefile.fpc new file mode 100644 index 0000000000..e99e8c9ffd --- /dev/null +++ b/fcl/db/tests/Makefile.fpc @@ -0,0 +1,16 @@ +# +# Makefile.fpc for TDataSet Tests +# + +[targets] +programs=testds createds mtest tested + +[require] +options=-S2 +packages=fcl mysql + +[dirs] +fpcdir=../../.. + +[libs] +libgcc=1 diff --git a/fcl/db/createds.pp b/fcl/db/tests/createds.pp similarity index 70% rename from fcl/db/createds.pp rename to fcl/db/tests/createds.pp index 7cf9c8a889..148e2123a5 100644 --- a/fcl/db/createds.pp +++ b/fcl/db/tests/createds.pp @@ -1,11 +1,11 @@ { $Id$ This file is part of the Free Pascal run time library. - Copyright (c) 1999-2000 by Michael Van Canneyt, member of the + Copyright (c) 1999-2000 by Michael Van Canneyt, member of the Free Pascal development team Creates a flat datafile for use with testds. - + See the file COPYING.FPC, included in this distribution, for details about the copyright. @@ -29,7 +29,7 @@ Var F : TDDGDataFile; TableName : String; IndexName : String; ARec : TDDGData; - + begin If ParamCount<>1 then begin @@ -43,9 +43,9 @@ begin For I:=1 to 100 do begin S:=Format('This is person %d.',[i]); - With Arec Do + With Arec Do begin - Name:=S; + Name:=S; height:=I*0.001; LongField:=i*4; ShoeSize:=I; @@ -62,11 +62,30 @@ begin Rewrite(L); For I:=0 to 100-1 do Write(L,I); - Close(L); + Close(L); end. { $Log$ - Revision 1.2 2000-07-13 11:32:56 michael - + removed logs - -} + Revision 1.1 2000-09-01 22:02:10 peter + * build also db + + Revision 1.1 2000/07/13 06:31:27 michael + + Initial import + + Revision 1.6 2000/01/07 01:24:32 peter + * updated copyright to 2000 + + Revision 1.5 2000/01/06 01:20:32 peter + * moved out of packages/ back to topdir + + Revision 1.1 2000/01/03 19:33:05 peter + * moved to packages dir + + Revision 1.3 1999/11/11 17:31:09 michael + + Added Checks for all simple field types. + + Initial implementation of Insert/Append + + Revision 1.2 1999/10/24 17:07:54 michael + + Added copyright header + +} \ No newline at end of file diff --git a/fcl/db/mtest.pp b/fcl/db/tests/mtest.pp similarity index 82% rename from fcl/db/mtest.pp rename to fcl/db/tests/mtest.pp index b0329467fa..558f7fe4ee 100644 --- a/fcl/db/mtest.pp +++ b/fcl/db/tests/mtest.pp @@ -4,7 +4,7 @@ Copyright (c) 1999-2000 by the Free Pascal development team - + See the file COPYING.FPC, included in this distribution, for details about the copyright. @@ -27,12 +27,12 @@ Procedure DumpFieldDef(F : TfieldDef); begin With F do begin - Writeln ('Name : ',Name); + Writeln ('Name : ',Name); Writeln ('FieldNo : ',FieldNo); Writeln ('Size : ',Size); - Writeln ('FieldClass : ',FieldClass.ClassName); + Writeln ('FieldClass : ',FieldClass.ClassName); Writeln ('Required : ',required); - Writeln ('Precision : ',Precision); + Writeln ('Precision : ',Precision); Writeln ('DataType : ',FieldTypeNames[DataType]); Writeln ('InternalCalcField : ',Internalcalcfield); end; @@ -43,13 +43,13 @@ Procedure DumpField(F : Tfield); begin With F do begin - Writeln ('FieldName : ',FieldName); + Writeln ('FieldName : ',FieldName); Writeln ('FieldNo : ',FieldNo); Writeln ('Index : ',Index); Writeln ('DataSize : ',DataSize); Writeln ('Size : ',Size); Writeln ('DataType : ',FieldTypeNames[DataType]); - Writeln ('Class : ',ClassName); + Writeln ('Class : ',ClassName); Writeln ('Required : ',required); Writeln ('ReadOnly : ',ReadOnly); Writeln ('Visible : ',Visible); @@ -59,7 +59,7 @@ end; Procedure DumpFieldData (F : TField); begin - With F Do + With F Do begin Writeln ('Field : ',FieldName); Writeln ('Data type : ',FieldTypeNames[DataType]); @@ -67,17 +67,17 @@ begin Case Datatype of ftSmallint, ftInteger, ftWord : Writeln ('As longint : ',AsLongint); ftBoolean : Writeln ('As Boolean : ',AsBoolean); - ftFloat : Writeln ('As Float : ',AsFloat); + ftFloat : Writeln ('As Float : ',AsFloat); ftDate, ftTime, ftDateTime : Writeln ('As DateTime : ',DateTimeToStr(AsDateTime)); end; end; end; -Var +Var Data : TMysqldataset; I,Count : longint; Bookie : TBookMarkStr; - + Procedure ScrollForward; begin @@ -88,8 +88,8 @@ begin begin For I:=0 to FieldCount-1 do DumpFieldData(Fields[I]); - Next; - end; + Next; + end; end; Procedure ScrollBackWard; @@ -113,7 +113,7 @@ begin Halt(1); end; Log ('Creating Dataset'); - Data:=TMysqlDataset.Create(Nil); + Data:=TMysqlDataset.Create(Nil); With Data do begin Log('Setting database'); @@ -149,7 +149,7 @@ begin While NOT EOF do begin Inc(Count); - If Count=recordCount div 2 then + If Count=recordCount div 2 then begin Writeln ('Setting bookmark on record'); Bookie:=Bookmark; @@ -157,7 +157,7 @@ begin end; For I:=0 to FieldCount-1 do DumpFieldData(Fields[I]); - Next; + Next; end; Writeln ('Jumping to bookmark',Bookie); BookMark:=Bookie; @@ -177,12 +177,27 @@ begin Close; Log('End.'); Free; - end; + end; end. { - $Log$ - Revision 1.2 2000-07-13 11:32:56 michael - + removed logs - -} + $Log$ + Revision 1.1 2000-09-01 22:02:10 peter + * build also db + + Revision 1.1 2000/07/13 06:31:27 michael + + Initial import + + Revision 1.5 2000/01/07 01:24:32 peter + * updated copyright to 2000 + + Revision 1.4 2000/01/06 01:20:32 peter + * moved out of packages/ back to topdir + + Revision 1.1 2000/01/03 19:33:06 peter + * moved to packages dir + + Revision 1.2 1999/10/24 17:07:54 michael + + Added copyright header + +} \ No newline at end of file diff --git a/fcl/db/testds.pp b/fcl/db/tests/testds.pp similarity index 80% rename from fcl/db/testds.pp rename to fcl/db/tests/testds.pp index ea95c85ffa..6f157b9dba 100644 --- a/fcl/db/testds.pp +++ b/fcl/db/tests/testds.pp @@ -1,11 +1,11 @@ { $Id$ This file is part of the Free Pascal run time library. - Copyright (c) 1999-2000 by Michael Van Canneyt, member of the + Copyright (c) 1999-2000 by Michael Van Canneyt, member of the Free Pascal development team Tests the TDDGDataset component. - + See the file COPYING.FPC, included in this distribution, for details about the copyright. @@ -28,12 +28,12 @@ Procedure DumpFieldDef(F : TfieldDef); begin With F do begin - Writeln ('Name : ',Name); + Writeln ('Name : ',Name); Writeln ('FieldNo : ',FieldNo); Writeln ('Size : ',Size); - Writeln ('FieldClass : ',FieldClass.ClassName); + Writeln ('FieldClass : ',FieldClass.ClassName); Writeln ('Required : ',required); - Writeln ('Precision : ',Precision); + Writeln ('Precision : ',Precision); Writeln ('DataType : ',FieldTypeNames[DataType]); Writeln ('InternalCalcField : ',Internalcalcfield); end; @@ -45,13 +45,13 @@ begin With F do begin writeln ('-------------------------------------'); - Writeln ('FieldName : ',FieldName); + Writeln ('FieldName : ',FieldName); Writeln ('FieldNo : ',FieldNo); Writeln ('Index : ',Index); Writeln ('DataSize : ',DataSize); Writeln ('Size : ',Size); Writeln ('DataType : ',FieldTypeNames[DataType]); - Writeln ('Class : ',ClassName); + Writeln ('Class : ',ClassName); Writeln ('Required : ',required); Writeln ('ReadOnly : ',ReadOnly); Writeln ('Visible : ',Visible); @@ -61,7 +61,7 @@ end; Procedure DumpFieldData (F : TField); begin - With F Do + With F Do begin Writeln ('Field : ',FieldName); Writeln ('Data type : ',FieldTypeNames[DataType]); @@ -69,17 +69,17 @@ begin Case Datatype of ftSmallint, ftInteger, ftWord : Writeln ('As longint : ',AsLongint); ftBoolean : Writeln ('As Boolean : ',AsBoolean); - ftFloat : Writeln ('As Float : ',AsFloat); + ftFloat : Writeln ('As Float : ',AsFloat); ftDate, ftTime, ftDateTime : Writeln ('As DateTime : ',DateTimeToStr(AsDateTime)); end; end; end; -Var +Var Data : TDDGdataset; I,Count : longint; Bookie : TBookMarkStr; - + Procedure ScrollForward; begin @@ -91,8 +91,8 @@ begin Writeln ('================================================'); For I:=0 to FieldCount-1 do DumpFieldData(Fields[I]); - Next; - end; + Next; + end; end; Procedure ScrollBackWard; @@ -116,7 +116,7 @@ begin Halt(1); end; Log ('Creating Dataset'); - Data:=TDDGDataset.Create(Nil); + Data:=TDDGDataset.Create(Nil); With Data do begin Log('Setting Tablename'); @@ -146,7 +146,7 @@ begin While NOT EOF do begin Inc(Count); - If Count=50 then + If Count=50 then begin Writeln ('Setting bookmark on record'); Bookie:=Bookmark; @@ -154,7 +154,7 @@ begin end; For I:=0 to FieldCount-1 do DumpFieldData(Fields[I]); - Next; + Next; end; Writeln ('Jumping to bookmark',Bookie); BookMark:=Bookie; @@ -174,11 +174,30 @@ begin Close; Log('End.'); Free; - end; + end; end. { $Log$ - Revision 1.2 2000-07-13 11:32:56 michael - + removed logs - + Revision 1.1 2000-09-01 22:02:10 peter + * build also db + + Revision 1.1 2000/07/13 06:31:28 michael + + Initial import + + Revision 1.6 2000/01/07 01:24:32 peter + * updated copyright to 2000 + + Revision 1.5 2000/01/06 01:20:32 peter + * moved out of packages/ back to topdir + + Revision 1.1 2000/01/03 19:33:06 peter + * moved to packages dir + + Revision 1.3 1999/11/11 17:31:09 michael + + Added Checks for all simple field types. + + Initial implementation of Insert/Append + + Revision 1.2 1999/10/24 17:07:54 michael + + Added copyright header + } diff --git a/fcl/db/tested.pp b/fcl/db/tests/tested.pp similarity index 82% rename from fcl/db/tested.pp rename to fcl/db/tests/tested.pp index 5401c9562b..5e4986aa0a 100644 --- a/fcl/db/tested.pp +++ b/fcl/db/tests/tested.pp @@ -1,11 +1,11 @@ { $Id$ This file is part of the Free Pascal run time library. - Copyright (c) 1999-2000 by Michael Van Canneyt, member of the + Copyright (c) 1999-2000 by Michael Van Canneyt, member of the Free Pascal development team Tests the TDDGDataset component. - + See the file COPYING.FPC, included in this distribution, for details about the copyright. @@ -28,12 +28,12 @@ Procedure DumpFieldDef(F : TfieldDef); begin With F do begin - Writeln ('Name : ',Name); + Writeln ('Name : ',Name); Writeln ('FieldNo : ',FieldNo); Writeln ('Size : ',Size); - Writeln ('FieldClass : ',FieldClass.ClassName); + Writeln ('FieldClass : ',FieldClass.ClassName); Writeln ('Required : ',required); - Writeln ('Precision : ',Precision); + Writeln ('Precision : ',Precision); Writeln ('DataType : ',FieldTypeNames[DataType]); Writeln ('InternalCalcField : ',Internalcalcfield); end; @@ -45,13 +45,13 @@ begin With F do begin writeln ('-------------------------------------'); - Writeln ('FieldName : ',FieldName); + Writeln ('FieldName : ',FieldName); Writeln ('FieldNo : ',FieldNo); Writeln ('Index : ',Index); Writeln ('DataSize : ',DataSize); Writeln ('Size : ',Size); Writeln ('DataType : ',FieldTypeNames[DataType]); - Writeln ('Class : ',ClassName); + Writeln ('Class : ',ClassName); Writeln ('Required : ',required); Writeln ('ReadOnly : ',ReadOnly); Writeln ('Visible : ',Visible); @@ -61,7 +61,7 @@ end; Procedure DumpFieldData (F : TField); begin - With F Do + With F Do begin Writeln ('Field : ',FieldName); Writeln ('Data type : ',FieldTypeNames[DataType]); @@ -69,7 +69,7 @@ begin Case Datatype of ftSmallint, ftInteger, ftWord : Writeln ('As longint : ',AsLongint); ftBoolean : Writeln ('As Boolean : ',AsBoolean); - ftFloat : Writeln ('As Float : ',AsFloat); + ftFloat : Writeln ('As Float : ',AsFloat); ftDate, ftTime, ftDateTime : Writeln ('As DateTime : ',DateTimeToStr(AsDateTime)); end; end; @@ -80,7 +80,7 @@ procedure DumpFields (DS : TDataset); Var I : longint; begin - With DS do + With DS do begin Writeln('Dumping fields'); For I:=0 to FieldCount-1 do @@ -88,11 +88,11 @@ begin end; end; -Var +Var Data : TDDGdataset; I,Count : longint; Bookie : TBookMarkStr; - + Procedure ScrollForward; begin @@ -104,8 +104,8 @@ begin Writeln ('================================================'); For I:=0 to FieldCount-1 do DumpFieldData(Fields[I]); - Next; - end; + Next; + end; end; Procedure ScrollBackWard; @@ -129,7 +129,7 @@ begin Halt(1); end; Log ('Creating Dataset'); - Data:=TDDGDataset.Create(Nil); + Data:=TDDGDataset.Create(Nil); With Data do begin Log('Setting Tablename'); @@ -171,7 +171,7 @@ begin Writeln ('Doing Insert at position 8'); writeln ('--------------------------'); first; - for I:=1 to 7 do + for I:=1 to 7 do Next; Insert; FieldByName('Name').AsString:='Insertname'; @@ -202,7 +202,7 @@ begin Writeln ('Doing Edit at position 5'); writeln ('-------------------------'); first; - for I:=1 to 4 do + for I:=1 to 4 do Next; Edit; FieldByName('Name').AsString:='Editname'; @@ -230,13 +230,41 @@ begin Writeln ('----------'); Next; DumpFields(Data); - Writeln ('Closing.'); + Writeln ('Closing.'); Close; end; end. { $Log$ - Revision 1.2 2000-07-13 11:32:56 michael - + removed logs - + Revision 1.1 2000-09-01 22:02:10 peter + * build also db + + Revision 1.1 2000/07/13 06:31:28 michael + + Initial import + + Revision 1.6 2000/01/07 01:24:32 peter + * updated copyright to 2000 + + Revision 1.5 2000/01/06 01:20:32 peter + * moved out of packages/ back to topdir + + Revision 1.1 2000/01/03 19:33:06 peter + * moved to packages dir + + Revision 1.3 1999/12/01 22:11:02 michael + + tested edit and insert methods + + Revision 1.2 1999/12/01 10:11:58 michael + + test of insert works now + + Revision 1.1 1999/11/14 19:26:17 michael + + Initial implementation + + Revision 1.3 1999/11/11 17:31:09 michael + + Added Checks for all simple field types. + + Initial implementation of Insert/Append + + Revision 1.2 1999/10/24 17:07:54 michael + + Added copyright header + } diff --git a/fcl/go32v2/Makefile.fpc b/fcl/go32v2/Makefile.fpc index f05b4a0e30..f4d1ac86ee 100644 --- a/fcl/go32v2/Makefile.fpc +++ b/fcl/go32v2/Makefile.fpc @@ -3,7 +3,8 @@ # [targets] -units=classes $(INCUNITS) $(XMLUNITS) $(SHEDITUNITS) +dirs=../xml ../shedit +units=classes $(INCUNITS) rst=ssockets cachecls [defaults] @@ -24,20 +25,16 @@ libname=fpfcl fpcdir=../.. targetdir=. incdir=$(INC) -sourcesdir=$(INC) $(XML) $(SHEDIT) +sourcesdir=$(INC) [presettings] # Include files INC=../inc -XML=../xml -SHEDIT=../shedit -# INCUNITS,XMLUNITS is defined in makefile.inc +# INCUNITS is defined in makefile.inc # They are default units for all platforms. include $(INC)/Makefile.inc -include $(XML)/Makefile.inc -include $(SHEDIT)/Makefile.inc [rules] @@ -46,6 +43,3 @@ classes$(PPUEXT): $(addprefix $(INC)/,$(INCNAMES)) classes$(PASEXT) inifiles$(PPUEXT): classes$(PPUEXT) $(INC)/inifiles$(PASEXT) ezcgi$(PPUEXT): $(INC)/ezcgi$(PASEXT) - -shedit$(PPUEXT): $(SHEDIT)/shedit$(PASEXT) - $(COMPILER) $(SHEDIT)/shedit$(PASEXT) -I$(SHEDIT) $(REDIR) diff --git a/fcl/linux/Makefile.fpc b/fcl/linux/Makefile.fpc index f90d1ced54..ea1bf79789 100644 --- a/fcl/linux/Makefile.fpc +++ b/fcl/linux/Makefile.fpc @@ -3,7 +3,8 @@ # [targets] -units=classes $(INCUNITS) $(XMLUNITS) $(SHEDITUNITS) process asyncio ssockets http +dirs=../db ../xml ../shedit +units=classes $(INCUNITS) process asyncio ssockets http rst=ssockets cachecls [defaults] @@ -25,20 +26,16 @@ libversion=1.0 fpcdir=../.. targetdir=. incdir=$(INC) -sourcesdir=$(INC) $(XML) $(SHEDIT) +sourcesdir=$(INC) [presettings] # Include files INC=../inc -XML=../xml -SHEDIT=../shedit -# INCUNITS,XMLUNITS is defined in makefile.inc +# INCUNITS is defined in makefile.inc # They are default units for all platforms. include $(INC)/Makefile.inc -include $(XML)/Makefile.inc -include $(SHEDIT)/Makefile.inc [rules] @@ -48,7 +45,4 @@ inifiles$(PPUEXT): classes$(PPUEXT) $(INC)/inifiles$(PASEXT) ezcgi$(PPUEXT): $(INC)/ezcgi$(PASEXT) -shedit$(PPUEXT): $(SHEDIT)/shedit$(PASEXT) - $(COMPILER) $(SHEDIT)/shedit$(PASEXT) -I$(SHEDIT) $(REDIR) - process$(PPUEXT): process$(PASEXT) process.inc diff --git a/fcl/os2/Makefile.fpc b/fcl/os2/Makefile.fpc index e86b054490..34c53a0eda 100644 --- a/fcl/os2/Makefile.fpc +++ b/fcl/os2/Makefile.fpc @@ -3,7 +3,8 @@ # [targets] -units=classes $(INCUNITS) $(XMLUNITS) $(SHEDITUNITS) +dirs=../xml ../shedit +units=classes $(INCUNITS) [defaults] defaulttarget=os2 @@ -15,8 +16,6 @@ packages=paszlib [install] unitsubdir=fcl packagename=fcl -sourcesubdir=fcl -sourcetopdir=.. [libs] libname=fpfcl @@ -25,20 +24,16 @@ libname=fpfcl fpcdir=../.. targetdir=. incdir=$(INC) -sourcesdir=$(INC) $(XML) $(SHEDIT) +sourcesdir=$(INC) [presettings] # Include files INC=../inc -XML=../xml -SHEDIT=../shedit -# INCUNITS,XMLUNITS is defined in makefile.inc +# INCUNITS is defined in makefile.inc # They are default units for all platforms. include $(INC)/Makefile.inc -include $(XML)/Makefile.inc -include $(SHEDIT)/Makefile.inc [rules] @@ -47,6 +42,3 @@ classes$(PPUEXT): $(addprefix $(INC)/,$(INCNAMES)) classes$(PASEXT) inifiles$(PPUEXT): classes$(PPUEXT) $(INC)/inifiles$(PASEXT) ezcgi$(PPUEXT): $(INC)/ezcgi$(PASEXT) - -shedit$(PPUEXT): $(SHEDIT)/shedit$(PASEXT) - $(COMPILER) $(SHEDIT)/shedit$(PASEXT) -I$(SHEDIT) $(REDIR) diff --git a/fcl/shedit/Makefile.fpc b/fcl/shedit/Makefile.fpc new file mode 100644 index 0000000000..b2dad1a87f --- /dev/null +++ b/fcl/shedit/Makefile.fpc @@ -0,0 +1,21 @@ +# +# Makefile.fpc for XML for FCL +# + +[targets] +units=doc_text shedit sh_xml sh_pas + +[require] +options=-S2 +packages=fcl + +[install] +unitsubdir=fcl +packagename=fcl + +[dirs] +fpcdir=../.. +targetdir=../$(OS_TARGET) + +[rules] +vpath %$(PPUEXT) $(UNITTARGETDIR) diff --git a/fcl/shedit/Makefile.inc b/fcl/shedit/Makefile.inc deleted file mode 100644 index 8e482a2bd7..0000000000 --- a/fcl/shedit/Makefile.inc +++ /dev/null @@ -1,6 +0,0 @@ -# -# This makefile sets some needed variable, common to all targets -# - -SHEDITUNITS=doc_text shedit sh_xml sh_pas - diff --git a/fcl/win32/Makefile.fpc b/fcl/win32/Makefile.fpc index 0229000750..a6504aa6f3 100644 --- a/fcl/win32/Makefile.fpc +++ b/fcl/win32/Makefile.fpc @@ -3,7 +3,8 @@ # [targets] -units=classes $(INCUNITS) $(XMLUNITS) $(SHEDITUNITS) process fileinfo +dirs=../xml ../shedit +units=classes $(INCUNITS) process fileinfo rst=ssockets cachecls [defaults] @@ -24,20 +25,16 @@ libname=fpfcl fpcdir=../.. targetdir=. incdir=$(INC) -sourcesdir=$(INC) $(XML) $(SHEDIT) +sourcesdir=$(INC) [presettings] # Include files INC=../inc -XML=../xml -SHEDIT=../shedit -# INCUNITS,XMLUNITS is defined in makefile.inc +# INCUNITS is defined in makefile.inc # They are default units for all platforms. include $(INC)/Makefile.inc -include $(XML)/Makefile.inc -include $(SHEDIT)/Makefile.inc [rules] @@ -47,7 +44,4 @@ inifiles$(PPUEXT): classes$(PPUEXT) $(INC)/inifiles$(PASEXT) ezcgi$(PPUEXT): $(INC)/ezcgi$(PASEXT) -shedit$(PPUEXT): $(SHEDIT)/shedit$(PASEXT) - $(COMPILER) $(SHEDIT)/shedit$(PASEXT) -I$(SHEDIT) $(REDIR) - process$(PPUEXT): process$(PASEXT) process.inc diff --git a/fcl/xml/Makefile.fpc b/fcl/xml/Makefile.fpc new file mode 100644 index 0000000000..f6c33862e7 --- /dev/null +++ b/fcl/xml/Makefile.fpc @@ -0,0 +1,18 @@ +# +# Makefile.fpc for XML for FCL +# + +[targets] +units=dom htmldoc xmlcfg xmlread xmlstreaming xmlwrite + +[require] +options=-S2 +packages=fcl + +[install] +unitsubdir=fcl +packagename=fcl + +[dirs] +fpcdir=../.. +targetdir=../$(OS_TARGET) diff --git a/fcl/xml/Makefile.inc b/fcl/xml/Makefile.inc deleted file mode 100644 index 5ffa2eeb96..0000000000 --- a/fcl/xml/Makefile.inc +++ /dev/null @@ -1,5 +0,0 @@ -# -# This makefile sets some needed variable, common to all targets -# -XMLUNITS=dom xmlread xmlwrite xmlcfg xmlstreaming -