# HG changeset patch # User Brendan Donegan brendand@symbian.org # Date 1253546300 -3600 # Node ID f8a0be15f7908ab82b9774000646a5474dae2450 # Parent b6c4098af3f09e1247d637f70430f22cf554b50b# Parent 0af8245d50a0c7414a20fb362d22ab24ff51f567 merge diff -r 0af8245d50a0 -r f8a0be15f790 common/build.postbuild.xml --- a/common/build.postbuild.xml Fri Sep 18 11:41:08 2009 +0100 +++ b/common/build.postbuild.xml Mon Sep 21 16:18:20 2009 +0100 @@ -3,38 +3,45 @@ [SF-POSTBUILD] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -42,17 +49,17 @@ - - - - + - + + + + @@ -228,19 +235,10 @@ - - - - - - - - - - - - - + + + + @@ -249,7 +247,6 @@ - @@ -455,6 +452,7 @@ + @@ -476,6 +474,58 @@ + + + + + + + + + + + == Mercurial Comparison == + + + + + + The Mercurial changes from Nokia were delivered as a bulk update based on '''XXXXXXXXXXXXXXXXXXXXXX'''. + +List of the Mercurial changes (files added/removed/modified) between ${sf.previous.pdk.tag} and PDK '''XXXXX''' - [[Media:XXXX.txt]]. + +A short study of the results concentrating on the added and removed files has identified these significant package changes: + + + + + + '''Information cannot be derived as source was synced with archive option'''" + + + + + + + + + + + + + + + '''Information cannot be provided as the tag for the previous PDK was not provided to the build'''" + + + + + + + + + + @@ -490,6 +540,8 @@ + + diff -r 0af8245d50a0 -r f8a0be15f790 common/build.test.xml --- a/common/build.test.xml Fri Sep 18 11:41:08 2009 +0100 +++ b/common/build.test.xml Mon Sep 21 16:18:20 2009 +0100 @@ -1,6 +1,9 @@ + + + diff -r 0af8245d50a0 -r f8a0be15f790 common/build.xml --- a/common/build.xml Fri Sep 18 11:41:08 2009 +0100 +++ b/common/build.xml Mon Sep 21 16:18:20 2009 +0100 @@ -229,31 +229,23 @@ - - - - + - - + - - - - + - - + @@ -419,47 +411,30 @@ - - - - - - - ant: antProperties() - config: csv(${build.drive}/output/logs/BOM/config.csv,{separator:',',headers:[loc,dst,rev]}) - project: csv(${build.drive}/output/logs/BOM/project.csv,{separator:',',headers:[loc,dst,rev]}) - baseline: slicedText(${build.drive}/output/logs/BOM/baseline.txt,{trim}) - toolsbaseline: slicedText(${build.drive}/output/logs/BOM/toolsbaseline.txt,{trim}) - sources: csv(${build.drive}/output/logs/BOM/sources.csv,{separator:',',headers:[loc,dst,type,rev,sysdef]}) - - - - - - + + + + ant: antProperties() + config: csv(${build.drive}/output/logs/BOM/config.csv,{separator:',',headers:[loc,dst,rev]}) + project: csv(${build.drive}/output/logs/BOM/project.csv,{separator:',',headers:[loc,dst,rev]}) + baseline: slicedText(${build.drive}/output/logs/BOM/baseline.txt,{trim}) + toolsbaseline: slicedText(${build.drive}/output/logs/BOM/toolsbaseline.txt,{trim}) + sources: csv(${build.drive}/output/logs/BOM/sources.csv,{separator:',',headers:[loc,dst,type,rev,sysdef]}) + + + + - - - - - - - - - - - - @@ -470,27 +445,50 @@ - + + + + + - + - - - - - + + + + + + + + + + + + + + + - + - - - - - - - + + + + + + + + + + + + + + + + diff -r 0af8245d50a0 -r f8a0be15f790 common/templates/zip.cfg.xml.ftl.template --- a/common/templates/zip.cfg.xml.ftl.template Fri Sep 18 11:41:08 2009 +0100 +++ b/common/templates/zip.cfg.xml.ftl.template Mon Sep 21 16:18:20 2009 +0100 @@ -19,14 +19,14 @@ - + + + + + + + - - - - - - @@ -34,17 +34,16 @@ - - - + - + + @@ -96,6 +95,15 @@ + + + + + + + + + @@ -106,5 +114,10 @@ + + + + + diff -r 0af8245d50a0 -r f8a0be15f790 common/tools/ats/STAF/STAF_security.txt --- a/common/tools/ats/STAF/STAF_security.txt Fri Sep 18 11:41:08 2009 +0100 +++ b/common/tools/ats/STAF/STAF_security.txt Mon Sep 21 16:18:20 2009 +0100 @@ -5,5 +5,5 @@ TRUST LEVEL 5 MACHINE lon-engbuild89.* TRUST LEVEL 5 MACHINE C100725 TRUST LEVEL 5 MACHINE C100726 -TRUST LEVEL 5 MACHINE UK-ARNAUDL.* +TRUST LEVEL 5 MACHINE UK-BRENDAND.* TRUST LEVEL 5 MACHINE V800017.* \ No newline at end of file diff -r 0af8245d50a0 -r f8a0be15f790 common/tools/ats/bctest/base/basesvs.pl --- a/common/tools/ats/bctest/base/basesvs.pl Fri Sep 18 11:41:08 2009 +0100 +++ b/common/tools/ats/bctest/base/basesvs.pl Mon Sep 21 16:18:20 2009 +0100 @@ -13,98 +13,98 @@ my $epoc=$ENV{'EPOCROOT'} . "epoc32/"; copy("test.xml", "temp/test.xml"); -copy $epoc . "release/winscw/udeb/t_fat32server.exe", "temp/basesvs/winscw_udeb/t_fat32server.exe"; -copy $epoc . "release/winscw/udeb/t_perf.exe", "temp/basesvs/winscw_udeb/t_perf.exe"; -copy $epoc . "release/winscw/udeb/t_prompt.exe", "temp/basesvs/winscw_udeb/t_prompt.exe"; -copy $epoc . "release/winscw/udeb/t_sfsrv.exe", "temp/basesvs/winscw_udeb/t_sfsrv.exe"; -copy $epoc . "release/winscw/udeb/t_testfsy1.fsy", "temp/basesvs/winscw_udeb/t_testfsy1.fsy"; -copy $epoc . "release/winscw/udeb/t_testfxt.fxt", "temp/basesvs/winscw_udeb/t_testfxt.fxt"; +copy $epoc . "release/winscw/udeb/t_fat32server.exe", "temp/basesvs/winscw_udeb/t_fat32server.exe" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/t_perf.exe", "temp/basesvs/winscw_udeb/t_perf.exe" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/t_prompt.exe", "temp/basesvs/winscw_udeb/t_prompt.exe" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/t_sfsrv.exe", "temp/basesvs/winscw_udeb/t_sfsrv.exe" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/t_testfsy1.fsy", "temp/basesvs/winscw_udeb/t_testfsy1.fsy" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/t_testfxt.fxt", "temp/basesvs/winscw_udeb/t_testfxt.fxt" or die "failed : $!"; -copy $epoc . "release/winscw/udeb/z/base/pbase-f32-driveunit-publicapi-any.script", "temp/basesvs/base/general/pbase-f32-driveunit-publicapi-any.script"; -copy $epoc . "release/winscw/udeb/z/base/pbase-f32-format-publicapi-ram.script", "temp/basesvs/base/general/pbase-f32-format-publicapi-ram.script"; -#copy $epoc . "release/winscw/udeb/z/base/pbase-f32-format-publicapi-rem.script", "temp/basesvs/base/general/pbase-f32-format-publicapi-rem.script"; -copy $epoc . "release/winscw/udeb/z/base/pbase-f32-format-publicapi-rom.script", "temp/basesvs/base/general/pbase-f32-format-publicapi-rom.script"; -copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rawdisk-publicapi-ram.script", "temp/basesvs/base/general/pbase-f32-rawdisk-publicapi-ram.script"; -#copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rawdisk-publicapi-rem.script", "temp/basesvs/base/general/pbase-f32-rawdisk-publicapi-rem.script"; -copy $epoc . "release/winscw/udeb/z/base/pbase-f32-dir-publicapi-ram.script", "temp/basesvs/base/general/pbase-f32-dir-publicapi-ram.script"; -copy $epoc . "release/winscw/udeb/z/base/pbase-f32-dirscan-publicapi-ram.script", "temp/basesvs/base/general/pbase-f32-dirscan-publicapi-ram.script"; -copy $epoc . "release/winscw/udeb/z/base/pbase-f32-file-publicapi-ram.script", "temp/basesvs/base/general/pbase-f32-file-publicapi-ram.script"; -copy $epoc . "release/winscw/udeb/z/base/pbase-f32-fileman-publicapi-ram.script", "temp/basesvs/base/general/pbase-f32-fileman-publicapi-ram.script"; -copy $epoc . "release/winscw/udeb/z/base/pbase-f32-fileman-publicapi-os.script", "temp/basesvs/base/general/pbase-f32-fileman-publicapi-os.script"; -copy $epoc . "release/winscw/udeb/z/base/pbase-f32-filenamesidentical-publicapi-ram.script", "temp/basesvs/base/general/pbase-f32-filenamesidentical-publicapi-ram.script"; -copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rdir-publicapi-ram.script", "temp/basesvs/base/general/pbase-f32-rdir-publicapi-ram.script"; -copy $epoc . "release/winscw/udeb/z/base/pbase-f32-entry-publicapi-ram.script", "temp/basesvs/base/general/pbase-f32-entry-publicapi-ram.script"; -copy $epoc . "release/winscw/udeb/z/base/pbase-f32-filetext-publicapi-ram.script", "temp/basesvs/base/general/pbase-f32-filetext-publicapi-ram.script"; -copy $epoc . "release/winscw/udeb/z/base/pbase-f32-volumeinfo-publicapi-any.script", "temp/basesvs/base/general/pbase-f32-volumeinfo-publicapi-any.script"; -copy $epoc . "release/winscw/udeb/z/base/pbase-f32-parse-publicapi-any.script", "temp/basesvs/base/general/pbase-f32-parse-publicapi-any.script"; -copy $epoc . "release/winscw/udeb/z/base/pbase-f32-parseptr-publicapi-any.script", "temp/basesvs/base/general/pbase-f32-parseptr-publicapi-any.script"; -copy $epoc . "release/winscw/udeb/z/base/pbase-f32-parseptrc-publicapi-any.script", "temp/basesvs/base/general/pbase-f32-parseptrc-publicapi-any.script"; -copy $epoc . "release/winscw/udeb/z/base/pbase-f32-parse-inherited-publicapi-any.script", "temp/basesvs/base/general/pbase-f32-parse-inherited-publicapi-any.script"; -copy $epoc . "release/winscw/udeb/z/base/pbase-f32-parseptr-inherited-publicapi-any.script", "temp/basesvs/base/general/pbase-f32-parseptr-inherited-publicapi-any.script"; -copy $epoc . "release/winscw/udeb/z/base/pbase-f32-parseptrc-inherited-publicapi-any.script", "temp/basesvs/base/general/pbase-f32-parseptrc-inherited-publicapi-any.script"; -copy $epoc . "release/winscw/udeb/z/base/pbase-f32-entryarray-publicapi-ram.script", "temp/basesvs/base/general/pbase-f32-entryarray-publicapi-ram.script"; -copy $epoc . "release/winscw/udeb/z/base/pbase-f32-findfile-publicapi-os.script", "temp/basesvs/base/general/pbase-f32-findfile-publicapi-os.script"; -copy $epoc . "release/winscw/udeb/z/base/pbase-f32-findfile-publicapi-rem.script", "temp/basesvs/base/general/pbase-f32-findfile-publicapi-rem.script"; -copy $epoc . "release/winscw/udeb/z/base/pbase-f32-openfilescan-publicapi-ram.script", "temp/basesvs/base/general/pbase-f32-openfilescan-publicapi-ram.script"; -copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-drives-publicapi-any.script", "temp/basesvs/base/general/pbase-f32-rfs-drives-publicapi-any.script"; -copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-files-publicapi-any.script", "temp/basesvs/base/general/pbase-f32-rfs-files-publicapi-any.script"; -copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-misc-publicapi-any.script", "temp/basesvs/base/general/pbase-f32-rfs-misc-publicapi-any.script"; -copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-mounts-publicapi-any.script", "temp/basesvs/base/general/pbase-f32-rfs-mounts-publicapi-any.script"; -copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-publicapi-os.script", "temp/basesvs/base/general/pbase-f32-rfs-publicapi-os.script"; -copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-drives-publicapi-ram.script", "temp/basesvs/base/general/pbase-f32-rfs-drives-publicapi-ram.script"; -copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-files-publicapi-ram.script", "temp/basesvs/base/general/pbase-f32-rfs-files-publicapi-ram.script"; -copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-misc-publicapi-ram.script", "temp/basesvs/base/general/pbase-f32-rfs-misc-publicapi-ram.script"; -copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-mounts-publicapi-ram.script", "temp/basesvs/base/general/pbase-f32-rfs-mounts-publicapi-ram.script"; -copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-publicapi-rom.script", "temp/basesvs/base/general/pbase-f32-rfs-publicapi-rom.script"; -copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-drives-publicapi-rem.script", "temp/basesvs/base/general/pbase-f32-rfs-drives-publicapi-rem.script"; +copy $epoc . "release/winscw/udeb/z/base/pbase-f32-driveunit-publicapi-any.script", "temp/basesvs/base/general/pbase-f32-driveunit-publicapi-any.script" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/pbase-f32-format-publicapi-ram.script", "temp/basesvs/base/general/pbase-f32-format-publicapi-ram.script" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/pbase-f32-format-publicapi-rem.script", "temp/basesvs/base/general/pbase-f32-format-publicapi-rem.script" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/pbase-f32-format-publicapi-rom.script", "temp/basesvs/base/general/pbase-f32-format-publicapi-rom.script" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rawdisk-publicapi-ram.script", "temp/basesvs/base/general/pbase-f32-rawdisk-publicapi-ram.script" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rawdisk-publicapi-rem.script", "temp/basesvs/base/general/pbase-f32-rawdisk-publicapi-rem.script" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/pbase-f32-dir-publicapi-ram.script", "temp/basesvs/base/general/pbase-f32-dir-publicapi-ram.script" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/pbase-f32-dirscan-publicapi-ram.script", "temp/basesvs/base/general/pbase-f32-dirscan-publicapi-ram.script" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/pbase-f32-file-publicapi-ram.script", "temp/basesvs/base/general/pbase-f32-file-publicapi-ram.script" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/pbase-f32-fileman-publicapi-ram.script", "temp/basesvs/base/general/pbase-f32-fileman-publicapi-ram.script" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/pbase-f32-fileman-publicapi-os.script", "temp/basesvs/base/general/pbase-f32-fileman-publicapi-os.script" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/pbase-f32-filenamesidentical-publicapi-ram.script", "temp/basesvs/base/general/pbase-f32-filenamesidentical-publicapi-ram.script" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rdir-publicapi-ram.script", "temp/basesvs/base/general/pbase-f32-rdir-publicapi-ram.script" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/pbase-f32-entry-publicapi-ram.script", "temp/basesvs/base/general/pbase-f32-entry-publicapi-ram.script" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/pbase-f32-filetext-publicapi-ram.script", "temp/basesvs/base/general/pbase-f32-filetext-publicapi-ram.script" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/pbase-f32-volumeinfo-publicapi-any.script", "temp/basesvs/base/general/pbase-f32-volumeinfo-publicapi-any.script" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/pbase-f32-parse-publicapi-any.script", "temp/basesvs/base/general/pbase-f32-parse-publicapi-any.script" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/pbase-f32-parseptr-publicapi-any.script", "temp/basesvs/base/general/pbase-f32-parseptr-publicapi-any.script" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/pbase-f32-parseptrc-publicapi-any.script", "temp/basesvs/base/general/pbase-f32-parseptrc-publicapi-any.script" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/pbase-f32-parse-inherited-publicapi-any.script", "temp/basesvs/base/general/pbase-f32-parse-inherited-publicapi-any.script" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/pbase-f32-parseptr-inherited-publicapi-any.script", "temp/basesvs/base/general/pbase-f32-parseptr-inherited-publicapi-any.script" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/pbase-f32-parseptrc-inherited-publicapi-any.script", "temp/basesvs/base/general/pbase-f32-parseptrc-inherited-publicapi-any.script" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/pbase-f32-entryarray-publicapi-ram.script", "temp/basesvs/base/general/pbase-f32-entryarray-publicapi-ram.script" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/pbase-f32-findfile-publicapi-os.script", "temp/basesvs/base/general/pbase-f32-findfile-publicapi-os.script" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/pbase-f32-findfile-publicapi-rem.script", "temp/basesvs/base/general/pbase-f32-findfile-publicapi-rem.script" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/pbase-f32-openfilescan-publicapi-ram.script", "temp/basesvs/base/general/pbase-f32-openfilescan-publicapi-ram.script" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-drives-publicapi-any.script", "temp/basesvs/base/general/pbase-f32-rfs-drives-publicapi-any.script" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-files-publicapi-any.script", "temp/basesvs/base/general/pbase-f32-rfs-files-publicapi-any.script" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-misc-publicapi-any.script", "temp/basesvs/base/general/pbase-f32-rfs-misc-publicapi-any.script" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-mounts-publicapi-any.script", "temp/basesvs/base/general/pbase-f32-rfs-mounts-publicapi-any.script" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-publicapi-os.script", "temp/basesvs/base/general/pbase-f32-rfs-publicapi-os.script" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-drives-publicapi-ram.script", "temp/basesvs/base/general/pbase-f32-rfs-drives-publicapi-ram.script" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-files-publicapi-ram.script", "temp/basesvs/base/general/pbase-f32-rfs-files-publicapi-ram.script" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-misc-publicapi-ram.script", "temp/basesvs/base/general/pbase-f32-rfs-misc-publicapi-ram.script" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-mounts-publicapi-ram.script", "temp/basesvs/base/general/pbase-f32-rfs-mounts-publicapi-ram.script" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-publicapi-rom.script", "temp/basesvs/base/general/pbase-f32-rfs-publicapi-rom.script" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-drives-publicapi-rem.script", "temp/basesvs/base/general/pbase-f32-rfs-drives-publicapi-rem.script" or die "failed : $!"; -copy $epoc . "release/winscw/udeb/z/base/pbase-f32-driveunit-publicapi.ini", "temp/basesvs/base/general/pbase-f32-driveunit-publicapi.ini"; -copy $epoc . "release/winscw/udeb/z/base/pbase-f32-format-publicapi.ini", "temp/basesvs/base/general/pbase-f32-format-publicapi.ini"; -copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rawdisk-publicapi.ini", "temp/basesvs/base/general/pbase-f32-rawdisk-publicapi.ini"; -copy $epoc . "release/winscw/udeb/z/base/pbase-f32-dir-publicapi.ini", "temp/basesvs/base/general/pbase-f32-dir-publicapi.ini"; -copy $epoc . "release/winscw/udeb/z/base/pbase-f32-dirscan-publicapi.ini", "temp/basesvs/base/general/pbase-f32-dirscan-publicapi.ini"; -copy $epoc . "release/winscw/udeb/z/base/pbase-f32-file-publicapi.ini", "temp/basesvs/base/general/pbase-f32-file-publicapi.ini"; -copy $epoc . "release/winscw/udeb/z/base/pbase-f32-fileman-publicapi.ini", "temp/basesvs/base/general/pbase-f32-fileman-publicapi.ini"; -copy $epoc . "release/winscw/udeb/z/base/pbase-f32-filenamesidentical-publicapi.ini", "temp/basesvs/base/general/pbase-f32-filenamesidentical-publicapi.ini"; -copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rdir-publicapi.ini", "temp/basesvs/base/general/pbase-f32-rdir-publicapi.ini"; -copy $epoc . "release/winscw/udeb/z/base/pbase-f32-entry-publicapi.ini", "temp/basesvs/base/general/pbase-f32-entry-publicapi.ini"; -copy $epoc . "release/winscw/udeb/z/base/pbase-f32-filetext-publicapi.ini", "temp/basesvs/base/general/pbase-f32-filetext-publicapi.ini"; -copy $epoc . "release/winscw/udeb/z/base/pbase-f32-volumeinfo-publicapi.ini", "temp/basesvs/base/general/pbase-f32-volumeinfo-publicapi.ini"; -copy $epoc . "release/winscw/udeb/z/base/pbase-f32-parse-publicapi.ini", "temp/basesvs/base/general/pbase-f32-parse-publicapi.ini"; -copy $epoc . "release/winscw/udeb/z/base/pbase-f32-parseptr-publicapi.ini", "temp/basesvs/base/general/pbase-f32-parseptr-publicapi.ini"; -copy $epoc . "release/winscw/udeb/z/base/pbase-f32-parseptrc-publicapi.ini", "temp/basesvs/base/general/pbase-f32-parseptrc-publicapi.ini"; -copy $epoc . "release/winscw/udeb/z/base/pbase-f32-parsebase-inherited-publicapi.ini", "temp/basesvs/base/general/pbase-f32-parsebase-inherited-publicapi.ini"; -copy $epoc . "release/winscw/udeb/z/base/pbase-f32-entryarray-publicapi.ini", "temp/basesvs/base/general/pbase-f32-entryarray-publicapi.ini"; -copy $epoc . "release/winscw/udeb/z/base/pbase-f32-findfile-publicapi.ini", "temp/basesvs/base/general/pbase-f32-findfile-publicapi.ini"; -copy $epoc . "release/winscw/udeb/z/base/pbase-f32-openfilescan-publicapi.ini", "temp/basesvs/base/general/pbase-f32-openfilescan-publicapi.ini"; -copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-drives-publicapi-any.ini", "temp/basesvs/base/general/pbase-f32-rfs-drives-publicapi-any.ini"; -copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-files-publicapi-any.ini", "temp/basesvs/base/general/pbase-f32-rfs-files-publicapi-any.ini"; -copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-misc-publicapi-any.ini", "temp/basesvs/base/general/pbase-f32-rfs-misc-publicapi-any.ini"; -copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-mounts-publicapi-any.ini", "temp/basesvs/base/general/pbase-f32-rfs-mounts-publicapi-any.ini"; -copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-publicapi-os.ini", "temp/basesvs/base/general/pbase-f32-rfs-publicapi-os.ini"; -copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-drives-publicapi-ram.ini", "temp/basesvs/base/general/pbase-f32-rfs-drives-publicapi-ram.ini"; -copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-files-publicapi-ram.ini", "temp/basesvs/base/general/pbase-f32-rfs-files-publicapi-ram.ini"; -copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-misc-publicapi-ram.ini", "temp/basesvs/base/general/pbase-f32-rfs-misc-publicapi-ram.ini"; -copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-mounts-publicapi-ram.ini", "temp/basesvs/base/general/pbase-f32-rfs-mounts-publicapi-ram.ini"; -copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-publicapi-rom.ini", "temp/basesvs/base/general/pbase-f32-rfs-publicapi-rom.ini"; -copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-drives-publicapi-rem.ini", "temp/basesvs/base/general/pbase-f32-rfs-drives-publicapi-rem.ini"; -copy $epoc . "release/winscw/udeb/z/base/base_f32_env.ini", "temp/basesvs/base/general/base_f32_env.ini"; -copy $epoc . "release/winscw/udeb/z/base/t_base.tcs", "temp/basesvs/base/general/t_base.tcs"; +copy $epoc . "release/winscw/udeb/z/base/pbase-f32-driveunit-publicapi.ini", "temp/basesvs/base/general/pbase-f32-driveunit-publicapi.ini" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/pbase-f32-format-publicapi.ini", "temp/basesvs/base/general/pbase-f32-format-publicapi.ini" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rawdisk-publicapi.ini", "temp/basesvs/base/general/pbase-f32-rawdisk-publicapi.ini" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/pbase-f32-dir-publicapi.ini", "temp/basesvs/base/general/pbase-f32-dir-publicapi.ini" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/pbase-f32-dirscan-publicapi.ini", "temp/basesvs/base/general/pbase-f32-dirscan-publicapi.ini" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/pbase-f32-file-publicapi.ini", "temp/basesvs/base/general/pbase-f32-file-publicapi.ini" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/pbase-f32-fileman-publicapi.ini", "temp/basesvs/base/general/pbase-f32-fileman-publicapi.ini" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/pbase-f32-filenamesidentical-publicapi.ini", "temp/basesvs/base/general/pbase-f32-filenamesidentical-publicapi.ini" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rdir-publicapi.ini", "temp/basesvs/base/general/pbase-f32-rdir-publicapi.ini" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/pbase-f32-entry-publicapi.ini", "temp/basesvs/base/general/pbase-f32-entry-publicapi.ini" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/pbase-f32-filetext-publicapi.ini", "temp/basesvs/base/general/pbase-f32-filetext-publicapi.ini" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/pbase-f32-volumeinfo-publicapi.ini", "temp/basesvs/base/general/pbase-f32-volumeinfo-publicapi.ini" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/pbase-f32-parse-publicapi.ini", "temp/basesvs/base/general/pbase-f32-parse-publicapi.ini" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/pbase-f32-parseptr-publicapi.ini", "temp/basesvs/base/general/pbase-f32-parseptr-publicapi.ini" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/pbase-f32-parseptrc-publicapi.ini", "temp/basesvs/base/general/pbase-f32-parseptrc-publicapi.ini" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/pbase-f32-parsebase-inherited-publicapi.ini", "temp/basesvs/base/general/pbase-f32-parsebase-inherited-publicapi.ini" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/pbase-f32-entryarray-publicapi.ini", "temp/basesvs/base/general/pbase-f32-entryarray-publicapi.ini" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/pbase-f32-findfile-publicapi.ini", "temp/basesvs/base/general/pbase-f32-findfile-publicapi.ini" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/pbase-f32-openfilescan-publicapi.ini", "temp/basesvs/base/general/pbase-f32-openfilescan-publicapi.ini" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-drives-publicapi-any.ini", "temp/basesvs/base/general/pbase-f32-rfs-drives-publicapi-any.ini" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-files-publicapi-any.ini", "temp/basesvs/base/general/pbase-f32-rfs-files-publicapi-any.ini" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-misc-publicapi-any.ini", "temp/basesvs/base/general/pbase-f32-rfs-misc-publicapi-any.ini" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-mounts-publicapi-any.ini", "temp/basesvs/base/general/pbase-f32-rfs-mounts-publicapi-any.ini" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-publicapi-os.ini", "temp/basesvs/base/general/pbase-f32-rfs-publicapi-os.ini" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-drives-publicapi-ram.ini", "temp/basesvs/base/general/pbase-f32-rfs-drives-publicapi-ram.ini" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-files-publicapi-ram.ini", "temp/basesvs/base/general/pbase-f32-rfs-files-publicapi-ram.ini" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-misc-publicapi-ram.ini", "temp/basesvs/base/general/pbase-f32-rfs-misc-publicapi-ram.ini" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-mounts-publicapi-ram.ini", "temp/basesvs/base/general/pbase-f32-rfs-mounts-publicapi-ram.ini" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-publicapi-rom.ini", "temp/basesvs/base/general/pbase-f32-rfs-publicapi-rom.ini" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-drives-publicapi-rem.ini", "temp/basesvs/base/general/pbase-f32-rfs-drives-publicapi-rem.ini" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/base_f32_env.ini", "temp/basesvs/base/general/base_f32_env.ini" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/t_base.tcs", "temp/basesvs/base/general/t_base.tcs" or die "failed : $!"; -copy $epoc . "release/winscw/udeb/z/base/t_sfsrv/test.txt", "temp/basesvs/base/t_sfsrv/general/test.txt"; -copy $epoc . "release/winscw/udeb/z/base/t_sfsrv/test_rom.txt", "temp/basesvs/base/t_sfsrv/general/test_rom.txt"; -copy $epoc . "release/winscw/udeb/z/base/t_sfsrv/usbload.zip", "temp/basesvs/base/t_sfsrv/general/usbload.zip"; -copy $epoc . "release/winscw/udeb/z/base/t_sfsrv/test1.txt", "temp/basesvs/base/t_sfsrv/general/test1.txt"; -copy $epoc . "release/winscw/udeb/z/base/t_sfsrv/test2.txt", "temp/basesvs/base/t_sfsrv/general/test2.txt"; -copy $epoc . "release/winscw/udeb/z/base/t_sfsrv/test3.txt", "temp/basesvs/base/t_sfsrv/general/test3.txt"; -copy $epoc . "release/winscw/udeb/z/base/t_sfsrv/1mb", "temp/basesvs/base/t_sfsrv/general/1mb"; -copy $epoc . "release/winscw/udeb/z/base/t_sfsrv/any.txt", "temp/basesvs/base/t_sfsrv/general/any.txt"; -copy $epoc . "release/winscw/udeb/z/base/t_sfsrv/big_line.txt", "temp/basesvs/base/t_sfsrv/general/big_line.txt"; -copy $epoc . "release/winscw/udeb/z/base/t_sfsrv/filetext_eof.txt", "temp/basesvs/base/t_sfsrv/general/filetext_eof.txt"; -copy $epoc . "release/winscw/udeb/z/base/t_sfsrv/filetext_read.txt", "temp/basesvs/base/t_sfsrv/general/filetext_read.txt"; -copy $epoc . "release/winscw/udeb/z/base/t_sfsrv/multiline.txt", "temp/basesvs/base/t_sfsrv/general/multiline.txt"; -copy $epoc . "release/winscw/udeb/z/base/t_sfsrv/new_file.txt", "temp/basesvs/base/t_sfsrv/general/new_file.txt"; -copy $epoc . "release/winscw/udeb/z/base/t_sfsrv/oneliner.txt", "temp/basesvs/base/t_sfsrv/general/oneliner.txt"; -copy $epoc . "release/winscw/udeb/z/base/t_sfsrv/big.txt", "temp/basesvs/base/t_sfsrv/general/big.txt"; +copy $epoc . "release/winscw/udeb/z/base/t_sfsrv/test.txt", "temp/basesvs/base/t_sfsrv/general/test.txt" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/t_sfsrv/test_rom.txt", "temp/basesvs/base/t_sfsrv/general/test_rom.txt" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/t_sfsrv/usbload.zip", "temp/basesvs/base/t_sfsrv/general/usbload.zip" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/t_sfsrv/test1.txt", "temp/basesvs/base/t_sfsrv/general/test1.txt" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/t_sfsrv/test2.txt", "temp/basesvs/base/t_sfsrv/general/test2.txt" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/t_sfsrv/test3.txt", "temp/basesvs/base/t_sfsrv/general/test3.txt" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/t_sfsrv/1mb", "temp/basesvs/base/t_sfsrv/general/1mb" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/t_sfsrv/any.txt", "temp/basesvs/base/t_sfsrv/general/any.txt" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/t_sfsrv/big_line.txt", "temp/basesvs/base/t_sfsrv/general/big_line.txt" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/t_sfsrv/filetext_eof.txt", "temp/basesvs/base/t_sfsrv/general/filetext_eof.txt" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/t_sfsrv/filetext_read.txt", "temp/basesvs/base/t_sfsrv/general/filetext_read.txt" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/t_sfsrv/multiline.txt", "temp/basesvs/base/t_sfsrv/general/multiline.txt" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/t_sfsrv/new_file.txt", "temp/basesvs/base/t_sfsrv/general/new_file.txt" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/t_sfsrv/oneliner.txt", "temp/basesvs/base/t_sfsrv/general/oneliner.txt" or die "failed : $!"; +copy $epoc . "release/winscw/udeb/z/base/t_sfsrv/big.txt", "temp/basesvs/base/t_sfsrv/general/big.txt" or die "failed : $!"; system("7z a -tzip basesvs.zip ./temp/*"); diff -r 0af8245d50a0 -r f8a0be15f790 common/tools/ats/bctest/browser/browser.pl --- a/common/tools/ats/bctest/browser/browser.pl Fri Sep 18 11:41:08 2009 +0100 +++ b/common/tools/ats/bctest/browser/browser.pl Mon Sep 21 16:18:20 2009 +0100 @@ -22,10 +22,14 @@ unlink "browser.zip"; ##rmtree "temp"; mkpath "temp/bcbrowser/winscw_udeb"; +mkpath "temp/bcbrowser/general/testframework"; my $epoc=$ENV{'EPOCROOT'} . "epoc32/"; copy("browser.xml", "temp/test.xml"); -copy($epoc . "release/winscw/udeb/favouritesbctest.dll", "temp/bcbrowser/winscw_udeb/favouritesbctest.dll"); +copy($epoc . "release/winscw/udeb/favouritesbctest.dll", "temp/bcbrowser/winscw_udeb/favouritesbctest.dll"); +copy($epoc . "release/winscw/udeb/downloadmgrbctest.dll", "temp/bcbrowser/winscw_udeb/downloadmgrbctest.dll"); -system("7z a -tzip browser.zip ./temp/*"); \ No newline at end of file +copy($epoc . "winscw/c/testframework/testframework_dwmgr.ini", "temp/bcbrowser/general/testframework/testframework_dwmgr.ini"); + +system("7z a -tzip browser.zip ./temp/*"); diff -r 0af8245d50a0 -r f8a0be15f790 common/tools/ats/bctest/browser/browser.xml --- a/common/tools/ats/bctest/browser/browser.xml Fri Sep 18 11:41:08 2009 +0100 +++ b/common/tools/ats/bctest/browser/browser.xml Mon Sep 21 16:18:20 2009 +0100 @@ -49,10 +49,54 @@ + + + makedir + + + + + + install + + + + + + + + + install + + + + + + + + + execute + + + + + + + + + fetch-log + + + + + - bcwebsrv/winscw_udeb/favouritesbctest.dll + bcbrowser/winscw_udeb/favouritesbctest.dll + + bcbrowser/winscw_udeb/downloadmgrbctest.dll + bcbrowser/general/testframework/testframework_dwmgr.ini - \ No newline at end of file + diff -r 0af8245d50a0 -r f8a0be15f790 common/tools/ats/bctest/browser/browserced.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/common/tools/ats/bctest/browser/browserced.xml Mon Sep 21 16:18:20 2009 +0100 @@ -0,0 +1,2118 @@ + + + + + + + + + + Intranet + + + mRouter + + + + + + NT RAS with Null Modem + DialOutISP.NT RAS + ModemBearer.Null Modem 115200bps + Network.Intranet + 0 + Location.Office + + + CSD IAP PlaceHolder01 + DialOutISP.ISP01 + ModemBearer.Null Modem 115200bps + Network.Intranet + 0 + Location.Office + + + CSD IAP PlaceHolder02 + DialOutISP.ISP02 + ModemBearer.Null Modem 115200bps + Network.Intranet + 0 + Location.Office + + + GPRS IAP PlaceHolder01 + OutgoingGPRS.GPRS01 + ModemBearer.GPRS Ericsson R520m/T68i via Serial + Network.Intranet + 0 + Location.Mobile + + + GPRS IAP PlaceHolder02 + OutgoingGPRS.GPRS02 + ModemBearer.GPRS Ericsson R520m/T68i via Serial + Network.Intranet + 0 + Location.Mobile + + + Ethernet No Daemon Static IP + LANService.Ethernet No Daemon + LANBearer.EKA2 Emulator Ethernet + Network.Intranet + 0 + Location.Office + + + Incorrect ethernet setup 1 + LANService.Ethernet Bad Daemon + LANBearer.EKA2 Emulator Ethernet + Network.mRouter + 0 + Location.Office + + + Incorrect ethernet setup 2 + LANService.Ethernet Static IP + LANBearer.EKA2 Emulator Ethernet + Network.mRouter + 0 + Location.Office + + + Ethernet with Daemon Static IP + LANService.Ethernet Static IP + LANBearer.EKA2 Emulator Ethernet + Network.Intranet + 0 + Location.Office + + + Incorrect ethernet setup 3 + LANService.Ethernet + LANBearer.EKA2 Emulator Ethernet + Network.mRouter + 0 + Location.Office + + + Ethernet with Daemon Dynamic IP + LANService.Ethernet + LANBearer.EKA2 Emulator Ethernet + Network.Intranet + 0 + Location.Office + + + + + + Default Modem + CSD.agt + PPP + COMM::0 + MM + ECUART + 8 + 1 + NONE + 115200 + 0 + 0 + 0 + 0 + AUTO + NEVER + QUIET + AT + AT + AT + S8= + L0 + L1 + L2 + M0 + M1 + M2 + M3 + W + X1 + X2 + X3 + X4 + E0 + V1 + Q0 + Q1 + ; + O + Z + &F + &C1 + &D2 + &S0 + &K3 + &K4 + + + S12 + NO DIAL TONE + BUSY + NO ANSWER + CARRIER + CONNECT + COMPRESSION:CLASS 5 + COMPRESSION:V.42 bis + COMPRESSION:NONE + PROTOCOL:LAPD + PROTOCOL:ALT + PROTOCOL:ALT-CELLULAR + PROTOCOL:NONE + +44123456789 + 1440 + FALSE + 9905 + 180 + 30 + 60 + 0 + 0 + + + Null Modem 115200bps + CSD.agt + PPP + COMM::0 + MM + ECUART + 8 + 1 + NONE + 115200 + 4 + 0 + 0 + 0 + AUTO + NEVER + QUIET + AT + AT + AT + S8= + L0 + L1 + L2 + M0 + M1 + M2 + M3 + W + X1 + X2 + X3 + X4 + E0 + V1 + Q0 + Q1 + ; + O + Z + &F + &C1 + &D2 + &S0 + &K3 + &K4 + + + S12 + NO DIAL TONE + BUSY + NO ANSWER + CARRIER + CONNECT + COMPRESSION:CLASS 5 + COMPRESSION:V.42 bis + COMPRESSION:NONE + PROTOCOL:LAPD + PROTOCOL:ALT + PROTOCOL:ALT-CELLULAR + PROTOCOL:NONE + +44123456789 + 1440 + FALSE + 9905 + 180 + 30 + 60 + 0 + 0 + + + US Robotics Sportster + CSD.agt + PPP + COMM::0 + MM + ECUART + 8 + 1 + NONE + 57600 + 244 + 0 + 0 + 0 + AUTO + AFTERDIALUNTILANSWER + QUIET + AT&F1 + AT + AT&d2 + S8= + L0 + L1 + L2 + M0 + M1 + M2 + M3 + W + X1 + X2 + X3 + X4 + E0 + V1 + Q0 + Q1 + ; + O + Z + &F + &C1 + &D2 + &S0 + &K3 + &K4 + + + S12 + NO DIAL TONE + BUSY + NO ANSWER + CARRIER + CONNECT + COMPRESSION:CLASS 5 + COMPRESSION:V.42 bis + COMPRESSION:NONE + PROTOCOL:LAPD + PROTOCOL:ALT + PROTOCOL:ALT-CELLULAR + PROTOCOL:NONE + +44123456789 + 1440 + FALSE + 9905 + 180 + 30 + 60 + 0 + 0 + + + Dacom Surfer + CSD.agt + PPP + COMM::0 + MM + ECUART + 8 + 1 + NONE + 57600 + 244 + 0 + 0 + 0 + AUTO + AFTERDIALUNTILANSWER + QUIET + AT&F + AT + AT&d2 + S8= + L0 + L1 + L2 + M0 + M1 + M2 + M3 + W + X1 + X2 + X3 + X4 + E0 + V1 + Q0 + Q1 + ; + O + Z + &F + &C1 + &D2 + &S0 + &K3 + &K4 + + + S12 + NO DIAL TONE + BUSY + NO ANSWER + CARRIER + CONNECT + COMPRESSION:CLASS 5 + COMPRESSION:V.42 bis + COMPRESSION:NONE + PROTOCOL:LAPD + PROTOCOL:ALT + PROTOCOL:ALT-CELLULAR + PROTOCOL:NONE + +44123456789 + 1440 + FALSE + 9905 + 180 + 30 + 60 + 0 + 0 + + + GSM Mobile Phone via Infrared + CSD.agt + PPP + IRCOMM::0 + MM + IRCOMM + 8 + 1 + NONE + 115200 + 196 + 0 + 17 + 19 + AUTO + NEVER + QUIET + ATZ + AT + AT + S8= + L0 + L1 + L2 + M0 + M1 + M2 + M3 + W + X1 + X2 + X3 + X4 + E0 + V1 + Q0 + Q1 + ; + O + Z + &F + &C1 + &D2 + &S0 + &K3 + &K4 + + + S12 + NO DIAL TONE + BUSY + NO ANSWER + CARRIER + CONNECT + COMPRESSION:CLASS 5 + COMPRESSION:V.42 bis + COMPRESSION:NONE + PROTOCOL:LAPD + PROTOCOL:ALT + PROTOCOL:ALT-CELLULAR + PROTOCOL:NONE + +44123456789 + 1440 + FALSE + 9905 + 180 + 30 + 60 + 0 + 0 + + + GSM Mobile Phone via Serial + CSD.agt + PPP + COMM::0 + MM + ECUART + 8 + 1 + NONE + 19200 + 196 + 0 + 17 + 19 + AUTO + NEVER + QUIET + ATZ + AT + AT + S8= + L0 + L1 + L2 + M0 + M1 + M2 + M3 + W + X1 + X2 + X3 + X4 + E0 + V1 + Q0 + Q1 + ; + O + Z + &F + &C1 + &D2 + &S0 + &K3 + &K4 + + + S12 + NO DIAL TONE + BUSY + NO ANSWER + CARRIER + CONNECT + COMPRESSION:CLASS 5 + COMPRESSION:V.42 bis + COMPRESSION:NONE + PROTOCOL:LAPD + PROTOCOL:ALT + PROTOCOL:ALT-CELLULAR + PROTOCOL:NONE + +44123456789 + 1440 + FALSE + 9905 + 180 + 30 + 60 + 0 + 0 + + + GPRS Ericsson R520m via IR + PSD.agt + PPP + IRCOMM::0 + MM + IRCOMM + 8 + 1 + NONE + 115200 + 4 + 0 + 17 + 19 + AUTO + NEVER + QUIET + ATZ + AT + AT + S8= + L0 + L1 + L2 + M0 + M1 + M2 + M3 + W + X1 + X2 + X3 + X4 + E0 + V1 + Q0 + Q1 + ; + O + Z + &F + &C1 + &D2 + &S0 + &K3 + &K4 + + + S12 + NO DIAL TONE + BUSY + NO ANSWER + CARRIER + CONNECT + COMPRESSION:CLASS 5 + COMPRESSION:V.42 bis + COMPRESSION:NONE + PROTOCOL:LAPD + PROTOCOL:ALT + PROTOCOL:ALT-CELLULAR + PROTOCOL:NONE + +44123456789 + 1440 + FALSE + 9905 + 180 + 30 + 60 + 0 + 0 + + + GPRS Ericsson R520m/T68i via Serial + PSD.agt + PPP + COMM::0 + MM + ECUART + 8 + 1 + NONE + 19200 + 4 + 0 + 17 + 19 + AUTO + NEVER + QUIET + ATZ + AT + AT + *99***1# + S8= + L0 + L1 + L2 + M0 + M1 + M2 + M3 + W + X1 + X2 + X3 + X4 + E0 + V1 + Q0 + Q1 + ; + O + Z + &F + &C1 + &D2 + &S0 + &K3 + &K4 + + + S12 + NO DIAL TONE + BUSY + NO ANSWER + CARRIER + CONNECT + COMPRESSION:CLASS 5 + COMPRESSION:V.42 bis + COMPRESSION:NONE + PROTOCOL:LAPD + PROTOCOL:ALT + PROTOCOL:ALT-CELLULAR + PROTOCOL:NONE + +44123456789 + 1440 + FALSE + 9905 + 180 + 30 + 60 + 0 + 0 + + + GPRS Motorola Mobile Phone via Serial + PSD.agt + PPP + COMM::0 + MM + ECUART + 8 + 1 + NONE + 57600 + 4 + 0 + 17 + 19 + AUTO + NEVER + QUIET + ATZ + AT + AT + S8= + L0 + L1 + L2 + M0 + M1 + M2 + M3 + W + X1 + X2 + X3 + X4 + E0 + V1 + Q0 + Q1 + ; + O + Z + &F + &C1 + &D2 + &S0 + &K3 + &K4 + + + S12 + NO DIAL TONE + BUSY + NO ANSWER + CARRIER + CONNECT + COMPRESSION:CLASS 5 + COMPRESSION:V.42 bis + COMPRESSION:NONE + PROTOCOL:LAPD + PROTOCOL:ALT + PROTOCOL:ALT-CELLULAR + PROTOCOL:NONE + +44123456789 + 1440 + FALSE + 9905 + 180 + 30 + 60 + 0 + 0 + + + WinTunnel Modem + null.agt + PPP + COMM::6 + MM + ECUART + 8 + 1 + NONE + 115200 + 4 + 0 + 0 + 0 + AUTO + NEVER + QUIET + AT + AT + AT + S8= + L0 + L1 + L2 + M0 + M1 + M2 + M3 + W + X1 + X2 + X3 + X4 + E0 + V1 + Q0 + Q1 + ; + O + Z + &F + &C1 + &D2 + &S0 + &K3 + &K4 + + + S12 + NO DIAL TONE + BUSY + NO ANSWER + CARRIER + CONNECT + COMPRESSION:CLASS 5 + COMPRESSION:V.42 bis + COMPRESSION:NONE + PROTOCOL:LAPD + PROTOCOL:ALT + PROTOCOL:ALT-CELLULAR + PROTOCOL:NONE + +44123456789 + 1440 + FALSE + 9905 + 180 + 30 + 60 + 0 + 0 + + + mRouterWinsBearer + mRouterAgent.agt + PPP + WINS::0 + MM + WINSCSY + 8 + 1 + NONE + 115200 + 4 + 0 + 0 + 0 + AUTO + NEVER + QUIET + AT + AT + AT + S8= + L0 + L1 + L2 + M0 + M1 + M2 + M3 + W + X1 + X2 + X3 + X4 + E0 + V1 + Q0 + Q1 + ; + O + Z + &F + &C1 + &D2 + &S0 + &K3 + &K4 + + + S12 + NO DIAL TONE + BUSY + NO ANSWER + CARRIER + CONNECT + COMPRESSION:CLASS 5 + COMPRESSION:V.42 bis + COMPRESSION:NONE + PROTOCOL:LAPD + PROTOCOL:ALT + PROTOCOL:ALT-CELLULAR + PROTOCOL:NONE + +44123456789 + 1440 + FALSE + 9905 + 9999 + 180 + 30 + 0 + 0 + + + mRouterRs232Bearer + mRouterAgent.agt + PPP + COMM::0 + MM + ECUART + 8 + 1 + NONE + 115200 + 4 + 0 + 0 + 0 + AUTO + NEVER + QUIET + AT + AT + AT + S8= + L0 + L1 + L2 + M0 + M1 + M2 + M3 + W + X1 + X2 + X3 + X4 + E0 + V1 + Q0 + Q1 + ; + O + Z + &F + &C1 + &D2 + &S0 + &K3 + &K4 + + + S12 + NO DIAL TONE + BUSY + NO ANSWER + CARRIER + CONNECT + COMPRESSION:CLASS 5 + COMPRESSION:V.42 bis + COMPRESSION:NONE + PROTOCOL:LAPD + PROTOCOL:ALT + PROTOCOL:ALT-CELLULAR + PROTOCOL:NONE + +44123456789 + 1440 + FALSE + 9905 + 9999 + 180 + 30 + 0 + 0 + + + mRouterIrBearer + mRouterAgent.agt + PPP + IRCOMM::0 + MM + IRCOMM + 8 + 1 + NONE + 115200 + 4 + 0 + 0 + 0 + AUTO + NEVER + QUIET + AT + AT + AT + S8= + L0 + L1 + L2 + M0 + M1 + M2 + M3 + W + X1 + X2 + X3 + X4 + E0 + V1 + Q0 + Q1 + ; + O + Z + &F + &C1 + &D2 + &S0 + &K3 + &K4 + + + S12 + NO DIAL TONE + BUSY + NO ANSWER + CARRIER + CONNECT + COMPRESSION:CLASS 5 + COMPRESSION:V.42 bis + COMPRESSION:NONE + PROTOCOL:LAPD + PROTOCOL:ALT + PROTOCOL:ALT-CELLULAR + PROTOCOL:NONE + +44123456789 + 1440 + FALSE + 9905 + 9999 + 180 + 30 + 0 + 0 + + + mRouterBtBearer + mRouterAgent.agt + PPP + BTCOMM::0 + MM + BTCOMM + 8 + 1 + NONE + 115200 + 4 + 0 + 0 + 0 + AUTO + NEVER + QUIET + AT + AT + AT + S8= + L0 + L1 + L2 + M0 + M1 + M2 + M3 + W + X1 + X2 + X3 + X4 + E0 + V1 + Q0 + Q1 + ; + O + Z + &F + &C1 + &D2 + &S0 + &K3 + &K4 + + + S12 + NO DIAL TONE + BUSY + NO ANSWER + CARRIER + CONNECT + COMPRESSION:CLASS 5 + COMPRESSION:V.42 bis + COMPRESSION:NONE + PROTOCOL:LAPD + PROTOCOL:ALT + PROTOCOL:ALT-CELLULAR + PROTOCOL:NONE + +44123456789 + 1440 + FALSE + 9905 + 9999 + 180 + 30 + 0 + 0 + + + mRouterUsbBearer + mRouterAgent.agt + PPP + ACM::0 + MM + ECACM + 8 + 1 + NONE + 115200 + 4 + 0 + 0 + 0 + AUTO + NEVER + QUIET + AT + AT + AT + S8= + L0 + L1 + L2 + M0 + M1 + M2 + M3 + W + X1 + X2 + X3 + X4 + E0 + V1 + Q0 + Q1 + ; + O + Z + &F + &C1 + &D2 + &S0 + &K3 + &K4 + + + S12 + NO DIAL TONE + BUSY + NO ANSWER + CARRIER + CONNECT + COMPRESSION:CLASS 5 + COMPRESSION:V.42 bis + COMPRESSION:NONE + PROTOCOL:LAPD + PROTOCOL:ALT + PROTOCOL:ALT-CELLULAR + PROTOCOL:NONE + +44123456789 + 1440 + FALSE + 9905 + 9999 + 180 + 30 + 0 + 0 + + + + + + EKA1 Target Ethernet + nullagt.agt + ethint + ethercard + EtherCard + EtherSmc + EtherCard.Smc + EtherPkt.drv + -1 + -1 + -1 + + + + EKA2 Target Ethernet + nullagt.agt + ethint + enet + Ethernet + ethernet + Ethernet.Assabet + EtherPkt.drv + -1 + -1 + -1 + + + + EKA1 Emulator Ethernet + nullagt.agt + ethint + ethercard + Ethercard + etherwins + Ethercard.wins + EtherPkt.drv + -1 + -1 + -1 + + + + EKA2 Emulator Ethernet + nullagt.agt + ethint + enet + =Ethernet + ethernet + Ethernet.Wins + EtherPkt.drv + -1 + -1 + -1 + + + + + + Ethernet + ip + 255.255.255.0 + 10.32.194.254 + 10.32.194.251 + TRUE + TRUE + 194.72.6.51 + 194.72.6.52 + NetCfgExtnDhcp + !DhcpServ + + + Ethernet Static IP + ip + 255.255.255.0 + 192.168.20.2 + 192.168.20.13 + FALSE + TRUE + 194.72.6.51 + 194.72.6.52 + NetCfgExtnDhcp + !DhcpServ + + + Ethernet Bad Daemon + ip + 255.255.255.0 + 10.32.194.254 + 10.32.194.251 + FALSE + TRUE + 194.72.6.51 + 194.72.6.52 + NonExistingServ + NonExistingServ + + + Ethernet No Daemon + ip + 255.255.255.0 + 10.32.194.254 + 10.32.194.251 + FALSE + TRUE + 194.72.6.51 + 194.72.6.52 + + + + + + Default Dial In ISP + FALSE + TRUE + TRUE + Default Dial In ISP + TRUE + TRUE + TRUE + TRUE + TRUE + FALSE + FALSE + FALSE + FALSE + FALSE + + + Dial In ISP01 + FALSE + TRUE + TRUE + Dial In ISP01 + TRUE + TRUE + TRUE + TRUE + TRUE + FALSE + FALSE + FALSE + FALSE + FALSE + + + + + + Default Dial Out ISP + TRUE + FALSE + TRUE + TRUE + TRUE + TRUE + Default Dial Out ISP + Default Dial Out ISP + TRUE + TRUE + FALSE + FALSE + FALSE + TRUE + TRUE + FALSE + 0 + TRUE + TRUE + TRUE + TRUE + TRUE + FALSE + FALSE + FALSE + FALSE + 0 + UNSPECIFIED + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + FALSE + FALSE + + + NT RAS + TRUE + TRUE + FALSE + FALSE + TRUE + TRUE + Test + INTERNETONLY + INTERNETONLY + CHARMAP \[windows-1252\]\nLOOP 10\n{\nSEND "CLIENT"+<0x0d>\nWAIT 3\n{\n"SERVER" OK\n}\n}\nEXIT KErrNoAnswer$\n\nOK:\nEXIT\n + FALSE + FALSE + FALSE + FALSE + ip + RasUser + pass + 0 + FALSE + 0 + TRUE + TRUE + TRUE + TRUE + TRUE + FALSE + FALSE + FALSE + FALSE + 0 + UNSPECIFIED + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + FALSE + FALSE + + + ISP01 + TRUE + FALSE + FALSE + TRUE + TRUE + TRUE + PlaceHolder for ISP01 + INTERNETONLY + INTERNETONLY + FALSE + FALSE + FALSE + FALSE + ip + xxx + yyy + 0 + FALSE + 0 + TRUE + TRUE + TRUE + TRUE + TRUE + FALSE + FALSE + FALSE + FALSE + 0 + UNSPECIFIED + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + FALSE + FALSE + + + ISP02 + TRUE + FALSE + FALSE + TRUE + TRUE + TRUE + PlaceHolder for ISP02 + INTERNETONLY + INTERNETONLY + FALSE + FALSE + FALSE + FALSE + ip + xxx + yyy + 0 + FALSE + 0 + TRUE + TRUE + TRUE + TRUE + TRUE + FALSE + FALSE + FALSE + FALSE + 0 + UNSPECIFIED + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + FALSE + FALSE + + + ISP03 + TRUE + FALSE + FALSE + TRUE + TRUE + TRUE + PlaceHolder for ISP03 + INTERNETONLY + INTERNETONLY + FALSE + FALSE + FALSE + FALSE + ip + xxx + yyy + 0 + FALSE + 0 + TRUE + TRUE + TRUE + TRUE + TRUE + FALSE + FALSE + FALSE + FALSE + 0 + UNSPECIFIED + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + FALSE + FALSE + + + ISP04 + TRUE + FALSE + FALSE + TRUE + TRUE + TRUE + PlaceHolder for ISP04 + INTERNETONLY + INTERNETONLY + FALSE + FALSE + FALSE + FALSE + ip + xxx + yyy + 0 + FALSE + 0 + TRUE + TRUE + TRUE + TRUE + TRUE + FALSE + FALSE + FALSE + FALSE + 0 + UNSPECIFIED + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + FALSE + FALSE + + + ISP05 + TRUE + FALSE + FALSE + TRUE + TRUE + TRUE + PlaceHolder for ISP05 + INTERNETONLY + INTERNETONLY + FALSE + FALSE + FALSE + FALSE + ip + xxx + yyy + 0 + FALSE + 0 + TRUE + TRUE + TRUE + TRUE + TRUE + FALSE + FALSE + FALSE + FALSE + 0 + UNSPECIFIED + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + FALSE + FALSE + + + mRouterDialOutIsp + TRUE + FALSE + FALSE + FALSE + TRUE + TRUE + mRouterDialOutIsp + INTERNETONLY + INTERNETONLY + FALSE + FALSE + FALSE + FALSE + ip + IfAuthPass= + AuthRetries=0 + 0 + FALSE + 0 + TRUE + TRUE + TRUE + TRUE + TRUE + FALSE + FALSE + FALSE + FALSE + 0 + UNSPECIFIED + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + FALSE + FALSE + + + + + + + + + test name cdma2000 + Test2000 + HIGHSPEEDCDMA2000DATA + IPV4 + PRIORITY04 + PRIORITY04 + 32KBPS + 32KBPS + LOSS1 + LOSS1 + 40MS + 40MS + 32KBPS + 32KBPS + LOSS2 + LOSS2 + 120MS + 120MS + FALSE + FALSE + FALSE + ip + RasUser + pass + FALSE + 1 + 0.255.255.255 + 10.0.0.1 + TRUE + TRUE + TRUE + TRUE + 2 + 1000000 + TRANSPARENT + FALSE + 10000000 + + + + + + + + + Dummy BT Chargecard + 144,12345678 + 0000 + HG + HFG + HEFG + + + Dummy Mercury Chargecard + 0500800800,,12345678 + **** + HG + J,K,0FG + HEFG + + + + + + ConnectionPreferencesTable1 + 0 + OUTGOING + DONOTPROMPT + LAN + IAP.Ethernet with Daemon Dynamic IP + + + ConnectionPreferencesTable2 + 1 + OUTGOING + PROMPT + LAN + IAP.Ethernet with Daemon Dynamic IP + + + + + + GlobalSettingsTable1 + WAPAccessPoint.Default Dial In ISP + 3 + WAPSMSBearer.WAPSMSBearerTable1 + 2 + 1 + 1 + 2 + 2 + 2 + Location.Office + Location.Office + GSM + Network.Intranet + mm + + + + + + Incoming GPRS Settings PlaceHolder + Test + IPV4 + 0.0.0.0 + FALSE + TRUE + TRUE + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + FALSE + FALSE + FALSE + ip + RasUser + pass + 1 + 0.0.0.0 + 0.0.0.0 + FALSE + FALSE + FALSE + + + + + + GPRS01 + gprs01APNPlaceHolder + IPV4 + FALSE + TRUE + FALSE + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + FALSE + FALSE + FALSE + ip + 1 + FALSE + FALSE + FALSE + 0 + 0 + + + GPRS02 + gprs02APNPlaceHolder + IPV4 + FALSE + TRUE + FALSE + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + FALSE + FALSE + FALSE + ip + 1 + FALSE + FALSE + FALSE + 0 + 0 + + + GPRS03 + gprs03APNPlaceHolder + IPV4 + FALSE + TRUE + FALSE + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + FALSE + FALSE + FALSE + ip + 1 + FALSE + FALSE + FALSE + 0 + 0 + + + + + + Dummy Default GPRS Settings + Access point name + IPV6 + www.wid.com + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + TRUE + TRUE + FALSE + TRUE + + + + + + Default Location + TRUE + FALSE + FALSE + 0 + + + 0 + 44 + 44 + 44 + 44 + + + Office + FALSE + FALSE + FALSE + 0 + 00 + 0 + 44 + 171 + 9, + 9, + + + Office Direct Dial + FALSE + FALSE + FALSE + 0 + 00 + 0 + 44 + 171 + 171 + 171 + + + Mobile + TRUE + FALSE + FALSE + 0 + + + 0 + 44 + 44 + 44 + 44 + + + Home + FALSE + TRUE + TRUE + 0 + 00 + 0 + 44 + 181 + 181 + 181 + + + + + + SecureSocketTable1 + ssl3.0 + ssladaptor.dll + + + SecureSocketTable2 + tls1.0 + ssladaptor.dll + + + + + + + + + + + + + + + + + + Default Dial In ISP + WAPIPBearer + + + Ethernet Static IP + WAPIPBearer + www.wapstart.com + + + Ethernet Dynamic IP + WAPIPBearer + www.wapstart.com + + + + + + WAPIPBearerTable1 + WAPAccessPoint.-1 + 0 + CONNECTIONLESS + FALSE + IAP.-1 + 0 + 0 + 0 + + + WAPIPBearerTable2 + WAPAccessPoint.Ethernet Static IP + 0.0.0.0 + CONNECTIONORIENTED + FALSE + IAP.Ethernet No Daemon Static IP + 1 + 1 + 1 + + + WAPIPBearerTable3 + WAPAccessPoint.Ethernet Dynamic IP + 0.0.0.0 + CONNECTIONORIENTED + FALSE + IAP.Ethernet with Daemon Dynamic IP + 1 + 1 + 1 + + + + + + WAPSMSBearerTable1 + WAPAccessPoint.-1 + 0 + CONNECTIONLESS + FALSE + 0 + + + WAPSMSBearerTable2 + WAPAccessPoint.Ethernet Dynamic IP + +4412345678901 + CONNECTIONORIENTED + FALSE + +442071234567 + + + + + + + + + + + diff -r 0af8245d50a0 -r f8a0be15f790 common/tools/ats/bctest/messaging/messaging.pl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/common/tools/ats/bctest/messaging/messaging.pl Mon Sep 21 16:18:20 2009 +0100 @@ -0,0 +1,42 @@ +#!/usr/bin/perl +# Copyright (c) 2009 Symbian Foundation Ltd +# This component and the accompanying materials are made available +# under the terms of the License "Eclipse Public License v1.0" +# which accompanies this distribution, and is available +# at the URL "http://www.eclipse.org/legal/epl-v10.html". +# +# Initial Contributors: +# Symbian Foundation Ltd - initial contribution. +# +# Contributors: +# Brendan Donegan +# +# Description: +# Script to build ATS test drop for BC Web Services tests + + +use strict; +use File::Copy; +use File::Path; + +unlink "messaging.zip"; +##rmtree "temp"; +mkpath "temp/bcmessaging/testframework/general"; +mkpath "temp/bcmessaging/resource/general"; +mkpath "temp/bcmessaging/winscw_udeb"; + +my $epoc=$ENV{'EPOCROOT'} . "epoc32/"; +copy("messaging.xml", "temp/test.xml"); + +copy($epoc . "release/winscw/udeb/MMSClientMTMBCTester.dll", "temp/bcmessaging/winscw_udeb/MMSClientMTMBCTester.dll"); +copy($epoc . "winscw/c/testframework/MMSClientMTMBCTester.ini", "temp/bcmessaging/testframework/general/MMSClientMTMBCTester.ini"); +copy($epoc . "winscw/c/testframework/MMSClientMTMBCTester_TestImage.jpg", "temp/bcmessaging/testframework/general/MMSClientMTMBCTester_TestImage.jpg"); +copy($epoc . "release/winscw/udeb/PluginBioControlAPITest.dll", "temp/bcmessaging/winscw_udeb/PluginBioControlAPITest.dll"); +copy($epoc . "winscw/c/testframework/tcTestUIBioCombiner.cfg", "temp/bcmessaging/testframework/general/tcTestUIBioCombiner.cfg"); +copy($epoc . "winscw/c/testframework/ui_PluginBioControlAPITest.cfg", "temp/bcmessaging/testframework/general/ui_PluginBioControlAPITest.cfg"); +copy($epoc . "winscw/c/testframework/test.txt", "temp/bcmessaging/testframework/general/test.txt"); +copy($epoc . "winscw/c/testframework/PluginBioControlAPITest.rsc", "temp/bcmessaging/testframework/general/PluginBioControlAPITest.rsc"); +copy($epoc . "data/z/resource/pluginbiocontrolapitest.rsc", "temp/bcmessaging/resource/general/pluginbiocontrolapitest.rsc"); +copy($epoc . "data/z/resource/pluginbiocontrolapitest.r01", "temp/bcmessaging/resource/general/pluginbiocontrolapitest.r01"); + +system("7z a -tzip messaging.zip ./temp/*"); \ No newline at end of file diff -r 0af8245d50a0 -r f8a0be15f790 common/tools/ats/bctest/messaging/messaging.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/common/tools/ats/bctest/messaging/messaging.xml Mon Sep 21 16:18:20 2009 +0100 @@ -0,0 +1,171 @@ + + + 1 + admin + 10 + + Messaging BC Tests + + + + + + + + + + + + + + + makedir + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + execute + + + + + + + + + fetch-log + + + + + + + + makedir + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + execute + + + + + + + + + fetch-log + + + + + + + + + + bcmessaging/winscw_udeb/MMSClientMTMBCTester.dll + bcmessaging/testframework/general/MMSClientMTMBCTester.ini + bcmessaging/testframework/general/MMSClientMTMBCTester_TestImage.jpg + bcmessaging/winscw_udeb/PluginBioControlAPITest.dll + bcmessaging/testframework/general/tcTestUIBioCombiner.cfg + bcmessaging/testframework/general/ui_PluginBioControlAPITest.cfg + bcmessaging/testframework/general/test.txt + bcmessaging/testframework/general/PluginBioControlAPITest.rsc + bcmessaging/resource/general/pluginbiocontrolapitest.rsc + bcmessaging/resource/general/pluginbiocontrolapitest.r01 + + \ No newline at end of file diff -r 0af8245d50a0 -r f8a0be15f790 common/tools/ats/bctest/websrv/websrv.xml --- a/common/tools/ats/bctest/websrv/websrv.xml Fri Sep 18 11:41:08 2009 +0100 +++ b/common/tools/ats/bctest/websrv/websrv.xml Mon Sep 21 16:18:20 2009 +0100 @@ -133,7 +133,7 @@ - + diff -r 0af8245d50a0 -r f8a0be15f790 common/tools/populateziptemplate.pl --- a/common/tools/populateziptemplate.pl Fri Sep 18 11:41:08 2009 +0100 +++ b/common/tools/populateziptemplate.pl Mon Sep 21 16:18:20 2009 +0100 @@ -26,11 +26,6 @@ my $template = shift or die "Second arg must be template file"; my $ftl = shift or die "Third arg must be output file"; my $rndExcludes = shift or die "Fourth arg must be rnd-excludes file"; -my $nosource = shift; -if(defined $nosource && $nosource !~ m/--nosource/i) -{ - die "fifth argument can only be \'--nosource\'"; -} # Load CSV open my $csvText, "<", $sourcesCSV or die "Unable to open sources.csv from $sourcesCSV"; @@ -79,8 +74,6 @@ $package->{dst} =~ s{^/}{}g; if ($package->{source} =~ m{/(sfl|oss)/(MCL|FCL)/sf/([^/]+)/([^/]+)}) { - if(!defined $nosource) - { push @{$zipConfig->{config}->{config}->{src}->{config}->{$1}->{config}}, { set => @@ -95,16 +88,22 @@ }, ] }; - } } elsif ($package->{source} =~ m{/rnd/([^/]+)/([^/]+)}) { # RnD repository - my $name = "binaries_$2"; - if ($1 eq "rndonly") { $name="bin_$1_$2";} + my $licenseType = $1; + my $name="bin_$1_$2"; + my $postbuildName = "binaries_$2"; + my $config = "rnd"; + if ($licenseType eq "internal") + { + $name = "binaries_$2_prebuild"; + $config = "rnd-internal"; + } # Create a zip object - push @{$zipConfig->{config}->{config}->{src}->{config}->{rnd}->{config}}, + push @{$zipConfig->{config}->{config}->{$config}->{config}}, { set => [ @@ -125,19 +124,33 @@ # Enumerate all the files on the local disk that are in this repository (my $dosCompatibleDst = $package->{dst}) =~ s{/}{\\}g; my @files = `dir /b/s/a-d $dosCompatibleDst 2> nul:`; - #print "@files\n"; next unless @files; - # Add the files to this zip object + # Add the files to the global list of items to be excluded in the binary zips @files = grep { + chomp; s{\\}{/}g; s!^[A-Z]:/$package->{dst}/!!i; m{^epoc32/}i; } @files; push @allRndFiles, @files; - - open FILE, ">", $name ."_includefile.txt" or die "Cannot write includefile!"; - print FILE @files; - close FILE; + + if ($licenseType eq "internal") + { + # Add a zip object to zip this package from the epoc tree in the postbuild phase + push @{$zipConfig->{config}->{config}->{"rnd-postbuild"}->{config}}, + { + name => $postbuildName, + set => + [ + { + name => "name", + value=> $postbuildName, + }, + # Turn the array of files into an array of inclusion hashes + (map { {name => "include", value => $_ } } @files), + ] + }; + } } else { diff -r 0af8245d50a0 -r f8a0be15f790 common/tools/sysModelFilter.pl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/common/tools/sysModelFilter.pl Mon Sep 21 16:18:20 2009 +0100 @@ -0,0 +1,162 @@ +#!perl -w + +use strict; + +use XML::Parser; + +my $sysModel = shift or die "First arg must be system model xml file"; +my @filters = @ARGV or die "Subsequent arg(s) must be filter(s) to apply"; + +# Sort out the positive and negative filters specified +my @negativeFilters; +my @positiveFilters; +foreach my $filter (@filters) +{ + if ($filter =~ m{^!(.*)}) + { + push @negativeFilters, $1; + } + else + { + push @positiveFilters, $filter; + } +} + +# Read input tree +my $parser = new XML::Parser(Style => "Objects") or die; +my $sysTree = eval { $parser->parsefile($sysModel) } or die "Failed to parse $sysModel : $@"; + +# Apply filter +filterTree($sysTree->[0], \@negativeFilters, \@positiveFilters); + +# Output total tree +print "\n"; +printTree($sysTree->[0]); +print "\n"; + +exit; + +sub filterTree +{ + my $tree = shift; + my $negativeFilters = shift; + my $positiveFilters = shift; + + if (exists $tree->{filter}) + { + # Work out how this item in the tree is tagged for filtering + my $itemTags = [split ",", $tree->{filter}]; + my @negativeTags; + my @positiveTags; + foreach my $tag (@$itemTags) + { + if ($tag =~ m{^!(.*)}) + { + push @negativeTags, $1; + } + else + { + push @positiveTags, $tag; + } + } + + # Test whether this item should be removed + if (intersect(\@positiveTags, $negativeFilters) || + intersect(\@negativeTags, $positiveFilters) ) + { + # It should! + # Return false, and the removal will be executed by the + # calling instance + # (No need to examine children) + return 0; + } + + # Tidy up the filter attribute + # Remove tags from this item that have been "used up" + # Remove the filter attribute entirely if they have all been + # used up + my %filterLookup = map { $_ => 1 } (@$negativeFilters, @$positiveFilters); + @$itemTags = grep { !exists $filterLookup{$_} } @$itemTags; + if (scalar @$itemTags) + { + $tree->{filter} = join ",", @$itemTags; + } + else + { + delete $tree->{filter}; + } + } + + # Now iterate through the children of this item and remove any that + # should be filtered out + @{$tree->{Kids}} = grep { + filterTree($_, $negativeFilters, $positiveFilters) + } @{$tree->{Kids}}; + + # Return true so that the calling instance will preserve this item in + # the output tree + return 1; +} + +# Test whether two sets (arrays) intersect +sub intersect +{ + my $set1 = shift; + my $set2 = shift; + + my %set1 = map { $_ => 1 } @$set1; + foreach (@$set2) + { + return 1 if exists $set1{$_}; + } + return 0; +} + +sub printTree +{ + my $tree = shift or die; + die unless ref $tree; + + my $tagName = ref $tree; + $tagName =~ s{^main::}{}; + if ($tagName eq "Characters") + { + print $tree->{Text}; + return; + } + + print "<$tagName"; + + foreach my $attr ( + sort { + my $order = "unofficial name long-name tech_domain level span schema levels filter introduced deprecated purpose class plugin origin-model bldFile mrp version priority"; + my $ixA = 1 + index $order, $a or die $a; + my $ixB = 1 + index $order, $b or die $b; + $ixA - $ixB; + } + grep { + ! ref $tree->{$_} + } + keys %$tree) + { + print " $attr=\"$tree->{$attr}\""; + } + + my $children = $tree->{Kids}; + if (scalar @$children) + { + print ">"; + foreach my $child (@$children) + { + printTree($child); + } + print ""; +} + diff -r 0af8245d50a0 -r f8a0be15f790 common/tools/zip_includefiles.pl --- a/common/tools/zip_includefiles.pl Fri Sep 18 11:41:08 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,13 +0,0 @@ -#!perl -w - -use strict; - -my @includefiles = glob "*_includefile.txt"; -foreach (@includefiles) -{ - my $includefilename=$_; - if (m/(.*)(_includefile.txt)/) { - my $zipfilename = $1.".zip"; - system("7za a -tzip -i@".$includefilename . " " .$zipfilename); - } -} \ No newline at end of file diff -r 0af8245d50a0 -r f8a0be15f790 sf-package/package_props.ant.xml --- a/sf-package/package_props.ant.xml Fri Sep 18 11:41:08 2009 +0100 +++ b/sf-package/package_props.ant.xml Mon Sep 21 16:18:20 2009 +0100 @@ -8,7 +8,7 @@ - + diff -r 0af8245d50a0 -r f8a0be15f790 sf-platform/build.xml --- a/sf-platform/build.xml Fri Sep 18 11:41:08 2009 +0100 +++ b/sf-platform/build.xml Mon Sep 21 16:18:20 2009 +0100 @@ -27,7 +27,9 @@ [SF-platform-bootstrap-gt] - + + +