[Rtk-cvs] rtk/ide/symbian .cvsignore,NONE,1.1 Makefile.tests,NONE,1.1 install_tests_on_phone,NONE,1.1 E32Main.cpp,1.1,1.2 makeinc-common,1.1,1.2 makeinc-test_core,1.1,1.2 Makefile.string0,1.1,NONE

[Szasz P. <sp...@us...>]

Update of /cvsroot/rtk/rtk/ide/symbian
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10890

Modified Files:
	E32Main.cpp makeinc-common makeinc-test_core 
Added Files:
	.cvsignore Makefile.tests install_tests_on_phone 
Removed Files:
	Makefile.string0 
Log Message:
Some minor fixes and changes. Now the tests compile and run in symbian

--- NEW FILE: .cvsignore ---
*.exe
*.deps
librtk*.a

Index: makeinc-test_core
===================================================================
RCS file: /cvsroot/rtk/rtk/ide/symbian/makeinc-test_core,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** makeinc-test_core	10 Mar 2004 12:28:53 -0000	1.1
--- makeinc-test_core	17 Mar 2004 21:08:30 -0000	1.2
***************
*** 8,11 ****
--- 8,13 ----
  LIBS=$(NAMERTK).a $(EPOCTRGREL)/estlib.lib 
  
+ .PHONY : $(NAMERTK).a
+ 
  include makeinc-common
  

--- NEW FILE: Makefile.tests ---
#
# This make file creates all the test applications
#
TESTS = array0 debug0 dict0 dlist0 error0 string0 variant0 vector0
PROBLEMS_WITH = 

all :
	for i in $(TESTS); do \
	    TEST_NAME=$$i make -f makeinc-test_core; \
	done

clean :
	for i in $(TESTS); do \
	    TEST_NAME=$$i make -f makeinc-test_core clean; \
	done

Index: E32Main.cpp
===================================================================
RCS file: /cvsroot/rtk/rtk/ide/symbian/E32Main.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** E32Main.cpp	10 Mar 2004 12:28:53 -0000	1.1
--- E32Main.cpp	17 Mar 2004 21:08:30 -0000	1.2
***************
*** 7,15 ****
  GLDEF_C TInt E32Main()
  {
!     char*argv[] = { "me" };
!     CTrapCleanup* cleanup = CTrapCleanup::New();
!     TRAPD(error, main(1, argv));
!     delete cleanup;
!     return 0;
  }
  
--- 7,16 ----
  GLDEF_C TInt E32Main()
  {
! 	char*argv[] = { "me" };
! 	CTrapCleanup* cleanup = CTrapCleanup::New();
! 	TRAPD(error, main(1, argv));
! 	delete cleanup;
! 
! 	return 0;
  }
  

Index: makeinc-common
===================================================================
RCS file: /cvsroot/rtk/rtk/ide/symbian/makeinc-common,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** makeinc-common	10 Mar 2004 12:28:53 -0000	1.1
--- makeinc-common	17 Mar 2004 21:08:30 -0000	1.2
***************
*** 24,32 ****
  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)
--- 24,32 ----
  CFLAGS += -fomit-frame-pointer -O -march=armv4t -mthumb-interwork -pipe \
      -nostdinc -Wall -Wno-ctor-dtor-privacy -Wno-unknown-pragmas \
!     -DNDEBUG -D__SYMBIAN32__ -D__GCC32__ -D__EPOC32__ \
      -D__MARM__ -D__MARM_ARMI__ -Dmain=MAIN \
      -I$(EPOC)/include -I$(EPOC)/include/libc
      
! LIBS += $(EPOCTRGREL)/egcc.lib $(EPOCTRGREL)/euser.lib
  
  TARGET=$(NAME).$(TYPE)

--- Makefile.string0 DELETED ---

--- NEW FILE: install_tests_on_phone ---
#!/bin/sh

#
# This small scripts copies the compiled tests on my phone
# ... What??? .... NO!!! ....
# If you compile them on your computer they won't be copied on MY phone!
#
for i in *.exe; do
    echo -n "Copying $i ... "
    cp -f $i /mnt/disk/E:/inbox/
    echo "Done"
done