From 8f426164cc8b5ca4ea96766bf78fd2d1f28cd656 Mon Sep 17 00:00:00 2001
From: Benny Prijono <bennylp@teluu.com>
Date: Thu, 3 May 2007 13:31:21 +0000
Subject: Implemented ticket #246, #247, #261, #268, #250 for Symbian

git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@1246 74dad513-b988-da41-8d7b-12977e46ad98
---
 build.symbian/pjlib.mmp      |   6 +-
 build.symbian/pjlib_util.mmp |   1 -
 build.symbian/pjproject.cww  | 222 +++++++++----------------------------------
 build.symbian/symbian_ua.mmp |   4 +-
 4 files changed, 50 insertions(+), 183 deletions(-)

(limited to 'build.symbian')

diff --git a/build.symbian/pjlib.mmp b/build.symbian/pjlib.mmp
index 1e52ba4f..8ec56ca7 100644
--- a/build.symbian/pjlib.mmp
+++ b/build.symbian/pjlib.mmp
@@ -30,18 +30,19 @@ SOURCE		pool_buf.c
 SOURCE		pool_caching.c
 SOURCE		rand.c
 SOURCE		rbtree.c
-SOURCE		timer.c
 SOURCE		types.c
 
 
 //
 // Platform dependent source
 //
+SOURCE		compat\string_compat.c
 SOURCE		addr_resolv_symbian.cpp
 SOURCE		exception_symbian.cpp
 SOURCE		file_access_unistd.c
 SOURCE		file_io_ansi.c
 SOURCE		guid_simple.c
+SOURCE		ioqueue_symbian.cpp
 SOURCE		ip_helper_generic.c
 SOURCE		log_writer_symbian_console.cpp
 SOURCE		os_core_symbian.cpp
@@ -50,10 +51,9 @@ SOURCE		os_timestamp_common.c
 SOURCE		os_time_unix.c
 SOURCE		os_timestamp_posix.c
 SOURCE		pool_policy_new.cpp
-SOURCE		compat\string_compat.c
 SOURCE		sock_symbian.cpp
 SOURCE		sock_select_symbian.cpp
-SOURCE		ioqueue_symbian.cpp
+SOURCE		timer_symbian.cpp
 SOURCE		unicode_symbian.cpp
 
 DOCUMENT	os_symbian.h
diff --git a/build.symbian/pjlib_util.mmp b/build.symbian/pjlib_util.mmp
index 9315d730..30f59fa2 100644
--- a/build.symbian/pjlib_util.mmp
+++ b/build.symbian/pjlib_util.mmp
@@ -57,6 +57,5 @@ SYSTEMINCLUDE	..\pjlib-util\include
 SYSTEMINCLUDE	\epoc32\include
 SYSTEMINCLUDE	\epoc32\include\libc
 
-LIBRARY		pjlib.lib 
 CAPABILITY	None
 
diff --git a/build.symbian/pjproject.cww b/build.symbian/pjproject.cww
index f30e19fa..81efe194 100644
--- a/build.symbian/pjproject.cww
+++ b/build.symbian/pjproject.cww
@@ -164,14 +164,14 @@
     <WINDOW>
         <SESSION>-1</SESSION>
         <EDOCTYPE>0</EDOCTYPE>
-        <PATH USERELATIVEPATHS = "true">pjsua_lib.mcp</PATH>
+        <PATH USERELATIVEPATHS = "true">pjsip_ua.mcp</PATH>
         <FRAMELOC>
-            <X>634</X>
-            <Y>231</Y>
+            <X>548</X>
+            <Y>123</Y>
         </FRAMELOC>
         <FRAMESIZE>
-            <W>347</W>
-            <H>128</H>
+            <W>400</W>
+            <H>372</H>
         </FRAMESIZE>
         <DOCKINFO>
             <STATUS>1</STATUS>
@@ -189,10 +189,10 @@
     <WINDOW>
         <SESSION>-1</SESSION>
         <EDOCTYPE>0</EDOCTYPE>
-        <PATH USERELATIVEPATHS = "true">symbian_ua.mcp</PATH>
+        <PATH USERELATIVEPATHS = "true">pjsip_simple.mcp</PATH>
         <FRAMELOC>
-            <X>571</X>
-            <Y>149</Y>
+            <X>0</X>
+            <Y>0</Y>
         </FRAMELOC>
         <FRAMESIZE>
             <W>347</W>
@@ -213,51 +213,51 @@
     </WINDOW>
     <WINDOW>
         <SESSION>-1</SESSION>
-        <EDOCTYPE>1</EDOCTYPE>
-        <PATH USERELATIVEPATHS = "true">..\pjlib\src\pj\sock_symbian.cpp</PATH>
+        <EDOCTYPE>0</EDOCTYPE>
+        <PATH USERELATIVEPATHS = "true">pjsua_lib.mcp</PATH>
         <FRAMELOC>
-            <X>8</X>
-            <Y>27</Y>
+            <X>634</X>
+            <Y>231</Y>
         </FRAMELOC>
         <FRAMESIZE>
-            <W>646</W>
-            <H>464</H>
+            <W>347</W>
+            <H>128</H>
         </FRAMESIZE>
         <DOCKINFO>
-            <STATUS>0</STATUS>
-            <ROW></ROW>
-            <COLUMN></COLUMN>
-            <DOCKBARID></DOCKBARID>
-            <PCTWIDTH></PCTWIDTH>
-            <HGT></HGT>
+            <STATUS>1</STATUS>
+            <ROW>0</ROW>
+            <COLUMN>0</COLUMN>
+            <DOCKBARID>59420</DOCKBARID>
+            <PCTWIDTH>1.000000</PCTWIDTH>
+            <HGT>294</HGT>
             <GROUPID>
-                <GIDHIGHPART></GIDHIGHPART>
-                <GIDLOWPART></GIDLOWPART>
+                <GIDHIGHPART>4294967294</GIDHIGHPART>
+                <GIDLOWPART>4294967294</GIDLOWPART>
             </GROUPID>
         </DOCKINFO>
     </WINDOW>
     <WINDOW>
         <SESSION>-1</SESSION>
-        <EDOCTYPE>1</EDOCTYPE>
-        <PATH USERELATIVEPATHS = "true">..\pjsip-apps\src\symbian_ua\main_symbian.cpp</PATH>
+        <EDOCTYPE>0</EDOCTYPE>
+        <PATH USERELATIVEPATHS = "true">symbian_ua.mcp</PATH>
         <FRAMELOC>
-            <X>8</X>
-            <Y>27</Y>
+            <X>571</X>
+            <Y>149</Y>
         </FRAMELOC>
         <FRAMESIZE>
-            <W>638</W>
-            <H>437</H>
+            <W>347</W>
+            <H>128</H>
         </FRAMESIZE>
         <DOCKINFO>
-            <STATUS>0</STATUS>
-            <ROW></ROW>
-            <COLUMN></COLUMN>
-            <DOCKBARID></DOCKBARID>
-            <PCTWIDTH></PCTWIDTH>
-            <HGT></HGT>
+            <STATUS>1</STATUS>
+            <ROW>0</ROW>
+            <COLUMN>0</COLUMN>
+            <DOCKBARID>59420</DOCKBARID>
+            <PCTWIDTH>1.000000</PCTWIDTH>
+            <HGT>294</HGT>
             <GROUPID>
-                <GIDHIGHPART></GIDHIGHPART>
-                <GIDLOWPART></GIDLOWPART>
+                <GIDHIGHPART>4294967294</GIDHIGHPART>
+                <GIDLOWPART>4294967294</GIDLOWPART>
             </GROUPID>
         </DOCKINFO>
     </WINDOW>
@@ -265,138 +265,14 @@
         <SESSION>-1</SESSION>
         <EDOCTYPE>1</EDOCTYPE>
         <PATH USERELATIVEPATHS = "true">..\pjsip-apps\src\symbian_ua\ua.cpp</PATH>
-        <FRAMELOC>
-            <X>4</X>
-            <Y>23</Y>
-        </FRAMELOC>
-        <FRAMESIZE>
-            <W>565</W>
-            <H>643</H>
-        </FRAMESIZE>
-        <DOCKINFO>
-            <STATUS>0</STATUS>
-            <ROW></ROW>
-            <COLUMN></COLUMN>
-            <DOCKBARID></DOCKBARID>
-            <PCTWIDTH></PCTWIDTH>
-            <HGT></HGT>
-            <GROUPID>
-                <GIDHIGHPART></GIDHIGHPART>
-                <GIDLOWPART></GIDLOWPART>
-            </GROUPID>
-        </DOCKINFO>
-    </WINDOW>
-    <WINDOW>
-        <SESSION>-1</SESSION>
-        <EDOCTYPE>1</EDOCTYPE>
-        <PATH USERELATIVEPATHS = "true">..\pjlib\src\pj\ioqueue_symbian.cpp</PATH>
-        <FRAMELOC>
-            <X>10</X>
-            <Y>40</Y>
-        </FRAMELOC>
-        <FRAMESIZE>
-            <W>630</W>
-            <H>410</H>
-        </FRAMESIZE>
-        <DOCKINFO>
-            <STATUS>0</STATUS>
-            <ROW></ROW>
-            <COLUMN></COLUMN>
-            <DOCKBARID></DOCKBARID>
-            <PCTWIDTH></PCTWIDTH>
-            <HGT></HGT>
-            <GROUPID>
-                <GIDHIGHPART></GIDHIGHPART>
-                <GIDLOWPART></GIDLOWPART>
-            </GROUPID>
-        </DOCKINFO>
-    </WINDOW>
-    <WINDOW>
-        <SESSION>-1</SESSION>
-        <EDOCTYPE>1</EDOCTYPE>
-        <PATH USERELATIVEPATHS = "true">..\pjlib\src\pj\os_core_symbian.cpp</PATH>
-        <FRAMELOC>
-            <X>6</X>
-            <Y>23</Y>
-        </FRAMELOC>
-        <FRAMESIZE>
-            <W>638</W>
-            <H>437</H>
-        </FRAMESIZE>
-        <DOCKINFO>
-            <STATUS>0</STATUS>
-            <ROW></ROW>
-            <COLUMN></COLUMN>
-            <DOCKBARID></DOCKBARID>
-            <PCTWIDTH></PCTWIDTH>
-            <HGT></HGT>
-            <GROUPID>
-                <GIDHIGHPART></GIDHIGHPART>
-                <GIDLOWPART></GIDLOWPART>
-            </GROUPID>
-        </DOCKINFO>
-    </WINDOW>
-    <WINDOW>
-        <SESSION>-1</SESSION>
-        <EDOCTYPE>1</EDOCTYPE>
-        <PATH USERELATIVEPATHS = "true">..\pjlib\src\pj\os_error_symbian.cpp</PATH>
-        <FRAMELOC>
-            <X>8</X>
-            <Y>27</Y>
-        </FRAMELOC>
-        <FRAMESIZE>
-            <W>638</W>
-            <H>437</H>
-        </FRAMESIZE>
-        <DOCKINFO>
-            <STATUS>0</STATUS>
-            <ROW></ROW>
-            <COLUMN></COLUMN>
-            <DOCKBARID></DOCKBARID>
-            <PCTWIDTH></PCTWIDTH>
-            <HGT></HGT>
-            <GROUPID>
-                <GIDHIGHPART></GIDHIGHPART>
-                <GIDLOWPART></GIDLOWPART>
-            </GROUPID>
-        </DOCKINFO>
-    </WINDOW>
-    <WINDOW>
-        <SESSION>-1</SESSION>
-        <EDOCTYPE>1</EDOCTYPE>
-        <PATH USERELATIVEPATHS = "true">..\pjlib\src\pj\errno.c</PATH>
-        <FRAMELOC>
-            <X>4</X>
-            <Y>23</Y>
-        </FRAMELOC>
-        <FRAMESIZE>
-            <W>646</W>
-            <H>464</H>
-        </FRAMESIZE>
-        <DOCKINFO>
-            <STATUS>0</STATUS>
-            <ROW></ROW>
-            <COLUMN></COLUMN>
-            <DOCKBARID></DOCKBARID>
-            <PCTWIDTH></PCTWIDTH>
-            <HGT></HGT>
-            <GROUPID>
-                <GIDHIGHPART></GIDHIGHPART>
-                <GIDLOWPART></GIDLOWPART>
-            </GROUPID>
-        </DOCKINFO>
-    </WINDOW>
-    <WINDOW>
-        <SESSION>-1</SESSION>
-        <EDOCTYPE>20</EDOCTYPE>
         <MAXIMIZED>true</MAXIMIZED>
         <FRAMELOC>
-            <X>0</X>
-            <Y>0</Y>
+            <X>4</X>
+            <Y>4</Y>
         </FRAMELOC>
         <FRAMESIZE>
-            <W>824</W>
-            <H>1521</H>
+            <W>605</W>
+            <H>778</H>
         </FRAMESIZE>
         <DOCKINFO>
             <STATUS>0</STATUS>
@@ -410,10 +286,6 @@
                 <GIDLOWPART></GIDLOWPART>
             </GROUPID>
         </DOCKINFO>
-            <SYMBOLICSWINSETTINGS EXECUTABLEPATH = "C:\Symbian\9.1\S60_3rd_MR_2\EPOC32\RELEASE\WINSCW\UDEB\euser.dll" MACHINENAME = "Local Windows PC"/>
-            <SYMBOLICSWINSETTINGS EXECUTABLEPATH = "C:\Symbian\9.1\S60_3rd_MR_2\EPOC32\RELEASE\WINSCW\UDEB\ekern.exe" MACHINENAME = "Local Windows PC"/>
-            <SYMBOLICSWINSETTINGS EXECUTABLEPATH = "C:\WINNT\system32\ntdll.dll" MACHINENAME = "Local Windows PC"/>
-            <SYMBOLICSWINSETTINGS EXECUTABLEPATH = "C:\Symbian\9.1\S60_3rd_MR_2\EPOC32\RELEASE\WINSCW\UDEB\econs.dll" MACHINENAME = "Local Windows PC"/>
     </WINDOW>
     <WINDOW>
         <SESSION>-2147483648</SESSION>
@@ -424,8 +296,8 @@
             <Y>23</Y>
         </FRAMELOC>
         <FRAMESIZE>
-            <W>390</W>
-            <H>435</H>
+            <W>470</W>
+            <H>705</H>
         </FRAMESIZE>
         <DOCKINFO>
             <STATUS>0</STATUS>
@@ -449,8 +321,8 @@
             <Y>23</Y>
         </FRAMELOC>
         <FRAMESIZE>
-            <W>816</W>
-            <H>1494</H>
+            <W>904</W>
+            <H>1791</H>
         </FRAMESIZE>
         <DOCKINFO>
             <STATUS>0</STATUS>
@@ -464,15 +336,11 @@
                 <GIDLOWPART></GIDLOWPART>
             </GROUPID>
         </DOCKINFO>
-            <SYMBOLICSWINSETTINGS EXECUTABLEPATH = "C:\Symbian\9.1\S60_3rd_MR_2\EPOC32\RELEASE\WINSCW\UDEB\euser.dll" MACHINENAME = "Local Windows PC"/>
-            <SYMBOLICSWINSETTINGS EXECUTABLEPATH = "C:\Symbian\9.1\S60_3rd_MR_2\EPOC32\RELEASE\WINSCW\UDEB\ekern.exe" MACHINENAME = "Local Windows PC"/>
-            <SYMBOLICSWINSETTINGS EXECUTABLEPATH = "C:\WINNT\system32\ntdll.dll" MACHINENAME = "Local Windows PC"/>
-            <SYMBOLICSWINSETTINGS EXECUTABLEPATH = "C:\Symbian\9.1\S60_3rd_MR_2\EPOC32\RELEASE\WINSCW\UDEB\econs.dll" MACHINENAME = "Local Windows PC"/>
     </WINDOW>
     <WINDOW>
         <SESSION>-2147483648</SESSION>
         <EDOCTYPE>23</EDOCTYPE>
-        <DEFAULT>true</DEFAULT>
+        <MAXIMIZED>true</MAXIMIZED>
         <FRAMELOC>
             <X>6</X>
             <Y>81</Y>
diff --git a/build.symbian/symbian_ua.mmp b/build.symbian/symbian_ua.mmp
index 8531cb00..0c53eda1 100644
--- a/build.symbian/symbian_ua.mmp
+++ b/build.symbian/symbian_ua.mmp
@@ -24,7 +24,7 @@ SYSTEMINCLUDE	..\pjsip\include
 SYSTEMINCLUDE	\epoc32\include
 SYSTEMINCLUDE	\epoc32\include\libc
 
-LIBRARY		pjsua_lib.lib pjsip_ua.lib pjsip_simple.lib pjsip.lib pjsdp.lib pjmedia.lib pjnath.lib pjlib_util.lib pjlib.lib esock.lib insock.lib charconv.lib euser.lib estlib.lib eexe.lib
-STATICLIBRARY   ecrt0.lib
+LIBRARY		esock.lib insock.lib charconv.lib euser.lib estlib.lib eexe.lib
+STATICLIBRARY   pjsua_lib.lib pjsip_ua.lib pjsip_simple.lib pjsip.lib pjsdp.lib pjmedia.lib pjnath.lib pjlib_util.lib pjlib.lib ecrt0.lib
 CAPABILITY	None
 
-- 
cgit v1.2.3