diff options
| -rw-r--r-- | build.symbian/symbian_ua.mmp | 163 | ||||
| -rw-r--r-- | pjsip-apps/src/symbian_ua_gui/group/symbian_ua_gui.mmp | 3 | ||||
| -rwxr-xr-x | tests/automated/configure.py | 6 | ||||
| -rw-r--r-- | tests/automated/gnu.xml.template | 8 | ||||
| -rw-r--r-- | tests/automated/msvc.xml.template | 14 | ||||
| -rw-r--r-- | tests/automated/symbian-aps.xml.template | 78 | ||||
| -rw-r--r-- | tests/automated/symbian-vas.xml.template | 79 | ||||
| -rw-r--r-- | tests/automated/symbian.xml.template | 7 |
8 files changed, 262 insertions, 96 deletions
diff --git a/build.symbian/symbian_ua.mmp b/build.symbian/symbian_ua.mmp index fc5c8aee..666d0453 100644 --- a/build.symbian/symbian_ua.mmp +++ b/build.symbian/symbian_ua.mmp @@ -1,80 +1,83 @@ -#define SND_HAS_APS 0 -#define SND_HAS_VAS 0 -#define SND_HAS_MDA 1 - -TARGET symbian_ua.exe -TARGETTYPE exe -//UID 0x0 0x200235D3 -UID 0x0 0xA000000D - -SOURCEPATH ..\pjsip-apps\src\symbian_ua - -OPTION ARMCC --gnu - -MACRO PJ_M_I386=1 -MACRO PJ_SYMBIAN=1 - -// Source files - -SOURCE ua.cpp -SOURCE main_symbian.cpp - -DOCUMENT ua.h - -START RESOURCE symbian_ua_reg.rss - TARGETPATH \private\10003a3f\apps -END - -SYSTEMINCLUDE ..\pjlib\include -SYSTEMINCLUDE ..\pjlib-util\include -SYSTEMINCLUDE ..\pjnath\include -SYSTEMINCLUDE ..\pjmedia\include -SYSTEMINCLUDE ..\pjsip\include - -SYSTEMINCLUDE \epoc32\include -SYSTEMINCLUDE \epoc32\include\libc - -// Ordering static libs based on dependencies, most to least dependent, -// this could be necessary for some SDKs, e.g: S60 3rd MR -STATICLIBRARY pjsua_lib.lib -STATICLIBRARY pjsip_ua.lib pjsip_simple.lib pjsip.lib -STATICLIBRARY libgsmcodec.lib libspeexcodec.lib -STATICLIBRARY libg7221codec.lib libpassthroughcodec.lib -STATICLIBRARY pjmedia.lib -STATICLIBRARY pjmedia_audiodev.lib -STATICLIBRARY pjsdp.lib -STATICLIBRARY pjnath.lib -STATICLIBRARY pjlib_util.lib pjlib.lib -STATICLIBRARY libsrtp.lib -STATICLIBRARY libresample.lib - -#if SND_HAS_APS - LIBRARY APSSession2.lib -#endif - -#if SND_HAS_VAS - LIBRARY VoIPAudioIntfc.lib -#endif - -#if SND_HAS_MDA - LIBRARY mediaclientaudiostream.lib - LIBRARY mediaclientaudioinputstream.lib -#endif - -#if SND_HAS_APS || SND_HAS_VAS - CAPABILITY NetworkServices LocalServices ReadUserData WriteUserData UserEnvironment MultimediaDD -#else - CAPABILITY NetworkServices LocalServices ReadUserData WriteUserData UserEnvironment -#endif - -#ifdef WINSCW - STATICLIBRARY eexe.lib ecrt0.lib -#endif - -LIBRARY esock.lib insock.lib charconv.lib euser.lib estlib.lib commdb.lib apengine.lib -LIBRARY securesocket.lib x509.lib crypto.lib x500.lib - -// The default 8KB seems to be insufficient with all bells and -// whistles turned on -EPOCSTACKSIZE 12288 - +// These part may be overwritten by automated test
+// =BEGIN
+#define SND_HAS_APS 0
+#define SND_HAS_VAS 0
+#define SND_HAS_MDA 1
+// =END
+
+TARGET symbian_ua.exe
+TARGETTYPE exe
+//UID 0x0 0x200235D3
+UID 0x0 0xA000000D
+
+SOURCEPATH ..\pjsip-apps\src\symbian_ua
+
+OPTION ARMCC --gnu
+
+MACRO PJ_M_I386=1
+MACRO PJ_SYMBIAN=1
+
+// Source files
+
+SOURCE ua.cpp
+SOURCE main_symbian.cpp
+
+DOCUMENT ua.h
+
+START RESOURCE symbian_ua_reg.rss
+ TARGETPATH \private\10003a3f\apps
+END
+
+SYSTEMINCLUDE ..\pjlib\include
+SYSTEMINCLUDE ..\pjlib-util\include
+SYSTEMINCLUDE ..\pjnath\include
+SYSTEMINCLUDE ..\pjmedia\include
+SYSTEMINCLUDE ..\pjsip\include
+
+SYSTEMINCLUDE \epoc32\include
+SYSTEMINCLUDE \epoc32\include\libc
+
+// Ordering static libs based on dependencies, most to least dependent,
+// this could be necessary for some SDKs, e.g: S60 3rd MR
+STATICLIBRARY pjsua_lib.lib
+STATICLIBRARY pjsip_ua.lib pjsip_simple.lib pjsip.lib
+STATICLIBRARY libgsmcodec.lib libspeexcodec.lib
+STATICLIBRARY libg7221codec.lib libpassthroughcodec.lib
+STATICLIBRARY pjmedia.lib
+STATICLIBRARY pjmedia_audiodev.lib
+STATICLIBRARY pjsdp.lib
+STATICLIBRARY pjnath.lib
+STATICLIBRARY pjlib_util.lib pjlib.lib
+STATICLIBRARY libsrtp.lib
+STATICLIBRARY libresample.lib
+
+#if SND_HAS_APS
+ LIBRARY APSSession2.lib
+#endif
+
+#if SND_HAS_VAS
+ LIBRARY VoIPAudioIntfc.lib
+#endif
+
+#if SND_HAS_MDA
+ LIBRARY mediaclientaudiostream.lib
+ LIBRARY mediaclientaudioinputstream.lib
+#endif
+
+#if SND_HAS_APS || SND_HAS_VAS
+ CAPABILITY NetworkServices LocalServices ReadUserData WriteUserData UserEnvironment MultimediaDD
+#else
+ CAPABILITY NetworkServices LocalServices ReadUserData WriteUserData UserEnvironment
+#endif
+
+#ifdef WINSCW
+ STATICLIBRARY eexe.lib ecrt0.lib
+#endif
+
+LIBRARY esock.lib insock.lib charconv.lib euser.lib estlib.lib commdb.lib apengine.lib
+LIBRARY securesocket.lib x509.lib crypto.lib x500.lib
+
+// The default 8KB seems to be insufficient with all bells and
+// whistles turned on
+EPOCSTACKSIZE 12288
+
diff --git a/pjsip-apps/src/symbian_ua_gui/group/symbian_ua_gui.mmp b/pjsip-apps/src/symbian_ua_gui/group/symbian_ua_gui.mmp index 0f964ace..33930abb 100644 --- a/pjsip-apps/src/symbian_ua_gui/group/symbian_ua_gui.mmp +++ b/pjsip-apps/src/symbian_ua_gui/group/symbian_ua_gui.mmp @@ -1,6 +1,9 @@ +// The part below will be overwritten by automated test
+// =BEGIN
#define SND_HAS_APS 0
#define SND_HAS_VAS 0
#define SND_HAS_MDA 1
+// =END
TARGET symbian_ua_gui.exe
UID 0x100039CE 0xEBD12EE4
diff --git a/tests/automated/configure.py b/tests/automated/configure.py index 167f586b..06a65315 100755 --- a/tests/automated/configure.py +++ b/tests/automated/configure.py @@ -66,10 +66,14 @@ class VSVersion: self.version = "9" self.release = "2008" break - else: + elif major=="16": self.version = "10" self.release = "2010" break + else: + self.version = "11" + self.release = "2012" + break proc.wait() self.vs_version = "vs" + self.version self.vs_release = "vs" + self.release diff --git a/tests/automated/gnu.xml.template b/tests/automated/gnu.xml.template index 6e304b3a..888f5691 100644 --- a/tests/automated/gnu.xml.template +++ b/tests/automated/gnu.xml.template @@ -3,18 +3,18 @@ <Submit group="Experimental" build="$(SUFFIX)-$(GCC)-default" disabled="$(DISABLED)" > <Update /> - <Write file="user.mak"> + <FileWrite file="user.mak"> <![CDATA[ # Written by ccdash ]]> - </Write> - <Write file="pjlib/include/pj/config_site.h"> + </FileWrite> + <FileWrite file="pjlib/include/pj/config_site.h"> <![CDATA[ /* Written by ccdash */ #define PJ_HAS_IPV6 1 #define PJMEDIA_HAS_G7221_CODEC 1 ]]> - </Write> + </FileWrite> <Configure cmd="./aconfigure" /> <Build cmd="make dep && make distclean && make" /> <Test name="pjlib-test" info="" wdir="pjlib/bin" cmd="./pjlib-test-$(SUFFIX)" /> diff --git a/tests/automated/msvc.xml.template b/tests/automated/msvc.xml.template index 53da44b1..12af16e1 100644 --- a/tests/automated/msvc.xml.template +++ b/tests/automated/msvc.xml.template @@ -3,20 +3,20 @@ <Submit group="Experimental" build="$(OS)-$(VS)-$(VSTARGET)-default" > <Update /> - <Write file="pjlib/include/pj/config_site.h"> + <FileWrite file="pjlib/include/pj/config_site.h"> <![CDATA[ /* Written by ccdash */ #define PJ_HAS_IPV6 1 #define PJMEDIA_HAS_G7221_CODEC 1 ]]> - </Write> + </FileWrite> <Configure cmd="cmd /c echo success" /> <Build cmd='vcbuild.exe /nologo /nohtmllog /nocolor /rebuild pjproject-vs8.sln "$(VSTARGET)|Win32"' /> - <Test name="pjlib-test" info="" wdir="pjlib/bin" cmd="pjlib-test-i386-Win32-vs8-$(VSTARGET)" /> - <Test name="pjlib-util-test" info="" wdir="pjlib-util/bin" cmd="pjlib-util-test-i386-Win32-vs8-$(VSTARGET)" /> - <Test name="pjnath-test" info="" wdir="pjnath/bin" cmd="pjnath-test-i386-Win32-vs8-$(VSTARGET)" /> - <Test name="pjmedia-test" info="" wdir="pjmedia/bin" cmd="pjmedia-test-i386-Win32-vs8-$(VSTARGET)" /> - <Test name="pjsip-test" info="" wdir="pjsip/bin" cmd="pjsip-test-i386-Win32-vs8-$(VSTARGET)" /> + <Test name="pjlib-test" info="" wdir="pjlib/bin" cmd="pjlib-test-i386-Win32-vc8-$(VSTARGET)" /> + <Test name="pjlib-util-test" info="" wdir="pjlib-util/bin" cmd="pjlib-util-test-i386-Win32-vc8-$(VSTARGET)" /> + <Test name="pjnath-test" info="" wdir="pjnath/bin" cmd="pjnath-test-i386-Win32-vc8-$(VSTARGET)" /> + <Test name="pjmedia-test" info="" wdir="pjmedia/bin" cmd="pjmedia-test-i386-Win32-vc8-$(VSTARGET)" /> + <Test name="pjsip-test" info="" wdir="pjsip/bin" cmd="pjsip-test-i386-Win32-vc8-$(VSTARGET)" /> $(PJSUA-TESTS) </Submit> diff --git a/tests/automated/symbian-aps.xml.template b/tests/automated/symbian-aps.xml.template new file mode 100644 index 00000000..1a7befc8 --- /dev/null +++ b/tests/automated/symbian-aps.xml.template @@ -0,0 +1,78 @@ +<?xml version="1.0" ?> +<Scenario site="$(HOSTNAME)" url="http://my.cdash.org/submit.php?project=PJSIP" wdir="$(PJDIR)"> + <!-- ********************************************************* + ** This file contains scenario for APS and APS-Direct ** + ********************************************************* --> + + <!-- ****************************** + ** APS ** + ****************************** --> + <Submit group="Experimental" build="$(OS)-$(S60TARGETNAME)-APS" > + <Update /> + <!-- Configure config_site.h --> + <FileWrite file="pjlib/include/pj/config_site.h"> + <![CDATA[ +/* Written by ccdash */ +#define PJMEDIA_AUDIO_DEV_HAS_SYMB_APS 1 +#define PJMEDIA_AUDIO_DEV_HAS_SYMB_MDA 0 +#include <pj/config_site_sample.h> +]]> + </FileWrite> + <!-- Configure symbian_ua.mmp --> + <FileWrite file="build.symbian/symbian_ua.mmp" replace_begin="// =BEGIN" replace_end="// =END"> + <![CDATA[ +#define SND_HAS_APS 1 +#define SND_HAS_VAS 0 +#define SND_HAS_MDA 0 +]]> + </FileWrite> + <!-- Configure symbian_ua_gui.mmp --> + <FileWrite file="pjsip-apps/src/symbian_ua_gui/group/symbian_ua_gui.mmp" replace_begin="// =BEGIN" replace_end="// =END"> + <![CDATA[ +#define SND_HAS_APS 1 +#define SND_HAS_VAS 0 +#define SND_HAS_MDA 0 +]]> + </FileWrite> + <Configure cmd="cmd /c echo success" /> + <Build wdir="build.symbian" cmd='cmd /C "bldmake bldfiles && abld reallyclean $(S60TARGET) && abld build $(S60TARGET)"' /> + </Submit> + + + <!-- ****************************** + ** APS-Direct ** + ****************************** --> + <Submit group="Experimental" build="$(OS)-$(S60TARGETNAME)-APS-Direct" > + <Update /> + <!-- Configure config_site.h --> + <FileWrite file="pjlib/include/pj/config_site.h"> + <![CDATA[ +/* Written by ccdash */ +#define PJ_CONFIG_NOKIA_APS_DIRECT +#include <pj/config_site_sample.h> +]]> + </FileWrite> + <Configure cmd="cmd /c echo success" /> + <Build wdir="build.symbian" cmd='cmd /C "bldmake bldfiles && abld reallyclean $(S60TARGET) && abld build $(S60TARGET)"' /> + + <!-- Restore symbian_ua.mmp --> + <FileWrite file="build.symbian/symbian_ua.mmp" replace_begin="// =BEGIN" replace_end="// =END"> + <![CDATA[ +#define SND_HAS_APS 0 +#define SND_HAS_VAS 0 +#define SND_HAS_MDA 1 +]]> + </FileWrite> + <!-- Restore symbian_ua_gui.mmp --> + <FileWrite file="pjsip-apps/src/symbian_ua_gui/group/symbian_ua_gui.mmp" replace_begin="// =BEGIN" replace_end="// =END"> + <![CDATA[ +#define SND_HAS_APS 0 +#define SND_HAS_VAS 0 +#define SND_HAS_MDA 1 +]]> + </FileWrite> + + </Submit> + +</Scenario> + diff --git a/tests/automated/symbian-vas.xml.template b/tests/automated/symbian-vas.xml.template new file mode 100644 index 00000000..119d1e56 --- /dev/null +++ b/tests/automated/symbian-vas.xml.template @@ -0,0 +1,79 @@ +<?xml version="1.0" ?> +<Scenario site="$(HOSTNAME)" url="http://my.cdash.org/submit.php?project=PJSIP" wdir="$(PJDIR)"> + <!-- ********************************************************* + ** This file contains scenario for VAS and VAS-Direct ** + ********************************************************* --> + + <!-- ****************************** + ** VAS ** + ****************************** --> + <Submit group="Experimental" build="$(OS)-$(S60TARGETNAME)-VAS1" > + <Update /> + <!-- Configure config_site.h --> + <FileWrite file="pjlib/include/pj/config_site.h"> + <![CDATA[ +/* Written by ccdash */ +#define PJMEDIA_AUDIO_DEV_HAS_SYMB_VAS 1 +#define PJMEDIA_AUDIO_DEV_HAS_SYMB_APS 0 +#define PJMEDIA_AUDIO_DEV_HAS_SYMB_MDA 0 +#include <pj/config_site_sample.h> +]]> + </FileWrite> + <!-- Configure symbian_ua.mmp --> + <FileWrite file="build.symbian/symbian_ua.mmp" replace_begin="// =BEGIN" replace_end="// =END"> + <![CDATA[ +#define SND_HAS_APS 0 +#define SND_HAS_VAS 1 +#define SND_HAS_MDA 0 +]]> + </FileWrite> + <!-- Configure symbian_ua_gui.mmp --> + <FileWrite file="pjsip-apps/src/symbian_ua_gui/group/symbian_ua_gui.mmp" replace_begin="// =BEGIN" replace_end="// =END"> + <![CDATA[ +#define SND_HAS_APS 0 +#define SND_HAS_VAS 1 +#define SND_HAS_MDA 0 +]]> + </FileWrite> + <Configure cmd="cmd /c echo success" /> + <Build wdir="build.symbian" cmd='cmd /C "bldmake bldfiles && abld reallyclean $(S60TARGET) && abld build $(S60TARGET)"' /> + </Submit> + + + <!-- ****************************** + ** VAS-Direct ** + ****************************** --> + <Submit group="Experimental" build="$(OS)-$(S60TARGETNAME)-VAS1-Direct" > + <Update /> + <!-- Configure config_site.h --> + <FileWrite file="pjlib/include/pj/config_site.h"> + <![CDATA[ +/* Written by ccdash */ +#define PJ_CONFIG_NOKIA_VAS_DIRECT +#include <pj/config_site_sample.h> +]]> + </FileWrite> + <Configure cmd="cmd /c echo success" /> + <Build wdir="build.symbian" cmd='cmd /C "bldmake bldfiles && abld reallyclean $(S60TARGET) && abld build $(S60TARGET)"' /> + + <!-- Restore symbian_ua.mmp --> + <FileWrite file="build.symbian/symbian_ua.mmp" replace_begin="// =BEGIN" replace_end="// =END"> + <![CDATA[ +#define SND_HAS_APS 0 +#define SND_HAS_VAS 0 +#define SND_HAS_MDA 1 +]]> + </FileWrite> + <!-- Restore symbian_ua_gui.mmp --> + <FileWrite file="pjsip-apps/src/symbian_ua_gui/group/symbian_ua_gui.mmp" replace_begin="// =BEGIN" replace_end="// =END"> + <![CDATA[ +#define SND_HAS_APS 0 +#define SND_HAS_VAS 0 +#define SND_HAS_MDA 1 +]]> + </FileWrite> + + </Submit> + +</Scenario> + diff --git a/tests/automated/symbian.xml.template b/tests/automated/symbian.xml.template index 6cac8cee..4e87f18b 100644 --- a/tests/automated/symbian.xml.template +++ b/tests/automated/symbian.xml.template @@ -1,9 +1,9 @@ <?xml version="1.0" ?> <Scenario site="$(HOSTNAME)" url="http://my.cdash.org/submit.php?project=PJSIP" wdir="$(PJDIR)"> - + <!-- Symbian S60 default --> <Submit group="Experimental" build="$(OS)-$(S60TARGETNAME)-default" > <Update disabled="1" /> - <Write file="pjlib/include/pj/config_site.h"> + <FileWrite file="pjlib/include/pj/config_site.h"> <![CDATA[ /* Written by ccdash */ #include <pj/config_site_sample.h> @@ -12,10 +12,9 @@ #undef PJMEDIA_HAS_G7221_CODEC #define PJMEDIA_HAS_G7221_CODEC 1 ]]> - </Write> + </FileWrite> <Configure cmd="cmd /c echo success" /> <Build wdir="build.symbian" cmd='cmd /C "bldmake bldfiles && abld reallyclean $(S60TARGET) && abld build $(S60TARGET)"' /> </Submit> - </Scenario> |