Menu
▾
▴
rtk-cvs — Mailing list for CVS commit messages.
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
(48) |
Mar
(80) |
Apr
(9) |
May
(2) |
Jun
(91) |
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
|---|
|
From: <de...@us...> - 2004-03-14 14:04:35
|
Update of /cvsroot/rtk/rtk/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4445/test Modified Files: test.h Log Message: Added RTK_TEST_FILE macro definition. Index: test.h =================================================================== RCS file: /cvsroot/rtk/rtk/test/test.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** test.h 7 Mar 2004 20:53:00 -0000 1.8 --- test.h 14 Mar 2004 13:55:40 -0000 1.9 *************** *** 29,31 **** --- 29,37 ---- } + #if defined(_RTK_WIN32_) + # define TEST_FILE = "..\test.dat" + #else + # define TEST_FILE = "../test.dat" + #endif + #endif |
|
From: <de...@us...> - 2004-03-14 12:12:50
|
Update of /cvsroot/rtk/rtk/rtk In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9486/rtk Modified Files: Buffer.h Log Message: Added SetSize, GetSize, constructor and destructor. Index: Buffer.h =================================================================== RCS file: /cvsroot/rtk/rtk/rtk/Buffer.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Buffer.h 3 Mar 2004 15:34:50 -0000 1.1 --- Buffer.h 14 Mar 2004 12:03:54 -0000 1.2 *************** *** 40,50 **** ***************************************************************************/ #ifndef _RTK_BUFFER_H_ #define _RTK_BUFFER_H_ 1 namespace Rtk { ! /** ! * T0D0: Comment for Buffer class * T0D0: Description for Buffer class */ --- 40,57 ---- ***************************************************************************/ + /** + * @file Buffer.h + * Buffer implementation. + */ #ifndef _RTK_BUFFER_H_ #define _RTK_BUFFER_H_ 1 + #include <rtk/Export.h> + #include <rtk/Array.h> + #include <rtk/rtkdef.h> + namespace Rtk { ! /** Buffer implementation. * T0D0: Description for Buffer class */ *************** *** 52,58 **** { public: ! protected: ! private: }; // Buffer --- 59,100 ---- { public: ! ! // CONSTRUCTORS ! ! /** ! * Default constructor. ! * @param element_size uint Size of buffer's element (in bytes). ! * @param size uint Initial size of buffer. ! */ ! Buffer(uint element_size=sizeof(uchar), uint size=128); ! ! // DESTRUCTORS ! ! /** ! * Default destructor. ! */ ! ~Buffer(); ! ! // SET METHODS ! ! /** ! * Sets new size of buffer to 'size'. ! * @param size uint New size of buffer. ! */ ! void SetSize(uint size) { _buffer->SetCount(size); } ! ! // GET METHODS ! ! /** ! * Returns storage size of buffer. In short - the maximum number ! * of elements that could be stored in buffer without new ! * allocation(s). ! * @return uint Number of elements buffer can hold without new allocation(s). ! */ ! uint GetSize() const { return _buffer->GetCount(); } ! protected: ! uint _size; /// Buffer size ! Array* _buffer; /// Buffer data private: }; // Buffer |
|
From: <de...@us...> - 2004-03-14 12:10:26
|
Update of /cvsroot/rtk/rtk/test/core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8941/test/core Added Files: buffer0.cpp Log Message: Very, very simple test for new Buffer class. --- NEW FILE: buffer0.cpp --- /** * * RTK * Fast and easy cross-platform GUI ToolKit. * * Copyright (C) 2001-200x RTK Development Team * * This library is free software; you can redistribute it and/or modify it * under the terms of the slightly modified (see the "EXCEPTION NOTICE" part * of RTK Library License) GNU Lesser General Public License as published * by the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * * This library 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. See the GNU Lesser General Public * License for more details. * * You should have received a copy of the GNU Lesser General Public License * and along with this library; if not, write to the * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA . * * Also you should have received a copy of RTK Library License, if not please * write an e-mail to some of RTK authors (listed in file AUTHORS). * * Bug reports: bu...@rt... * Suggestions: rf...@rt... ***************************************************************************/ /** * $Source: /cvsroot/rtk/rtk/test/core/buffer0.cpp,v $ ***** * Authors (chronological order): * Dejan Lekic, de...@nu... * Contributors (chronological order): * $fname $lname, $email ***** * Important note: This file, test_core.cpp shouldn't be EVER overwritten * in our CVS. It is actually template for test_* projects in our IDEs. * RTK developers should work on this file in their working environments, and * when they are satisfied with developed file they should save it with * PROPER name to /test/* directory. ***************************************************************************/ #include "../test.h" #include <rtk/Buffer.h> using namespace Rtk; int main(int argc, char** argv) { Buffer buf; printf("Initial size: %d", buf.GetSize()); buf.SetSize(256); printf("After resizing: %d", buf.GetSize()); getchar(); } // main() /** * $Id: buffer0.cpp,v 1.1 2004/03/14 12:01:30 dejan Exp $ ***************************************************************************/ |
|
From: <de...@us...> - 2004-03-14 11:42:02
|
Update of /cvsroot/rtk/rtk/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4231/doc Removed Files: template.cpp template.h Log Message: Removed doc/template.cpp and doc/template.h files. --- template.cpp DELETED --- --- template.h DELETED --- |
|
From: <de...@us...> - 2004-03-14 11:41:00
|
Update of /cvsroot/rtk/rtk/src/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4086/src/templates Added Files: template.cpp template.h test_core.cpp Log Message: Moved doc/template.cpp , doc/template.h and doc/test_core.cpp to src/templates directory. We'll use this directory for storing RTK source templates. --- NEW FILE: template.cpp --- /** * * RTK * Fast and easy cross-platform GUI ToolKit. * * Copyright (C) 2001-200x RTK Development Team * * This library is free software; you can redistribute it and/or modify it * under the terms of the slightly modified (see the "EXCEPTION NOTICE" part * of RTK Library License) GNU Lesser General Public License as published * by the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * * This library 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. See the GNU Lesser General Public * License for more details. * * You should have received a copy of the GNU Lesser General Public License * and along with this library; if not, write to the * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA . * * Also you should have received a copy of RTK Library License, if not please * write an e-mail to some of RTK authors (listed in file AUTHORS). * * Bug reports: bu...@rt... * Suggestions: rf...@rt... ***************************************************************************/ /** * $Source: /cvsroot/rtk/rtk/src/templates/template.cpp,v $ ***** * Authors (chronological order): * $fname $lname, $email * Contributors (chronological order): * $fname $lname, $email ***** * T0D0 List: * - ***************************************************************************/ #include "template.h" namespace Rtk { // C/C++ code here }; // Rtk /** * $Id: template.cpp,v 1.1 2004/03/14 11:32:04 dejan Exp $ ***************************************************************************/ --- NEW FILE: template.h --- /** * * RTK * Fast and easy cross-platform GUI ToolKit. * * Copyright (C) 2001-200x RTK Development Team * * This library is free software; you can redistribute it and/or modify it * under the terms of the slightly modified (see the "EXCEPTION NOTICE" part * of RTK Library License) GNU Lesser General Public License as published * by the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * * This library 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. See the GNU Lesser General Public * License for more details. * * You should have received a copy of the GNU Lesser General Public License * and along with this library; if not, write to the * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA . * * Also you should have received a copy of RTK Library License, if not please * write an e-mail to some of RTK authors (listed in file AUTHORS). * * Bug reports: bu...@rt... * Suggestions: rf...@rt... ***************************************************************************/ /** * $Source: /cvsroot/rtk/rtk/src/templates/template.h,v $ ***** * Authors (chronological order): * $fname $lname, $email * Contributors (chronological order): * $fname $lname, $email ***** * T0D0 List: * - ***************************************************************************/ #ifndef _RTK_FILENAME_H_ #define _RTK_FILENAME_H_ 1 namespace Rtk { /** * Comment for RTKClass * (important for automatic documentation (Doxygen) building) */ class RTK_API RTKClass { public: protected: private: }; // RTKClass }; // Rtk namespace #endif /** * $Id: template.h,v 1.1 2004/03/14 11:32:05 dejan Exp $ ***************************************************************************/ --- NEW FILE: test_core.cpp --- /** * * RTK * Fast and easy cross-platform GUI ToolKit. * * Copyright (C) 2001-200x RTK Development Team * * This library is free software; you can redistribute it and/or modify it * under the terms of the slightly modified (see the "EXCEPTION NOTICE" part * of RTK Library License) GNU Lesser General Public License as published * by the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * * This library 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. See the GNU Lesser General Public * License for more details. * * You should have received a copy of the GNU Lesser General Public License * and along with this library; if not, write to the * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA . * * Also you should have received a copy of RTK Library License, if not please * write an e-mail to some of RTK authors (listed in file AUTHORS). * * Bug reports: bu...@rt... * Suggestions: rf...@rt... ***************************************************************************/ /** * $Source: /cvsroot/rtk/rtk/src/templates/test_core.cpp,v $ ***** * Authors (chronological order): * $fname $lname, $email * Contributors (chronological order): * $fname $lname, $email ***** * Important note: This file, test_core.cpp shouldn't be EVER overwritten * in our CVS. It is actually template for test_* projects in our IDEs. * RTK developers should work on this file in their working environments, and * when they are satisfied with developed file they should save it with * PROPER name to /test/* directory. ***************************************************************************/ #include "../test.h" /** * $Id: test_core.cpp,v 1.1 2004/03/14 11:32:05 dejan Exp $ ***************************************************************************/ |
|
From: <de...@us...> - 2004-03-14 11:38:52
|
Update of /cvsroot/rtk/rtk/src/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3708/templates Log Message: Directory /cvsroot/rtk/rtk/src/templates added to the repository |
|
From: <le...@us...> - 2004-03-13 19:49:00
|
Update of /cvsroot/rtk/rtk/src/core/platform/linux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22805/src/core/platform/linux Modified Files: Thread.cpp Log Message: Added implementation (GNU/Linux) for SetPriority, GetPriority and GetID methods. Index: Thread.cpp =================================================================== RCS file: /cvsroot/rtk/rtk/src/core/platform/linux/Thread.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Thread.cpp 9 Mar 2004 15:13:48 -0000 1.3 --- Thread.cpp 13 Mar 2004 19:40:08 -0000 1.4 *************** *** 88,97 **** int Thread::GetPriority() const { ! return -1; } int Thread::SetPriority(int priority) { ! return -1; } --- 88,116 ---- int Thread::GetPriority() const { ! pthread_t my_tid = pthread_self(); ! int policy; ! struct sched_param sp; ! (void) pthread_getschedparam(my_tid, &policy, &sp); ! return sp.sched_priority; } int Thread::SetPriority(int priority) { ! /* ! Linux allows the static priority value range 1 to 99 for SCHED_FIFO and ! SCHED_RR and the priority 0 for SCHED_OTHER. Since we are using default ! scheduling policy ! */ ! pthread_t my_tid = pthread_self(); ! int policy; ! struct sched_param sp; ! (void) pthread_getschedparam(my_tid, &policy, &sp); ! sp.sched_priority = priority; ! (void) pthread_setschedparam(my_tid, policy, &sp); ! } ! ! unsigned long GetId() ! { ! return pthread_self(); } |
|
From: <le...@us...> - 2004-03-13 19:46:34
|
Update of /cvsroot/rtk/rtk/rtk In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22207/rtk Modified Files: Thread.h Log Message: Added comment for GetID() Index: Thread.h =================================================================== RCS file: /cvsroot/rtk/rtk/rtk/Thread.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Thread.h 5 Mar 2004 21:15:39 -0000 1.6 --- Thread.h 13 Mar 2004 19:37:44 -0000 1.7 *************** *** 32,37 **** ***** * Authors (chronological order): ! * Mikko Lahteenmaki, mikko§rtk.cx ! * Dejan Lekic, dejan§rtk.cx * Contributors (chronological order): * $fname $lname, $email --- 32,37 ---- ***** * Authors (chronological order): ! * Mikko Lahteenmaki, mikkortk.cx ! * Dejan Lekic, dejanrtk.cx * Contributors (chronological order): * $fname $lname, $email *************** *** 61,66 **** typedef int (*ThreadFunction)(void * arg); ! /** ! * Thread implementation. */ class RTK_API Thread --- 61,66 ---- typedef int (*ThreadFunction)(void * arg); ! /** Thread class ! * Very simple, native (when possible) thread implementation. */ class RTK_API Thread *************** *** 93,96 **** --- 93,100 ---- int SetPriority(int priority); + /** Get ID of a thread. + * @return unsigned long Thread's ID + * @see Thread::GetHandle() Thread::Create() + */ unsigned long GetId(); ThreadHandle GetHandle() const { return _thread_handle; } |
|
From: <le...@us...> - 2004-03-10 16:45:04
|
Update of /cvsroot/rtk/rtk/src/core/platform/epoc32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30664 Modified Files: lfind.cpp lfind.h Log Message: Added RTK-style source-headers. Index: lfind.cpp =================================================================== RCS file: /cvsroot/rtk/rtk/src/core/platform/epoc32/lfind.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** lfind.cpp 10 Mar 2004 12:27:16 -0000 1.1 --- lfind.cpp 10 Mar 2004 16:19:01 -0000 1.2 *************** *** 1,6 **** #include <rtk/Export.h> #include <stdlib.h> ! /* This is a very ugly implementation of lfind. I had to make this because symbian lacks lfind. --- 1,47 ---- + /** + * + * RTK + * Fast and easy cross-platform GUI ToolKit. + * + * Copyright (C) 2001-200x RTK Development Team + * + * This library is free software; you can redistribute it and/or modify it + * under the terms of the slightly modified (see the "EXCEPTION NOTICE" part + * of RTK Library License) GNU Lesser General Public License as published + * by the Free Software Foundation; either version 2.1 of the License, or + * (at your option) any later version. + * + * This library 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. See the GNU Lesser General Public + * License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * and along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA . + * + * Also you should have received a copy of RTK Library License, if not please + * write an e-mail to some of RTK authors (listed in file AUTHORS). + * + * Bug reports: bu...@rt... + * Suggestions: rf...@rt... + ***************************************************************************/ + + /** + * $Source$ + ***** + * Authors (chronological order): + * Pal Szasz, sp...@at... (space§rtk.cx) + * Contributors (chronological order): + * Dejan Lekic, de...@nu... (dejan§rtk.cx) + ***** + * T0D0 List: + * - + ***************************************************************************/ + #include <rtk/Export.h> #include <stdlib.h> ! /** This is a very ugly implementation of lfind. I had to make this because symbian lacks lfind. *************** *** 17,18 **** --- 58,63 ---- return NULL; } + + /** + * $Id$ + ***************************************************************************/ Index: lfind.h =================================================================== RCS file: /cvsroot/rtk/rtk/src/core/platform/epoc32/lfind.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** lfind.h 10 Mar 2004 12:27:16 -0000 1.1 --- lfind.h 10 Mar 2004 16:19:01 -0000 1.2 *************** *** 1,2 **** --- 1,60 ---- + /** + * + * RTK + * Fast and easy cross-platform GUI ToolKit. + * + * Copyright (C) 2001-200x RTK Development Team + * + * This library is free software; you can redistribute it and/or modify it + * under the terms of the slightly modified (see the "EXCEPTION NOTICE" part + * of RTK Library License) GNU Lesser General Public License as published + * by the Free Software Foundation; either version 2.1 of the License, or + * (at your option) any later version. + * + * This library 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. See the GNU Lesser General Public + * License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * and along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA . + * + * Also you should have received a copy of RTK Library License, if not please + * write an e-mail to some of RTK authors (listed in file AUTHORS). + * + * Bug reports: bu...@rt... + * Suggestions: rf...@rt... + ***************************************************************************/ + + /** + * $Source$ + ***** + * Authors (chronological order): + * Pal Szasz, sp...@at... (space§rtk.cx) + * Contributors (chronological order): + * Dejan Lekic, de...@nu... (dejan§rtk.cx) + ***** + * T0D0 List: + * Dejan: Maybe we should add functions in Rtk namespace here? :) + ***************************************************************************/ + + /** + * @file lfind.h + * + * Declaration of lfind, needed for Epoc32. + * + */ + + #ifndef _RTK_EPOC32_LFIND_H_ + #define _RTK_EPOC32_LFIND_H_ 1 + void *lfind(const void *key, const void *base, size_t *nmemb, size_t size, int(*compar)(const void *, const void *)); + + #endif + + /** + * $Id$ + ***************************************************************************/ + |
|
From: <le...@us...> - 2004-03-10 13:08:42
|
Update of /cvsroot/rtk/rtk/src/core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18156/src/core Modified Files: CMakeLists.txt Log Message: Now Thread and Mutex are properly archived into librtk.a static library. Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/rtk/rtk/src/core/CMakeLists.txt,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** CMakeLists.txt 5 Mar 2004 18:29:29 -0000 1.11 --- CMakeLists.txt 10 Mar 2004 12:42:47 -0000 1.12 *************** *** 37,41 **** INCLUDE(${CMAKE_ROOT}/Modules/FindThreads.cmake) ! SUBDIRS(platform) SET(RTK_CORE_SFILES --- 37,43 ---- INCLUDE(${CMAKE_ROOT}/Modules/FindThreads.cmake) ! #T0D0: For now we will leave this commented until we learn how to ! # add objects from platform/* to $RTK_LIBRTK library. ! #SUBDIRS(platform) SET(RTK_CORE_SFILES *************** *** 45,53 **** ) ! # T0D0: I had problems in MinGW so i decided to exclude Variant.cpp there. ! # Sure, this should be fixed. ! #IF(NOT CMAKE_COMPILER_IS_MINGW) ! # SET(RTK_CORE_SFILES ${RTK_CORE_SFILES} Variant.cpp) ! #ENDIF(NOT CMAKE_COMPILER_IS_MINGW) # This is good for VisualStudio ... --- 47,66 ---- ) ! ##------------------------------------------------------------------- ! # Platform-specific sources ! # GNU/Linux ! SET(RTK_CORE_LINUX_SFILES ! platform/linux/Thread.cpp platform/linux/Mutex.cpp ! ) ! # Windows ! SET(RTK_CORE_WIN32_SFILES ! platform/win32/Thread.cpp platform/win32/Mutex.cpp ! ) ! ! IF (WIN32) ! SET(RTK_CORE_SFILES ${RTK_CORE_SFILES} ${RTK_CORE_WIN32_SFILES}) ! ELSE (WIN32) ! SET(RTK_CORE_SFILES ${RTK_CORE_SFILES} ${RTK_CORE_LINUX_SFILES}) ! ENDIF (WIN32) # This is good for VisualStudio ... *************** *** 55,59 **** ADD_LIBRARY(${RTK_LIBRTK} STATIC ${RTK_CORE_SFILES}) ! ## FLAGS # How each, separate file in CORE RTK library should be compiles. --- 68,72 ---- ADD_LIBRARY(${RTK_LIBRTK} STATIC ${RTK_CORE_SFILES}) ! MESSAGE("Files: ${RTK_CORE_SFILES}\n") ## FLAGS # How each, separate file in CORE RTK library should be compiles. |
|
From: <le...@us...> - 2004-03-10 13:08:41
|
Update of /cvsroot/rtk/rtk In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18156 Modified Files: CMakeLists.txt Log Message: Now Thread and Mutex are properly archived into librtk.a static library. Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/rtk/rtk/CMakeLists.txt,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** CMakeLists.txt 9 Mar 2004 20:41:37 -0000 1.12 --- CMakeLists.txt 10 Mar 2004 12:42:46 -0000 1.13 *************** *** 40,47 **** # Variables # ! SET(LIBRARY_OUTPUT_PATH ${RTK_SOURCE_DIR}/lib) ## # Various build options #################################################################### --- 40,49 ---- # Variables # ! SET(LIBRARY_OUTPUT_PATH "${RTK_SOURCE_DIR}/lib") ## # Various build options + # Note: These options are set through CMAKE UI! Simply run: + # make edit_cache #################################################################### |
Update of /cvsroot/rtk/rtk/ide/symbian In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15614 Added Files: E32Dll.cpp E32Main.cpp Makefile.librtk Makefile.string0 README makeinc-common makeinc-epoc makeinc-test_core Log Message: Files needed for symbian build --- NEW FILE: E32Dll.cpp --- #include <e32base.h> GLDEF_C TInt E32Dll(TDllReason) { return(KErrNone); } --- NEW FILE: E32Main.cpp --- #include <e32base.h> int main(int argc, char * argv[]); EXPORT_C TInt E32Main(); GLDEF_C TInt E32Main() { char*argv[] = { "me" }; CTrapCleanup* cleanup = CTrapCleanup::New(); TRAPD(error, main(1, argv)); delete cleanup; return 0; } --- NEW FILE: Makefile.librtk --- include makeinc-epoc NAME = $(NAMERTK) TYPE=a OBJECTS= \ ../../src/core/SList.o \ ../../src/core/Dict.o \ ../../src/core/rchar.o \ ../../src/core/Vector.o \ ../../src/core/Variant.o \ ../../src/core/String.o \ ../../src/core/Array.o \ ../../src/core/platform/epoc32/lfind.o \ ../../src/core/debug.o \ ../../src/core/error.o \ UID1 = 10000079 UID2 = 100039ce UID3 = 10123456 CFLAGS += -I../../src/core include makeinc-common --- NEW FILE: Makefile.string0 --- TEST_NAME=string0 include makeinc-test_core --- NEW FILE: README --- Hi! First of all you need to set up a symbian sdk on linux. For this you need to install the windows sdk. Obtain the binaries makesis, bmconv, petran and rcomp from gnupoc site: http://gnupoc.sf.net From the same site download also the gcc cross compiler. The rest I used from another linux port of the sdk, the link is here: http://www.ki-ag.de/pages/tech/SymbianSDK/symbian_sdk_6.1_on_linux.html Of course some changes were needed, mostly because now we have nativ linux versions of the needed binaries (like petran) Anyway, I do not remember all the steps I did, but here are some notes: - prepare a directory fot epoc root (mine is /opt/space/s60) - start installing the sdk2unix package as it is described in the howto in the epoc root dir - install the gcc in that directory (of course not with full path, so the directory bin will be <epocroot>/bin, etc.) - copy the binaries of petran, etc to <epocroot>/bin I hope that's it. I try to do some better docs Pali --- NEW FILE: makeinc-common --- ############################################################################### # These have to be defined (I will also give some examples) # EPOC=/opt/space/s60 # NAME=hello # TYPE=exe # UID2=00000000 # UID3=00000000 # OBJECTS=hello.o # LIBS=estlib.lib ############################################################################### # App independent part # ARCH = arm-epoc-pe CC = $(ARCH)-gcc LD = $(ARCH)-ld CXX = $(ARCH)-g++ AR = $(ARCH)-ar DT = $(ARCH)-dlltool PT = petran EPOCTRGREL=$(EPOC)/Release/armi/urel CFLAGS += -fomit-frame-pointer -O -march=armv4t -mthumb-interwork -pipe \ -nostdinc -Wall -Wno-ctor-dtor-privacy -Wno-unknown-pragmas \ -DNDEBUG -D_UNICODE -D__SYMBIAN32__ -D__GCC32__ -D__EPOC32__ \ -D__MARM__ -D__MARM_ARMI__ -Dmain=MAIN \ -I$(EPOC)/include -I$(EPOC)/include/libc LIBS += $(EPOCTRGREL)/euser.lib TARGET=$(NAME).$(TYPE) ifeq ($(TYPE), app) UID1 = 10000079 LDFLAGS += -s -e _E32DLL -u _E32Dll --dll EX = $(EPOCTRGREL)/edll.lib CFLAGS += -D__DLL__ EXPCMD = OBJECTS += E32Dll.o endif ifeq ($(TYPE), dll) UID1 = 10000079 LDFLAGS += -s -e _E32DLL -u _E32Dll --dll EX = $(EPOCTRGREL)/edll.lib CFLAGS += -D__DLL__ EXPCMD = OBJECTS += E32Dll.o TOCLEAN = $(NAME).lib $(NAME).def3 endif ifeq ($(TYPE), exe) UID1 = 1000007a LDFLAGS += -s -e _E32Startup -u _E32Startup EX = $(EPOCTRGREL)/eexe.lib EXPCMD = OBJECTS += E32Main.o endif .SUFFIXES: .cpp .c .o all : $(TARGET) -include $(TARGET).deps SRC = $(OBJECTS:.o=.cpp) $(TARGET).deps : $(SRC) $(CC) -M $(CFLAGS) $(SRC) > $@ .cpp.o : @echo Compiling $< ... $(CC) $(CFLAGS) -c -o $@ $< $(NAME).def2 : $(OBJECTS) $(DT) -m arm_interwork --output-def $(NAME).def1 $(OBJECTS) perl -p -e 's,\n,\r\n,;s,; \(null\),NONAME,' $(NAME).def1 > $(NAME).def2 ############################################################################## # EXE part ifeq ($(TYPE), exe) $(NAME).bas $(NAME).ex1 : $(NAME).def2 $(LD) $(LDFLAGS) --base-file $(NAME).bas -o $(NAME).ex1 $(EX) $(OBJECTS) $(LIBS) $(NAME).exp : $(NAME).bas $(DT) -m arm_interwork \ --def $(NAME).def2 \ --dllname "$(NAME)[$(UID3)].$(TYPE)" \ --base-file $(NAME).bas \ --output-exp $(NAME).exp endif ############################################################################## # DLL part ifeq ($(TYPE), dll) $(NAME).bas : $(NAME).def2 $(DT) -m arm_interwork \ --def $(NAME).def2 \ --output-exp $(NAME).exp \ --dllname "$(NAME)[$(UID3)].$(TYPE)" $(LD) $(LDFLAGS) $(NAME).exp --base-file $(NAME).bas -o $(NAME).ex1 \ $(EX) $(OBJECTS) $(LIBS) $(NAME).exp : $(NAME).bas $(DT) -m arm_interwork \ --def $(NAME).def2 \ --output-exp $(NAME).exp \ --dllname "$(NAME)[$(UID3)].$(TYPE)" \ --base-file $(NAME).bas endif ############################################################################## # Static Lib part ifeq ($(TYPE), a) $(NAME).a : $(OBJECTS) $(AR) cr $@ $(OBJECTS) endif $(NAME).ex2 : $(NAME).exp $(LD) $(LDFLAGS) $< -o $@ $(EX) $(OBJECTS) $(LIBS) $(NAME).dll : $(NAME).lib $(NAME).dll $(NAME).exe $(NAME).app : $(NAME).ex2 $(PT) $< $@ -nocall -uid1 0x$(UID1) -uid2 0x$(UID2) -uid3 0x$(UID3) rm -f $(NAME).ex2 $(NAME).ex1 $(NAME).def1 $(NAME).def2 $(NAME).bas $(NAME).exp $(NAME).lib : $(NAME).def2 $(DT) -m arm_interwork \ --output-lib $(NAME).lib \ --def $(NAME).def2 \ --dllname "$(NAME)[$(UID3)].$(TYPE)" clean : rm -f $(OBJECTS) $(TARGET).deps $(TARGET) $(TARGET).map $(TOCLEAN) for i in def1 def2 ex1 ex2 bas exp; do rm -f $(NAME).$$i; done --- NEW FILE: makeinc-epoc --- EPOC=/opt/space/s60 PATH=$(EPOC)/bin:$(EPOC)/arm-epoc-pe/bin:/bin:/usr/bin:/usr/local/bin CFLAGS += -I../.. UNICODE=0 ifeq ($(UNICODE), 1) NAMERTK=librtk_u CFLAGS += -DUNICODE -D_UNICODE else NAMERTK=librtk endif --- NEW FILE: makeinc-test_core --- include makeinc-epoc NAME=test_core_$(TEST_NAME) TYPE=exe UID2=100039ce UID3=101faaff OBJECTS=../../test/core/$(TEST_NAME).o LIBS=$(NAMERTK).a $(EPOCTRGREL)/estlib.lib include makeinc-common $(OBJECTS) : $(NAMERTK).a $(NAMERTK).a : make -f Makefile.librtk |
|
From: <sp...@us...> - 2004-03-10 12:53:26
|
Update of /cvsroot/rtk/rtk/ide/symbian In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15466/symbian Log Message: Directory /cvsroot/rtk/rtk/ide/symbian added to the repository |
|
From: <sp...@us...> - 2004-03-10 12:53:08
|
Update of /cvsroot/rtk/rtk/src/core/platform/epoc32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15429 Added Files: lfind.cpp lfind.h Log Message: lfind is missing in Symbian --- NEW FILE: lfind.cpp --- #include <rtk/Export.h> #include <stdlib.h> /* This is a very ugly implementation of lfind. I had to make this because symbian lacks lfind. */ void *lfind(const void *key, const void *base, size_t *nmemb, size_t size, int(*compar)(const void *, const void *)) { const unsigned char * ptr = (const unsigned char *)base; for(unsigned int i = 0; i < *nmemb; i++){ if (compar(ptr, key)) return (void*)ptr; ptr += size; } return NULL; } --- NEW FILE: lfind.h --- void *lfind(const void *key, const void *base, size_t *nmemb, size_t size, int(*compar)(const void *, const void *)); |
|
From: <sp...@us...> - 2004-03-10 12:52:15
|
Update of /cvsroot/rtk/rtk/src/core/platform/epoc32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15298/epoc32 Log Message: Directory /cvsroot/rtk/rtk/src/core/platform/epoc32 added to the repository |
|
From: <sp...@us...> - 2004-03-10 12:50:47
|
Update of /cvsroot/rtk/rtk/rtk In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14960/rtk Modified Files: String.h Log Message: Added the macro RTK_API in front of each method (this is needed to build rtk in symbian) Index: String.h =================================================================== RCS file: /cvsroot/rtk/rtk/rtk/String.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** String.h 28 Feb 2004 07:39:43 -0000 1.6 --- String.h 10 Mar 2004 12:24:53 -0000 1.7 *************** *** 102,106 **** @endcode */ ! String() : sh(NULL) { } /** Create string filled with chracter c. --- 102,106 ---- @endcode */ ! RTK_API String() : sh(NULL) { } /** Create string filled with chracter c. *************** *** 108,112 **** * @param repeater How many time 'c' is repeated in string */ ! String(RCHAR c, int repeater); /** Create string from ascii/mb character string. --- 108,112 ---- * @param repeater How many time 'c' is repeated in string */ ! RTK_API String(RCHAR c, int repeater); /** Create string from ascii/mb character string. *************** *** 114,118 **** * @param maxlen Length to copy, if 0 whole string is copied */ ! String(const char *s, int maxlen=0); /** Create string from wide character string. --- 114,118 ---- * @param maxlen Length to copy, if 0 whole string is copied */ ! RTK_API String(const char *s, int maxlen=0); /** Create string from wide character string. *************** *** 120,146 **** * @param maxlen Length to copy, if 0 whole string is copied */ ! String(const wchar_t *s, int maxlen=0); /** Copy constructor. */ ! String(const String &s); ! ~String(); // = Operators ! String& operator = (const String& s); ! String& operator = (const wchar_t *s); ! String& operator = (const char *s); // + Operators ! String operator + (const String& s) const; ! String operator + (const RCHAR s) const; ! String operator + (const char *s) const; ! String operator + (const wchar_t *s) const; // += Operators ! String& operator += (const String& s); ! String& operator += (const wchar_t *s); ! String& operator += (const char *s); ! String& operator += (const RCHAR s); /** Append text to the string. --- 120,146 ---- * @param maxlen Length to copy, if 0 whole string is copied */ ! RTK_API String(const wchar_t *s, int maxlen=0); /** Copy constructor. */ ! RTK_API String(const String &s); ! RTK_API ~String(); // = Operators ! RTK_API String& operator = (const String& s); ! RTK_API String& operator = (const wchar_t *s); ! RTK_API String& operator = (const char *s); // + Operators ! RTK_API String operator + (const String& s) const; ! RTK_API String operator + (const RCHAR s) const; ! RTK_API String operator + (const char *s) const; ! RTK_API String operator + (const wchar_t *s) const; // += Operators ! RTK_API String& operator += (const String& s); ! RTK_API String& operator += (const wchar_t *s); ! RTK_API String& operator += (const char *s); ! RTK_API String& operator += (const RCHAR s); /** Append text to the string. *************** *** 150,154 **** * @return Reference to string. */ ! String &Append(const RCHAR *str, int len=0); /** Prepend text to the string. --- 150,154 ---- * @return Reference to string. */ ! RTK_API String &Append(const RCHAR *str, int len=0); /** Prepend text to the string. *************** *** 158,162 **** * @return Reference to string. */ ! String &Prepend(const RCHAR *str, int len=0); /** Compares the against another string. --- 158,162 ---- * @return Reference to string. */ ! RTK_API String &Prepend(const RCHAR *str, int len=0); /** Compares the against another string. *************** *** 166,170 **** * respectively, to be less than, to match, or be greater than this string. */ ! int Cmp(const RCHAR *str, int count=0) const; /** Compares the against another string, ignoring the case of the characters. --- 166,170 ---- * respectively, to be less than, to match, or be greater than this string. */ ! RTK_API int Cmp(const RCHAR *str, int count=0) const; /** Compares the against another string, ignoring the case of the characters. *************** *** 174,178 **** * respectively, to be less than, to match, or be greater than this string. */ ! int CaseCmp(const RCHAR *str, int count=0) const; /** Trim string from right. --- 174,178 ---- * respectively, to be less than, to match, or be greater than this string. */ ! RTK_API int CaseCmp(const RCHAR *str, int count=0) const; /** Trim string from right. *************** *** 185,189 **** * @return Trimmed string. */ ! String TrimRight(RCHAR ch=' ') const; /** Trim string from left. --- 185,189 ---- * @return Trimmed string. */ ! RTK_API String TrimRight(RCHAR ch=' ') const; /** Trim string from left. *************** *** 191,195 **** * @return Trimmed string. */ ! String TrimLeft(RCHAR ch=' ') const; /** Trim string from left and right. --- 191,195 ---- * @return Trimmed string. */ ! RTK_API String TrimLeft(RCHAR ch=' ') const; /** Trim string from left and right. *************** *** 197,211 **** * @return Trimmed string. */ ! String Trim(RCHAR ch=' ') const; /** Convert string to lower case. * @return Converted string. */ ! String LowerCase() const; /** Convert string to upper case. * @return Converted string. */ ! String UpperCase() const; /** Cut piece out from the string. --- 197,211 ---- * @return Trimmed string. */ ! RTK_API String Trim(RCHAR ch=' ') const; /** Convert string to lower case. * @return Converted string. */ ! RTK_API String LowerCase() const; /** Convert string to upper case. * @return Converted string. */ ! RTK_API String UpperCase() const; /** Cut piece out from the string. *************** *** 219,223 **** * @return New string containing piece of original string. */ ! String SubStr(int start, int count) const; /** Delete characters from given index. --- 219,223 ---- * @return New string containing piece of original string. */ ! RTK_API String SubStr(int start, int count) const; /** Delete characters from given index. *************** *** 226,230 **** * @param count How many characters to remove, defaults to 1 */ ! void SubDelete(int start, int count=1); /** Replace some pattern in string with another text. --- 226,230 ---- * @param count How many characters to remove, defaults to 1 */ ! RTK_API void SubDelete(int start, int count=1); /** Replace some pattern in string with another text. *************** *** 238,242 **** * @param replacement Replacement text for 'pattern', if NULL pattern is removed from string. */ ! String Replace(const RCHAR *pattern, const RCHAR *replacement) const; /** Remove pattern from string. String is not modified by this call. --- 238,242 ---- * @param replacement Replacement text for 'pattern', if NULL pattern is removed from string. */ ! RTK_API String Replace(const RCHAR *pattern, const RCHAR *replacement) const; /** Remove pattern from string. String is not modified by this call. *************** *** 244,248 **** * @return New string with pattern removed from it. */ ! String Remove(const RCHAR *pattern) const { return Replace(pattern, NULL); } /** Insert string to given index. --- 244,248 ---- * @return New string with pattern removed from it. */ ! RTK_API String Remove(const RCHAR *pattern) const { return Replace(pattern, NULL); } /** Insert string to given index. *************** *** 250,254 **** * @param str String to insert */ ! void Insert(int index, const RCHAR *str, int len=0); /** Insert character to given index. --- 250,254 ---- * @param str String to insert */ ! RTK_API void Insert(int index, const RCHAR *str, int len=0); /** Insert character to given index. *************** *** 256,260 **** * @param ch Character to insert */ ! void Insert(int index, RCHAR ch) { Insert(index, &ch, 1); } /** Retrieve string size in bytes. --- 256,260 ---- * @param ch Character to insert */ ! RTK_API void Insert(int index, RCHAR ch) { Insert(index, &ch, 1); } /** Retrieve string size in bytes. *************** *** 262,266 **** * @return Size in bytes. */ ! int GetBytes() const { return GetLength() * sizeof(RCHAR); } /** Retrieve string length in characters. --- 262,266 ---- * @return Size in bytes. */ ! RTK_API int GetBytes() const { return GetLength() * sizeof(RCHAR); } /** Retrieve string length in characters. *************** *** 268,272 **** * @see GetBytes() */ ! int GetLength() const { return (sh) ? sh->len : 0; } /** Set internal storage length. --- 268,272 ---- * @see GetBytes() */ ! RTK_API int GetLength() const { return (sh) ? sh->len : 0; } /** Set internal storage length. *************** *** 279,283 **** * @param len New length to set. */ ! void SetLength(int len) { Alloc(len); } /** Frees the internal storage of the string. --- 279,283 ---- * @param len New length to set. */ ! RTK_API void SetLength(int len) { Alloc(len); } /** Frees the internal storage of the string. *************** *** 285,289 **** * @see Clear(); */ ! void Free() { if(sh) { if(!--sh->ref) sh->delete_self(); } sh = 0; --- 285,289 ---- * @see Clear(); */ ! RTK_API void Free() { if(sh) { if(!--sh->ref) sh->delete_self(); } sh = 0; *************** *** 294,298 **** * @see Free(); */ ! void Clear() { Free(); Alloc(0); } /** Check if string is empty. --- 294,298 ---- * @see Free(); */ ! RTK_API void Clear() { Free(); Alloc(0); } /** Check if string is empty. *************** *** 300,304 **** * @see IsNull() */ ! bool IsEmpty() const { return (GetLength() == 0); } /** Check if string is NULL. --- 300,304 ---- * @see IsNull() */ ! RTK_API bool IsEmpty() const { return (GetLength() == 0); } /** Check if string is NULL. *************** *** 310,314 **** * @return True if string is not allocated yet, or Free() is called. */ ! bool IsNull() const { return (sh==0); } /** Search for next occurance of given string, starting from index. --- 310,314 ---- * @return True if string is not allocated yet, or Free() is called. */ ! RTK_API bool IsNull() const { return (sh==0); } /** Search for next occurance of given string, starting from index. *************** *** 317,321 **** * @return Position of next occurance or -1 if not found. */ ! int Pos(const RCHAR *str, int index=0) const; /** Search for next occurance of given character, starting from index. --- 317,321 ---- * @return Position of next occurance or -1 if not found. */ ! RTK_API int Pos(const RCHAR *str, int index=0) const; /** Search for next occurance of given character, starting from index. *************** *** 324,328 **** * @return Position of next occurance or -1 if not found. */ ! int Pos(int c, int index=0) const; /** Search backwards for next occurance of given character, starting from index. --- 324,328 ---- * @return Position of next occurance or -1 if not found. */ ! RTK_API int Pos(int c, int index=0) const; /** Search backwards for next occurance of given character, starting from index. *************** *** 331,335 **** * @return Position of next occurance found backwards or -1 if not found. */ ! int RPos(int c, int index=0) const; /** Convert string to int. --- 331,335 ---- * @return Position of next occurance found backwards or -1 if not found. */ ! RTK_API int RPos(int c, int index=0) const; /** Convert string to int. *************** *** 337,341 **** * @return Converted value, or given default value if failed. */ ! int ToInt(int defvalue=0) const; /** Convert string to double. --- 337,341 ---- * @return Converted value, or given default value if failed. */ ! RTK_API int ToInt(int defvalue=0) const; /** Convert string to double. *************** *** 343,356 **** * @return Converted value, or given default value if failed. */ ! double ToDouble(double defvalue=0) const; /** Create string from signed number. */ ! static String FromInt(int number); /** Create string from unsigned number. */ ! static String FromUint(unsigned number); /** Create string from double number. */ ! static String FromDouble(double number); /** Get const pointer to internal character storage. --- 343,356 ---- * @return Converted value, or given default value if failed. */ ! RTK_API double ToDouble(double defvalue=0) const; /** Create string from signed number. */ ! RTK_API static String FromInt(int number); /** Create string from unsigned number. */ ! RTK_API static String FromUint(unsigned number); /** Create string from double number. */ ! RTK_API static String FromDouble(double number); /** Get const pointer to internal character storage. *************** *** 358,400 **** * It's preferred to use this method within functions, that doesnt like NULL's */ ! const RCHAR* c_str() const { return ((sh) ? sh->str : _R("")); } /** Get pointer to internal character storage. * If string is Null (IsNull()==1) - NULL is returned */ ! RCHAR* GetStr() { copy(); return ((sh) ? sh->str : NULL); } /** Get pointer to internal character storage. * If string is Null (IsNull()==1) - NULL is returned */ ! const RCHAR* GetStr() const { return ((sh) ? sh->str : NULL); } /** Format string using printf style format. * @return Reference to formatted string. */ ! String &Format(const RCHAR *fmt, ...); /** Create formatted string */ ! static String Create(const RCHAR *fmt, ...); /** Auto conversion to const RCHAR* * @see c_str() */ ! operator const RCHAR *() const { return GetStr(); } /** Auto conversion to RCHAR* * @see GetStr() */ ! operator RCHAR *() { return GetStr(); } /** Same as At(int idx) * @see At */ ! RCHAR &operator [] (int idx) { return at(idx); } /** Same as At(int idx) * @see At */ ! const RCHAR &operator [] (int idx) const { return at(idx); } /** Get element at index. --- 358,400 ---- * It's preferred to use this method within functions, that doesnt like NULL's */ ! RTK_API const RCHAR* c_str() const { return ((sh) ? sh->str : _R("")); } /** Get pointer to internal character storage. * If string is Null (IsNull()==1) - NULL is returned */ ! RTK_API RCHAR* GetStr() { copy(); return ((sh) ? sh->str : NULL); } /** Get pointer to internal character storage. * If string is Null (IsNull()==1) - NULL is returned */ ! RTK_API const RCHAR* GetStr() const { return ((sh) ? sh->str : NULL); } /** Format string using printf style format. * @return Reference to formatted string. */ ! RTK_API String &Format(const RCHAR *fmt, ...); /** Create formatted string */ ! RTK_API static String Create(const RCHAR *fmt, ...); /** Auto conversion to const RCHAR* * @see c_str() */ ! RTK_API operator const RCHAR *() const { return GetStr(); } /** Auto conversion to RCHAR* * @see GetStr() */ ! RTK_API operator RCHAR *() { return GetStr(); } /** Same as At(int idx) * @see At */ ! RTK_API RCHAR &operator [] (int idx) { return at(idx); } /** Same as At(int idx) * @see At */ ! RTK_API const RCHAR &operator [] (int idx) const { return at(idx); } /** Get element at index. *************** *** 403,407 **** * @return Reference to element at given index. */ ! RCHAR &at(int idx) { copy(); return sh->str[idx]; } /** Get element at index. --- 403,407 ---- * @return Reference to element at given index. */ ! RTK_API RCHAR &at(int idx) { copy(); return sh->str[idx]; } /** Get element at index. *************** *** 410,428 **** * @return Element at given index. */ ! const RCHAR &at(int idx) const { return sh->str[idx]; } ! int GetRefCount() const { return ((sh) ? sh->ref : 0); } protected: /** Copy string top of current string. */ ! void Assign(const char *buf, int buflen, int oldlen=0); ! void Assign(const wchar_t *buf, int buflen, int oldlen=0); /** (re)Alloc size elements in internal storage */ ! void Alloc(int size); ! void deref(); ! void ref(); ! void copy(); String_Shared *sh; --- 410,428 ---- * @return Element at given index. */ ! RTK_API const RCHAR &at(int idx) const { return sh->str[idx]; } ! RTK_API int GetRefCount() const { return ((sh) ? sh->ref : 0); } protected: /** Copy string top of current string. */ ! RTK_API void Assign(const char *buf, int buflen, int oldlen=0); ! RTK_API void Assign(const wchar_t *buf, int buflen, int oldlen=0); /** (re)Alloc size elements in internal storage */ ! RTK_API void Alloc(int size); ! RTK_API void deref(); ! RTK_API void ref(); ! RTK_API void copy(); String_Shared *sh; |
|
From: <sp...@us...> - 2004-03-10 12:48:01
|
Update of /cvsroot/rtk/rtk/src/core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14460 Modified Files: Dict.cpp String.cpp call_main.c debug.cpp Log Message: Some minor changes in order to compile on symbian (I will check if it still compiles in linux in a moment) Index: Dict.cpp =================================================================== RCS file: /cvsroot/rtk/rtk/src/core/Dict.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Dict.cpp 7 Mar 2004 20:53:00 -0000 1.8 --- Dict.cpp 10 Mar 2004 12:22:07 -0000 1.9 *************** *** 46,54 **** #endif #include <stdlib.h> #include <assert.h> - #include <rtk/Dict.h> - #include <rtk/String.h> // package also --- 46,55 ---- #endif + #include <rtk/Dict.h> + #include <rtk/String.h> + #include <stdlib.h> #include <assert.h> // package also Index: String.cpp =================================================================== RCS file: /cvsroot/rtk/rtk/src/core/String.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** String.cpp 8 Mar 2004 19:55:24 -0000 1.4 --- String.cpp 10 Mar 2004 12:22:07 -0000 1.5 *************** *** 1,5 **** ! #include <wctype.h> #include <string.h> - #include <wchar.h> #include <stdarg.h> --- 1,5 ---- ! #include <rtk/String.h> ! #include <string.h> #include <stdarg.h> *************** *** 8,16 **** #include <stdlib.h> - #include <rtk/String.h> namespace Rtk { String String::NullString; #define DATASIZE(x) ( (x)*sizeof(RCHAR) ) --- 8,17 ---- #include <stdlib.h> namespace Rtk { + #ifndef __EPOC32__ // No initialized data in symbian String String::NullString; + #endif #define DATASIZE(x) ( (x)*sizeof(RCHAR) ) Index: call_main.c =================================================================== RCS file: /cvsroot/rtk/rtk/src/core/call_main.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** call_main.c 22 Feb 2004 13:17:32 -0000 1.3 --- call_main.c 10 Mar 2004 12:22:08 -0000 1.4 *************** *** 62,65 **** --- 62,67 ---- */ + /* Pali: Shouldn't this file be in platform/win32/ ? */ + #include <rtk/conf.h> Index: debug.cpp =================================================================== RCS file: /cvsroot/rtk/rtk/src/core/debug.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** debug.cpp 18 Jan 2004 20:17:07 -0000 1.2 --- debug.cpp 10 Mar 2004 12:22:08 -0000 1.3 *************** *** 1,2 **** --- 1,4 ---- + #include <time.h> + #include <rtk/debug.h> #include <rtk/error.h> *************** *** 6,12 **** --- 8,20 ---- namespace Rtk { + #ifndef __EPOC32__ static debug_cb_t *cbs = 0; static int cb_count = 0; static int cb_size = 0; + #else + debug_cb_t *cbs; + int cb_count; + int cb_size; + #endif ERROR_RET debug_add_cb(debug_cb_t cb) |
|
From: <le...@us...> - 2004-03-10 12:42:56
|
Update of /cvsroot/rtk/rtk/src/core/platform/linux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13383 Modified Files: CMakeLists.txt Log Message: Small change in build-system on GNU/Linux Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/rtk/rtk/src/core/platform/linux/CMakeLists.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CMakeLists.txt 5 Mar 2004 18:30:05 -0000 1.3 --- CMakeLists.txt 10 Mar 2004 12:17:05 -0000 1.4 *************** *** 41,44 **** --- 41,45 ---- # Now we can put 'em in main RTK_CORE_SFILES variable SET(RTK_CORE_SFILES ${RTK_CORE_SFILES} ${RTK_CORE_LINUX_SFILES}) + # T0D0: This must be fixed... ADD_LIBRARY(${RTK_LIBRTK} STATIC ${RTK_CORE_LINUX_SFILES}) MESSAGE("### ${RTK_CORE_SFILES}") *************** *** 48,51 **** --- 49,53 ---- # IF (RTK_OPT_BCLOG) + WRITE_FILE(${RTK_BC_LOGFILE} "RTK Core files: ${RTK_CORE_SFILES}\n" APPEND) WRITE_FILE(${RTK_BC_LOGFILE} "Visited: /src/core/platform/linux\n" APPEND) ENDIF (RTK_OPT_BCLOG) |
|
From: <sp...@us...> - 2004-03-10 12:42:28
|
Update of /cvsroot/rtk/rtk/src/core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13392 Modified Files: Array.cpp Log Message: Started porting to symbian Index: Array.cpp =================================================================== RCS file: /cvsroot/rtk/rtk/src/core/Array.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Array.cpp 8 Mar 2004 19:55:23 -0000 1.6 --- Array.cpp 10 Mar 2004 12:16:30 -0000 1.7 *************** *** 45,51 **** #include <string.h> #include <stdlib.h> ! ! #if !defined(_RTK_CC_GCC_) || (defined(_RTK_CC_GCC_) && !defined(_RTK_WIN32_)) ! # include <search.h> #endif --- 45,54 ---- #include <string.h> #include <stdlib.h> ! #ifdef __EPOC32__ ! # include <platform/epoc32/lfind.h> ! #else ! # if !defined(_RTK_CC_GCC_) || (defined(_RTK_CC_GCC_) && !defined(_RTK_WIN32_)) ! # include <search.h> // Note: For this to compile under Dev-C++ 4.9.8.x You'll need latest mingw-runtime! ! # endif #endif |
|
From: <sp...@us...> - 2004-03-10 12:41:30
|
Update of /cvsroot/rtk/rtk/src/core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13186/src/core Modified Files: rchar.cpp Log Message: Started porting to symbian Index: rchar.cpp =================================================================== RCS file: /cvsroot/rtk/rtk/src/core/rchar.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** rchar.cpp 29 Feb 2004 20:53:25 -0000 1.8 --- rchar.cpp 10 Mar 2004 12:15:39 -0000 1.9 *************** *** 1,2 **** --- 1,8 ---- + #if __EPOC32__ + // needed by symbian + # include <e32def.h> + # include <time.h> + #endif + #include <rtk/rchar.h> #include <stdarg.h> |
|
From: <sp...@us...> - 2004-03-10 12:27:03
|
Update of /cvsroot/rtk/rtk/rtk In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10136 Modified Files: rchar.h rchar_ascii.h rchar_unicode.h Log Message: Started porting to Symbian Index: rchar.h =================================================================== RCS file: /cvsroot/rtk/rtk/rtk/rchar.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** rchar.h 29 Feb 2004 20:53:25 -0000 1.12 --- rchar.h 10 Mar 2004 12:01:12 -0000 1.13 *************** *** 7,14 **** #include <stdio.h> #include <string.h> - #include <wchar.h> - #include <wctype.h> #include <stdarg.h> namespace Rtk { --- 7,17 ---- #include <stdio.h> #include <string.h> #include <stdarg.h> + #ifndef __EPOC32__ + # include <wchar.h> + # include <wctype.h> + #endif + namespace Rtk { Index: rchar_ascii.h =================================================================== RCS file: /cvsroot/rtk/rtk/rtk/rchar_ascii.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** rchar_ascii.h 29 Feb 2004 20:53:25 -0000 1.7 --- rchar_ascii.h 10 Mar 2004 12:01:12 -0000 1.8 *************** *** 6,9 **** --- 6,10 ---- #include <time.h> #include <ctype.h> + #include <stdio.h> #define RCHAR char *************** *** 49,52 **** --- 50,59 ---- #define rvprintf vprintf + #if __EPOC32__ + // Symbian doesnt has any *nprintf function!! + # define vsnprintf(str,size,fmt,args) vsprintf(str,fmt,args) + # define snprintf(str,size,fmt,args...) sprintf(str,fmt,#args) + #endif + // scanf's #define rfscanf fscanf Index: rchar_unicode.h =================================================================== RCS file: /cvsroot/rtk/rtk/rtk/rchar_unicode.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** rchar_unicode.h 29 Feb 2004 21:27:34 -0000 1.7 --- rchar_unicode.h 10 Mar 2004 12:01:12 -0000 1.8 *************** *** 4,9 **** // using 16 bit (usually) unicode characters ! #include <wctype.h> ! #include <wchar.h> #include <time.h> --- 4,13 ---- // using 16 bit (usually) unicode characters ! ! #ifndef __EPOC32__ // Symbian has some special sort of std lib ! # include <wctype.h> ! # include <wchar.h> ! #endif ! #include <time.h> |
|
From: <sp...@us...> - 2004-03-10 12:07:57
|
Update of /cvsroot/rtk/rtk/rtk In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6093 Modified Files: Array.h Log Message: Some method didn't returned anything Index: Array.h =================================================================== RCS file: /cvsroot/rtk/rtk/rtk/Array.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Array.h 23 Feb 2004 18:10:07 -0000 1.5 --- Array.h 10 Mar 2004 11:42:07 -0000 1.6 *************** *** 186,191 **** public: \ class_name() : Array(sizeof(type)) { } \ ! const type *bsearch(const type *key, CmpFunction cmpfunc) { Array::bsearch(ARRAY_DATA(key), cmpfunc); } \ ! const type *lfind(const type *key, CmpFunction cmpfunc) { Array::lfind(ARRAY_DATA(key), cmpfunc); } \ void Append(const type &item) { Array::Append(ARRAY_DATA(&item), 1); } \ void Append(const type *item, uint elements = 1) { Array::Append(ARRAY_DATA(item), elements); } \ --- 186,191 ---- public: \ class_name() : Array(sizeof(type)) { } \ ! const type *bsearch(const type *key, CmpFunction cmpfunc) { return (const type*)Array::bsearch(ARRAY_DATA(key), cmpfunc); } \ ! const type *lfind(const type *key, CmpFunction cmpfunc) { return (const type*)Array::lfind(ARRAY_DATA(key), cmpfunc); } \ void Append(const type &item) { Array::Append(ARRAY_DATA(&item), 1); } \ void Append(const type *item, uint elements = 1) { Array::Append(ARRAY_DATA(item), elements); } \ |
|
From: <sp...@us...> - 2004-03-10 12:07:26
|
Update of /cvsroot/rtk/rtk/rtk In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5888 Modified Files: Export.h Log Message: Added Symbian (EPOC32) support Index: Export.h =================================================================== RCS file: /cvsroot/rtk/rtk/rtk/Export.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Export.h 11 Feb 2004 12:29:29 -0000 1.3 --- Export.h 10 Mar 2004 11:41:37 -0000 1.4 *************** *** 20,23 **** --- 20,30 ---- # define RTK_API __declspec(dllimport) # endif + #elif defined(__EPOC32__) + # include <e32def.h> + # ifdef RTK_EXPORTS + # define RTK_API IMPORT_C + # else + # define RTK_API EXPORT_C + # endif #else # define RTK_API |
|
From: <sp...@us...> - 2004-03-10 12:06:31
|
Update of /cvsroot/rtk/rtk/rtk In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5673/rtk Modified Files: SList.h Log Message: Reordered field initialization in constructor Index: SList.h =================================================================== RCS file: /cvsroot/rtk/rtk/rtk/SList.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** SList.h 11 Feb 2004 12:29:29 -0000 1.9 --- SList.h 10 Mar 2004 11:40:39 -0000 1.10 *************** *** 77,81 **** * Default constructor. */ ! SList(): _head(0), _tail(0), _count(0), _free_func(0) { } // --------- DESTRUCTORS ----------------------------------- --- 77,81 ---- * Default constructor. */ ! SList(): _count(0), _head(0), _tail(0), _free_func(0) { } // --------- DESTRUCTORS ----------------------------------- |
|
From: <de...@us...> - 2004-03-09 21:06:57
|
Update of /cvsroot/rtk/rtk In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29566 Modified Files: CMakeLists.txt Log Message: Yes, finally I've successfully fixed CMake build-system so now libraries are built in top-level "lib" directory. Bonsaaaaaaaiiiiiii! Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/rtk/rtk/CMakeLists.txt,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** CMakeLists.txt 3 Mar 2004 10:40:15 -0000 1.11 --- CMakeLists.txt 9 Mar 2004 20:41:37 -0000 1.12 *************** *** 37,40 **** --- 37,45 ---- INCLUDE_DIRECTORIES(${RTK_SOURCE_DIR} ${RTK_SOURCE_DIR}/rtk . ..) + ##------------------------------------------------------------------- + # Variables + # + SET(LIBRARY_OUTPUT_PATH ${RTK_SOURCE_DIR}/lib) + ## # Various build options |
