From a3703321f36c51da7fc94041bd8a5395dc0c4cd6 Mon Sep 17 00:00:00 2001 From: sekelsenmat Date: Tue, 15 May 2007 18:39:29 +0000 Subject: [PATCH] Improved Symbian RTL. Separated os include files from SDK include files and added more bindings git-svn-id: trunk@7349 - --- .gitattributes | 9 ++++-- rtl/symbian/Makefile | 4 ++- rtl/symbian/Makefile.fpc | 4 ++- rtl/symbian/buildrtl.pp | 2 +- rtl/symbian/{ => symbianinc}/e32def.inc | 2 +- rtl/symbian/{ => symbianinc}/e32err.inc | 2 +- rtl/symbian/symbianinc/e32std.inc | 8 +++++ rtl/symbian/uiq.pas | 34 +++++++++++++++++++++ rtl/symbian/uiqclasses.pas | 39 +++++++++++++++++++++++++ rtl/symbian/uiqinc/qikapplication.inc | 39 +++++++++++++++++++++++++ rtl/symbian/uiqinc/qikapplicationoo.inc | 39 +++++++++++++++++++++++++ 11 files changed, 175 insertions(+), 7 deletions(-) rename rtl/symbian/{ => symbianinc}/e32def.inc (95%) rename rtl/symbian/{ => symbianinc}/e32err.inc (95%) create mode 100644 rtl/symbian/symbianinc/e32std.inc create mode 100644 rtl/symbian/uiq.pas create mode 100644 rtl/symbian/uiqclasses.pas create mode 100644 rtl/symbian/uiqinc/qikapplication.inc create mode 100644 rtl/symbian/uiqinc/qikapplicationoo.inc diff --git a/.gitattributes b/.gitattributes index a1f23f25df..7355148709 100644 --- a/.gitattributes +++ b/.gitattributes @@ -5261,9 +5261,10 @@ rtl/symbian/Makefile svneol=native#text/plain rtl/symbian/Makefile.fpc svneol=native#text/plain rtl/symbian/bindings/pbeexe.cpp -text rtl/symbian/buildrtl.pp -text -rtl/symbian/e32def.inc -text -rtl/symbian/e32err.inc -text rtl/symbian/symbian.pas -text +rtl/symbian/symbianinc/e32def.inc -text +rtl/symbian/symbianinc/e32err.inc -text +rtl/symbian/symbianinc/e32std.inc -text rtl/symbian/sysdir.inc svneol=native#text/plain rtl/symbian/sysfile.inc svneol=native#text/plain rtl/symbian/sysheap.inc svneol=native#text/plain @@ -5271,6 +5272,10 @@ rtl/symbian/sysos.inc svneol=native#text/plain rtl/symbian/sysosh.inc svneol=native#text/plain rtl/symbian/system.pp svneol=native#text/plain rtl/symbian/systhrd.inc svneol=native#text/plain +rtl/symbian/uiq.pas -text +rtl/symbian/uiqclasses.pas -text +rtl/symbian/uiqinc/qikapplication.inc -text +rtl/symbian/uiqinc/qikapplicationoo.inc -text rtl/ucmaps/8859-1.txt svneol=native#text/plain rtl/ucmaps/8859-10.txt svneol=native#text/plain rtl/ucmaps/8859-13.txt svneol=native#text/plain diff --git a/rtl/symbian/Makefile b/rtl/symbian/Makefile index 90f4d19e2b..f67ce48c6f 100644 --- a/rtl/symbian/Makefile +++ b/rtl/symbian/Makefile @@ -237,6 +237,8 @@ RTL=.. INC=$(RTL)/inc COMMON=$(RTL)/common PROCINC=$(RTL)/$(CPU_TARGET) +SYMBIANINC=./symbianinc +UIQINC=./uiqinc UNITPREFIX=rtl OBJPASDIR=$(RTL)/objpas ifeq ($(FULL_TARGET),i386-symbian) @@ -1529,4 +1531,4 @@ objpas$(PPUEXT): $(OBJPASDIR)/objpas.pp $(INC)/except.inc system$(PPUEXT) macpas$(PPUEXT) : $(INC)/macpas.pp system$(PPUEXT) $(COMPILER) $(INC)/macpas.pp $(REDIR) buildrtl$(PPUEXT): buildrtl.pp system$(PPUEXT) objpas$(PPUEXT) macpas$(PPUEXT) - $(COMPILER) -Fi$(OBJPASDIR)/sysutils -Fi$(OBJPASDIR)/classes -Fu$(PROCINC) -I$(OBJPASDIR) -I$(INC) -Fu$(INC) -Fu$(OBJPASDIR) buildrtl + $(COMPILER) -Fi$(OBJPASDIR)/sysutils -Fi$(OBJPASDIR)/classes -Fu$(PROCINC) -I$(OBJPASDIR) -I$(INC) -I$(SYMBIANINC) -I$(UIQINC) -Fu$(INC) -Fu$(OBJPASDIR) buildrtl diff --git a/rtl/symbian/Makefile.fpc b/rtl/symbian/Makefile.fpc index af48425be5..6d5f5d5412 100644 --- a/rtl/symbian/Makefile.fpc +++ b/rtl/symbian/Makefile.fpc @@ -30,6 +30,8 @@ RTL=.. INC=$(RTL)/inc COMMON=$(RTL)/common PROCINC=$(RTL)/$(CPU_TARGET) +SYMBIANINC=./symbianinc +UIQINC=./uiqinc UNITPREFIX=rtl @@ -75,4 +77,4 @@ macpas$(PPUEXT) : $(INC)/macpas.pp system$(PPUEXT) $(COMPILER) $(INC)/macpas.pp $(REDIR) buildrtl$(PPUEXT): buildrtl.pp system$(PPUEXT) objpas$(PPUEXT) macpas$(PPUEXT) - $(COMPILER) -Fi$(OBJPASDIR)/sysutils -Fi$(OBJPASDIR)/classes -Fu$(PROCINC) -I$(OBJPASDIR) -I$(INC) -Fu$(INC) -Fu$(OBJPASDIR) buildrtl + $(COMPILER) -Fi$(OBJPASDIR)/sysutils -Fi$(OBJPASDIR)/classes -Fu$(PROCINC) -I$(OBJPASDIR) -I$(INC) -I$(SYMBIANINC) -I$(UIQINC) -Fu$(INC) -Fu$(OBJPASDIR) buildrtl diff --git a/rtl/symbian/buildrtl.pp b/rtl/symbian/buildrtl.pp index 8b10f7f783..3133846b96 100644 --- a/rtl/symbian/buildrtl.pp +++ b/rtl/symbian/buildrtl.pp @@ -4,7 +4,7 @@ unit buildrtl; uses ctypes, strings, - symbian; + symbian, uiq, uiqclasses; implementation diff --git a/rtl/symbian/e32def.inc b/rtl/symbian/symbianinc/e32def.inc similarity index 95% rename from rtl/symbian/e32def.inc rename to rtl/symbian/symbianinc/e32def.inc index b6e679e513..8e2673152f 100644 --- a/rtl/symbian/e32def.inc +++ b/rtl/symbian/symbianinc/e32def.inc @@ -1,4 +1,4 @@ -{%MainUnit symbian.pas} +{%MainUnit ../symbian.pas} { This file is part of the Free Pascal run time library. diff --git a/rtl/symbian/e32err.inc b/rtl/symbian/symbianinc/e32err.inc similarity index 95% rename from rtl/symbian/e32err.inc rename to rtl/symbian/symbianinc/e32err.inc index 5e8d55a2e4..2733f90d21 100644 --- a/rtl/symbian/e32err.inc +++ b/rtl/symbian/symbianinc/e32err.inc @@ -1,4 +1,4 @@ -{%MainUnit symbian.pas} +{%MainUnit ../symbian.pas} { This file is part of the Free Pascal run time library. diff --git a/rtl/symbian/symbianinc/e32std.inc b/rtl/symbian/symbianinc/e32std.inc new file mode 100644 index 0000000000..8f374b0af1 --- /dev/null +++ b/rtl/symbian/symbianinc/e32std.inc @@ -0,0 +1,8 @@ +{%MainUnit ../symbian.pas} + +{ e32std.h header file } + +{ User class } + +function User_InfoPrint(aString: PChar): TInt; cdecl; external; + diff --git a/rtl/symbian/uiq.pas b/rtl/symbian/uiq.pas new file mode 100644 index 0000000000..a6034dfda8 --- /dev/null +++ b/rtl/symbian/uiq.pas @@ -0,0 +1,34 @@ +{ + This file is part of the Free Pascal run time library. + Copyright (c) 2007 by contributors of the Free Pascal Compiler + + Symbian OS unit that adds common types, constants and functions + for the UIQ API + + 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. + + **********************************************************************} +unit uiq; + +{$mode objfpc}{$H+} + +interface + +uses ctypes; + +{$include e32def.inc} +{$include e32err.inc} +{.$include e32const.inc} +{.$include e32cmn.inc} +{$include e32std.inc} + + +implementation + +end. + diff --git a/rtl/symbian/uiqclasses.pas b/rtl/symbian/uiqclasses.pas new file mode 100644 index 0000000000..e52306229d --- /dev/null +++ b/rtl/symbian/uiqclasses.pas @@ -0,0 +1,39 @@ +{ + This file is part of the Free Pascal run time library. + Copyright (c) 2007 by contributors of the Free Pascal Compiler + + Symbian OS unit that adds common types, constants and functions + for the Symbian API + + 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. + + **********************************************************************} +unit uiqclasses; + +{$mode objfpc}{$H+} + +interface + +uses ctypes; + +{$include e32def.inc} +{$include e32err.inc} +{.$include e32const.inc} +{.$include e32cmn.inc} +{.$include e32std.inc} + +{ e32std.h header file } + +{ User class } + +function User_InfoPrint(aString: PChar): TInt; cdecl; external; + +implementation + +end. + diff --git a/rtl/symbian/uiqinc/qikapplication.inc b/rtl/symbian/uiqinc/qikapplication.inc new file mode 100644 index 0000000000..436437ea63 --- /dev/null +++ b/rtl/symbian/uiqinc/qikapplication.inc @@ -0,0 +1,39 @@ +{ + This file is part of the Free Pascal run time library. + Copyright (c) 2007 by contributors of the Free Pascal Compiler + + Symbian OS unit that adds common types, constants and functions + for the Symbian API + + 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. + + **********************************************************************} +unit symbian; + +{$mode objfpc}{$H+} + +interface + +uses ctypes; + +{$include e32def.inc} +{$include e32err.inc} +{.$include e32const.inc} +{.$include e32cmn.inc} +{.$include e32std.inc} + +{ e32std.h header file } + +{ User class } + +function User_InfoPrint(aString: PChar): TInt; cdecl; external; + +implementation + +end. + diff --git a/rtl/symbian/uiqinc/qikapplicationoo.inc b/rtl/symbian/uiqinc/qikapplicationoo.inc new file mode 100644 index 0000000000..436437ea63 --- /dev/null +++ b/rtl/symbian/uiqinc/qikapplicationoo.inc @@ -0,0 +1,39 @@ +{ + This file is part of the Free Pascal run time library. + Copyright (c) 2007 by contributors of the Free Pascal Compiler + + Symbian OS unit that adds common types, constants and functions + for the Symbian API + + 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. + + **********************************************************************} +unit symbian; + +{$mode objfpc}{$H+} + +interface + +uses ctypes; + +{$include e32def.inc} +{$include e32err.inc} +{.$include e32const.inc} +{.$include e32cmn.inc} +{.$include e32std.inc} + +{ e32std.h header file } + +{ User class } + +function User_InfoPrint(aString: PChar): TInt; cdecl; external; + +implementation + +end. +