Ticket #434: fixed configurations to build Symbian for device target
git-svn-id: https://svn.pjsip.org/repos/pjproject/trunk@1640 74dad513-b988-da41-8d7b-12977e46ad98
diff --git a/build.symbian/bld.inf b/build.symbian/bld.inf
index 5cf4bf0..678d075 100644
--- a/build.symbian/bld.inf
+++ b/build.symbian/bld.inf
@@ -5,14 +5,17 @@
prj_mmpfiles
pjlib.mmp
-//pjlib_test.mmp
pjlib_util.mmp
pjnath.mmp
pjsdp.mmp
null_audio.mmp
-symbian_ua.mmp
+symbian_audio.mmp
pjmedia.mmp
pjsip.mmp
pjsip_simple.mmp
pjsip_ua.mmp
pjsua_lib.mmp
+
+pjlib_test.mmp
+symbian_ua.mmp
+symsndtest.mmp
diff --git a/build.symbian/null_audio.mmp b/build.symbian/null_audio.mmp
index 9676335..ea935bb 100644
--- a/build.symbian/null_audio.mmp
+++ b/build.symbian/null_audio.mmp
@@ -1,8 +1,9 @@
-#if defined(EKA2)
+#if defined(PJ_BUILD_DLL)
TARGET null_audio.dll
TARGETTYPE dll
-UID 0x1000008d 0xA0004294
+UID 0x0 0xA0000000
+
CAPABILITY None
LIBRARY pjlib.lib charconv.lib euser.lib estlib.lib
@@ -15,8 +16,6 @@
TARGET null_audio.lib
TARGETTYPE lib
-UID 0x100039CE 0x10004299
-VENDORID 0x70000001
#endif
diff --git a/build.symbian/pjlib.mmp b/build.symbian/pjlib.mmp
index 0ad219f..07cf0d9 100644
--- a/build.symbian/pjlib.mmp
+++ b/build.symbian/pjlib.mmp
@@ -1,8 +1,8 @@
-#if defined(EKA2)
-// ARM ABIv2 doesn't support static libraries anymore
+#if defined(PJ_BUILD_DLL)
TARGET pjlib.dll
TARGETTYPE dll
-UID 0x1000008d 0xA0004299
+UID 0x0 0xA0000001
+
CAPABILITY NONE
LIBRARY esock.lib insock.lib charconv.lib euser.lib estlib.lib
MACRO PJ_DLL
@@ -14,8 +14,7 @@
TARGET pjlib.lib
TARGETTYPE lib
-UID 0x100039CE 0x10004299
-//VENDORID 0x70000001
+
#endif
SOURCEPATH ..\pjlib\src\pj
diff --git a/build.symbian/pjlib_test.mmp b/build.symbian/pjlib_test.mmp
index 7c9bd53..4c859d8 100644
--- a/build.symbian/pjlib_test.mmp
+++ b/build.symbian/pjlib_test.mmp
@@ -1,15 +1,18 @@
TARGET pjlib_test.exe
TARGETTYPE exe
-UID 0x100039CE 0x10004299
-VENDORID 0x70000001
+UID 0x0 0xA0000002
+
SOURCEPATH ..\pjlib\src\pjlib-test
MACRO PJ_M_I386=1
MACRO PJ_SYMBIAN=1
-#if defined(EKA2)
+#if defined(PJ_BUILD_DLL)
MACRO PJ_DLL
+LIBRARY pjlib.lib
+#else
+STATICLIBRARY pjlib.lib
#endif
OPTION CW -lang c++
@@ -57,7 +60,8 @@
SYSTEMINCLUDE \epoc32\include
SYSTEMINCLUDE \epoc32\include\libc
-LIBRARY pjlib.lib esock.lib insock.lib charconv.lib euser.lib estlib.lib eexe.lib
-STATICLIBRARY ecrt0.lib
-CAPABILITY None
+LIBRARY esock.lib insock.lib charconv.lib euser.lib estlib.lib
+#ifdef WINSCW
+STATICLIBRARY eexe.lib ecrt0.lib
+#endif
diff --git a/build.symbian/pjlib_util.mmp b/build.symbian/pjlib_util.mmp
index 2d4b3d7..af5b86f 100644
--- a/build.symbian/pjlib_util.mmp
+++ b/build.symbian/pjlib_util.mmp
@@ -1,7 +1,8 @@
-#if defined(EKA2)
+#if defined(PJ_BUILD_DLL)
TARGET pjlib_util.dll
TARGETTYPE dll
-UID 0x1000008d 0xA0004298
+UID 0x0 0xA0000003
+
CAPABILITY NONE
LIBRARY pjlib.lib esock.lib insock.lib charconv.lib euser.lib estlib.lib
MACRO PJ_DLL
@@ -10,10 +11,9 @@
DEFFILE .\pjlib_util.def
#else
+
TARGET pjlib_util.lib
TARGETTYPE lib
-UID 0x100039CE 0x10004299
-//VENDORID 0x70000001
#endif
diff --git a/build.symbian/pjmedia.mmp b/build.symbian/pjmedia.mmp
index a8bab26..65c67b6 100644
--- a/build.symbian/pjmedia.mmp
+++ b/build.symbian/pjmedia.mmp
@@ -1,8 +1,9 @@
-#if defined(EKA2)
+#if defined(PJ_BUILD_DLL)
TARGET pjmedia.dll
TARGETTYPE dll
-UID 0x1000008d 0xA0004295
+UID 0x0 0xA0000004
+
CAPABILITY None
LIBRARY null_audio.lib pjsdp.lib pjnath.lib pjlib_util.lib pjlib.lib esock.lib insock.lib charconv.lib euser.lib estlib.lib
MACRO PJ_DLL
@@ -14,8 +15,6 @@
TARGET pjmedia.lib
TARGETTYPE lib
-UID 0x100039CE 0x10004299
-VENDORID 0x70000001
#endif
diff --git a/build.symbian/pjnath.mmp b/build.symbian/pjnath.mmp
index 4ab7c87..00a821e 100644
--- a/build.symbian/pjnath.mmp
+++ b/build.symbian/pjnath.mmp
@@ -1,7 +1,8 @@
-#if defined(EKA2)
+#if defined(PJ_BUILD_DLL)
TARGET pjnath.dll
TARGETTYPE dll
-UID 0x1000008d 0xA0004297
+UID 0x0 0xA0000005
+
CAPABILITY None
LIBRARY pjlib_util.lib pjlib.lib esock.lib insock.lib charconv.lib euser.lib estlib.lib
MACRO PJ_DLL
@@ -13,8 +14,6 @@
TARGET pjnath.lib
TARGETTYPE lib
-UID 0x100039CE 0x10004299
-VENDORID 0x70000001
#endif
@@ -63,6 +62,3 @@
SYSTEMINCLUDE \epoc32\include
SYSTEMINCLUDE \epoc32\include\libc
-//STATICLIBRARY pjlib.lib
-//STATICLIBRARY pjlib_util.lib
-
diff --git a/build.symbian/pjsdp.mmp b/build.symbian/pjsdp.mmp
index 3d5e4d5..23c8bd3 100644
--- a/build.symbian/pjsdp.mmp
+++ b/build.symbian/pjsdp.mmp
@@ -1,7 +1,8 @@
-#if defined(EKA2)
+#if defined(PJ_BUILD_DLL)
TARGET pjsdp.dll
TARGETTYPE dll
-UID 0x1000008d 0xA0004296
+UID 0x0 0xA0000006
+
CAPABILITY None
LIBRARY pjlib_util.lib pjlib.lib charconv.lib euser.lib estlib.lib
MACRO PJ_DLL
@@ -13,8 +14,6 @@
TARGET pjsdp.lib
TARGETTYPE lib
-UID 0x100039CE 0x10004299
-VENDORID 0x70000001
#endif
diff --git a/build.symbian/pjsip.mmp b/build.symbian/pjsip.mmp
index 513a7de..515a612 100644
--- a/build.symbian/pjsip.mmp
+++ b/build.symbian/pjsip.mmp
@@ -1,9 +1,10 @@
-#if defined(EKA2)
+#if defined(PJ_BUILD_DLL)
TARGET pjsip.dll
TARGETTYPE dll
-UID 0x1000008d 0xA0004293
+UID 0x0 0xA0000007
+
CAPABILITY None
LIBRARY pjsdp.lib pjlib_util.lib pjlib.lib esock.lib insock.lib charconv.lib euser.lib estlib.lib
@@ -16,8 +17,6 @@
TARGET pjsip.lib
TARGETTYPE lib
-UID 0x100039CE 0x10004299
-VENDORID 0x70000001
#endif
diff --git a/build.symbian/pjsip_simple.mmp b/build.symbian/pjsip_simple.mmp
index 86822c6..d44b0ca 100644
--- a/build.symbian/pjsip_simple.mmp
+++ b/build.symbian/pjsip_simple.mmp
@@ -1,9 +1,10 @@
-#if defined(EKA2)
+#if defined(PJ_BUILD_DLL)
TARGET pjsip_simple.dll
TARGETTYPE dll
-UID 0x1000008d 0xA0004292
+UID 0x0 0xA0000008
+
CAPABILITY None
LIBRARY pjsip.lib pjsdp.lib pjlib_util.lib pjlib.lib esock.lib insock.lib charconv.lib euser.lib estlib.lib
@@ -16,8 +17,6 @@
TARGET pjsip_simple.lib
TARGETTYPE lib
-UID 0x100039CE 0x10004299
-VENDORID 0x70000001
#endif
diff --git a/build.symbian/pjsip_ua.mmp b/build.symbian/pjsip_ua.mmp
index 6542c76..582873e 100644
--- a/build.symbian/pjsip_ua.mmp
+++ b/build.symbian/pjsip_ua.mmp
@@ -1,9 +1,10 @@
-#if defined(EKA2)
+#if defined(PJ_BUILD_DLL)
TARGET pjsip_ua.dll
TARGETTYPE dll
-UID 0x1000008d 0xA0004291
+UID 0x0 0xA0000009
+
CAPABILITY None
LIBRARY pjsip_simple.lib pjsip.lib pjsdp.lib pjlib_util.lib pjlib.lib esock.lib insock.lib charconv.lib euser.lib estlib.lib
@@ -16,8 +17,6 @@
TARGET pjsip_ua.lib
TARGETTYPE lib
-UID 0x100039CE 0x10004299
-VENDORID 0x70000001
#endif
diff --git a/build.symbian/pjstun_client.mmp b/build.symbian/pjstun_client.mmp
index 2c9d352..37b855d 100644
--- a/build.symbian/pjstun_client.mmp
+++ b/build.symbian/pjstun_client.mmp
@@ -1,7 +1,6 @@
TARGET pjstun_client.exe
TARGETTYPE exe
-UID 0x100039CE 0x10004299
-VENDORID 0x70000001
+UID 0x0 0xA000000A
SOURCEPATH ..\pjnath\src\pjstun-client
@@ -26,7 +25,19 @@
SYSTEMINCLUDE \epoc32\include
SYSTEMINCLUDE \epoc32\include\libc
-LIBRARY pjnath.lib pjlib_util.lib pjlib.lib esock.lib insock.lib charconv.lib euser.lib estlib.lib eexe.lib
-STATICLIBRARY ecrt0.lib
+#if defined(PJ_BUILD_DLL)
+MACRO PJ_DLL
+LIBRARY pjnath.lib pjlib_util.lib pjlib.lib
+#else
+STATICLIBRARY pjnath.lib pjlib_util.lib pjlib.lib
+#endif
+
+LIBRARY esock.lib insock.lib charconv.lib euser.lib estlib.lib
+
+#ifdef WINSCW
+STATICLIBRARY eexe.lib ecrt0.lib
+#endif
+
+
CAPABILITY None
diff --git a/build.symbian/pjsua_lib.mmp b/build.symbian/pjsua_lib.mmp
index 97bc38f..5e8113d 100644
--- a/build.symbian/pjsua_lib.mmp
+++ b/build.symbian/pjsua_lib.mmp
@@ -1,9 +1,10 @@
-#if defined(EKA2)
+#if defined(PJ_BUILD_DLL)
TARGET pjsua_lib.dll
TARGETTYPE dll
-UID 0x1000008d 0xA0004290
+UID 0x0 0xA000000B
+
CAPABILITY None
LIBRARY pjsip_ua.lib pjsip_simple.lib pjsip.lib pjmedia.lib null_audio.lib pjsdp.lib pjnath.lib pjlib_util.lib pjlib.lib esock.lib insock.lib charconv.lib euser.lib estlib.lib
@@ -16,8 +17,6 @@
TARGET pjsua_lib.lib
TARGETTYPE lib
-UID 0x100039CE 0x10004299
-VENDORID 0x70000001
#endif
diff --git a/build.symbian/symbian_audio.mmp b/build.symbian/symbian_audio.mmp
index 5a86c30..deeb79f 100644
--- a/build.symbian/symbian_audio.mmp
+++ b/build.symbian/symbian_audio.mmp
@@ -1,8 +1,8 @@
-#if defined(EKA2)
+#if defined(PJ_BUILD_DLL)
TARGET symbian_audio.dll
TARGETTYPE dll
-UID 0x1000008d 0xA0004288
+UID 0x0 0xA000000C
CAPABILITY None
LIBRARY pjlib.lib charconv.lib euser.lib estlib.lib
@@ -18,8 +18,6 @@
TARGET symbian_audio.lib
TARGETTYPE lib
-UID 0x100039CE 0x10004288
-VENDORID 0x70000001
#endif
diff --git a/build.symbian/symbian_ua.mmp b/build.symbian/symbian_ua.mmp
index 4a92f53..7a048c4 100644
--- a/build.symbian/symbian_ua.mmp
+++ b/build.symbian/symbian_ua.mmp
@@ -1,15 +1,17 @@
TARGET symbian_ua.exe
TARGETTYPE exe
-UID 0x100039CE 0x10004289
-VENDORID 0x70000001
+UID 0x0 0xA000000D
SOURCEPATH ..\pjsip-apps\src\symbian_ua
MACRO PJ_M_I386=1
MACRO PJ_SYMBIAN=1
-MACRO PJ_DLL=1
-// Test files
+#if defined(PJ_BUILD_DLL)
+ MACRO PJ_DLL=1
+#endif
+
+// Source files
SOURCE ua.cpp
SOURCE main_symbian.cpp
@@ -25,7 +27,29 @@
SYSTEMINCLUDE \epoc32\include
SYSTEMINCLUDE \epoc32\include\libc
-LIBRARY esock.lib insock.lib charconv.lib euser.lib estlib.lib eexe.lib
-LIBRARY null_audio.lib 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
+#if defined(PJ_BUILD_DLL)
+ LIBRARY pjsua_lib.lib pjsip_ua.lib
+ LIBRARY pjsip_simple.lib pjsip.lib pjsdp.lib pjmedia.lib
+ LIBRARY pjnath.lib pjlib_util.lib pjlib.lib
+ LIBRARY symbian_audio.lib
+#else
+ STATICLIBRARY pjsua_lib.lib pjsip_ua.lib
+ STATICLIBRARY pjsip_simple.lib pjsip.lib pjsdp.lib pjmedia.lib
+ STATICLIBRARY pjnath.lib pjlib_util.lib pjlib.lib
+ STATICLIBRARY symbian_audio.lib
+#endif
+
+#ifdef WINSCW
+ STATICLIBRARY eexe.lib ecrt0.lib
+#endif
+
+LIBRARY esock.lib insock.lib charconv.lib euser.lib estlib.lib
+LIBRARY mediaclientaudiostream.lib
+LIBRARY mediaclientaudioinputstream.lib
+
+CAPABILITY NetworkServices LocalServices ReadUserData WriteUserData UserEnvironment
+
+START RESOURCE symbian_ua_reg.rss
+ TARGETPATH \private\10003a3f\apps
+END
diff --git a/build.symbian/symbian_ua.pkg b/build.symbian/symbian_ua.pkg
new file mode 100644
index 0000000..887b17e
--- /dev/null
+++ b/build.symbian/symbian_ua.pkg
@@ -0,0 +1,18 @@
+; symbian_ua.pkg
+
+; Languages
+&EN
+
+; Header
+#{"symbian_ua"},(0xA000000E), 0, 1, 1
+
+; Platform compatibility
+[0x101F7961], *, *, *,{"Series60ProductID"}
+
+; vendor
+%{"PJSIP"}
+:"PJSIP"
+
+; Target
+"C:\Symbian\9.1\S60_3rd_MR\epoc32\release\gcce\UDEB\symbian_ua.exe"-"!:\sys\bin\symbian_ua.exe"
+"C:\Symbian\9.1\S60_3rd_MR\epoc32\data\z\private\10003a3f\apps\symbian_ua_reg.rSC"-"!:\private\10003a3f\import\apps\symbian_ua_reg.rSC"
diff --git a/build.symbian/symsndtest.mmp b/build.symbian/symsndtest.mmp
index ad659f9..daea700 100644
--- a/build.symbian/symsndtest.mmp
+++ b/build.symbian/symsndtest.mmp
@@ -1,13 +1,15 @@
TARGET symsndtest.exe
TARGETTYPE exe
-UID 0x100039CE 0x10004287
-VENDORID 0x70000001
+UID 0x0 0xA000000E
SOURCEPATH ..\pjsip-apps\src\symsndtest
MACRO PJ_M_I386=1
MACRO PJ_SYMBIAN=1
-MACRO PJ_DLL=1
+
+#if defined(PJ_BUILD_DLL)
+ MACRO PJ_DLL=1
+#endif
// Test files
@@ -20,7 +22,25 @@
SYSTEMINCLUDE \epoc32\include
SYSTEMINCLUDE \epoc32\include\libc
-LIBRARY charconv.lib euser.lib estlib.lib eexe.lib
-LIBRARY symbian_audio.lib pjlib.lib ecrt0.lib
-CAPABILITY None
+LIBRARY charconv.lib euser.lib estlib.lib
+
+#if defined(PJ_BUILD_DLL)
+ LIBRARY symbian_audio.lib pjlib.lib
+#else
+ STATICLIBRARY symbian_audio.lib pjlib.lib
+#endif
+
+LIBRARY esock.lib insock.lib
+LIBRARY mediaclientaudiostream.lib
+LIBRARY mediaclientaudioinputstream.lib
+
+#ifdef WINSCW
+ STATICLIBRARY eexe.lib ecrt0.lib
+#endif
+
+CAPABILITY NetworkServices LocalServices ReadUserData WriteUserData UserEnvironment
+
+START RESOURCE symsndtest_reg.rss
+ TARGETPATH \private\10003a3f\apps
+END
diff --git a/build.symbian/symsndtest.pkg b/build.symbian/symsndtest.pkg
new file mode 100644
index 0000000..5a26ee8
--- /dev/null
+++ b/build.symbian/symsndtest.pkg
@@ -0,0 +1,19 @@
+; symsndtest.pkg
+
+; Languages
+&EN
+
+; Header
+#{"symsndtest"},(0xA000000F), 0, 1, 1
+
+; Platform compatibility
+[0x101F7961], *, *, *, {"Series60ProductID"}
+
+; vendor
+%{"PJSIP"}
+:"PJSIP"
+
+; Target
+"C:\Symbian\9.1\S60_3rd_MR\Epoc32\release\gcce\UDEB\symsndtest.exe"-"!:\sys\bin\symsndtest.exe"
+"C:\Symbian\9.1\S60_3rd_MR\Epoc32\data\z\private\10003a3f\apps\symsndtest_reg.rSC"-"!:\private\10003a3f\import\apps\symsndtest_reg.rSC"
+
diff --git a/pjsip-apps/src/symbian_ua/symbian_ua_reg.rss b/pjsip-apps/src/symbian_ua/symbian_ua_reg.rss
new file mode 100644
index 0000000..18db8d6
--- /dev/null
+++ b/pjsip-apps/src/symbian_ua/symbian_ua_reg.rss
@@ -0,0 +1,10 @@
+#include <appinfo.rh>
+
+UID2 KUidAppRegistrationResourceFile
+UID3 0xA000000E
+
+RESOURCE APP_REGISTRATION_INFO
+{
+ app_file="symbian_ua";
+}
+
diff --git a/pjsip-apps/src/symsndtest/symsndtest_reg.rss b/pjsip-apps/src/symsndtest/symsndtest_reg.rss
new file mode 100644
index 0000000..df51957
--- /dev/null
+++ b/pjsip-apps/src/symsndtest/symsndtest_reg.rss
@@ -0,0 +1,10 @@
+#include <appinfo.rh>
+
+UID2 KUidAppRegistrationResourceFile
+UID3 0xA000000F
+
+RESOURCE APP_REGISTRATION_INFO
+{
+ app_file="symsndtest";
+}
+