# HG changeset patch # User Brendan Donegan brendand@symbian.org # Date 1253187571 -3600 # Node ID 8cf07278ef12d679f3c73a8646ec227f95a78882 # Parent 48fbe8fe50763fac227e3bbec2848f80915a8ecc# Parent 874d2406736612bef9e71f8b6efc1ab47d71e4f0 merge diff -r 48fbe8fe5076 -r 8cf07278ef12 common/build.xml --- a/common/build.xml Thu Sep 17 12:37:19 2009 +0100 +++ b/common/build.xml Thu Sep 17 12:39:31 2009 +0100 @@ -442,25 +442,12 @@ - - - - - - - - - - - - - @@ -471,11 +458,7 @@ - - - - - + @@ -484,22 +467,40 @@ - - - - - + + + + + + + + + + + + + + + - + - - - - - - - + + + + + + + + + + + + + + + diff -r 48fbe8fe5076 -r 8cf07278ef12 common/templates/zip.cfg.xml.ftl.template --- a/common/templates/zip.cfg.xml.ftl.template Thu Sep 17 12:37:19 2009 +0100 +++ b/common/templates/zip.cfg.xml.ftl.template Thu Sep 17 12:39:31 2009 +0100 @@ -19,14 +19,14 @@ + + + + + + - - - - - - diff -r 48fbe8fe5076 -r 8cf07278ef12 common/tools/ats/bctest/browser/browser.pl --- a/common/tools/ats/bctest/browser/browser.pl Thu Sep 17 12:37:19 2009 +0100 +++ b/common/tools/ats/bctest/browser/browser.pl Thu Sep 17 12:39:31 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 48fbe8fe5076 -r 8cf07278ef12 common/tools/ats/bctest/browser/browser.xml --- a/common/tools/ats/bctest/browser/browser.xml Thu Sep 17 12:37:19 2009 +0100 +++ b/common/tools/ats/bctest/browser/browser.xml Thu Sep 17 12:39:31 2009 +0100 @@ -49,10 +49,54 @@ + + + makedir + + + + + + install + + + + + + + + + install + + + + + + + + + execute + + + + + + + + + fetch-log + + + + + bcbrowser/winscw_udeb/favouritesbctest.dll + + bcwebsrv/winscw_udeb/downloadmgrbctest.dll + bcwebsrv/general/testframework/testframework_dwmgr.ini - \ No newline at end of file + diff -r 48fbe8fe5076 -r 8cf07278ef12 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 Thu Sep 17 12:39:31 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 48fbe8fe5076 -r 8cf07278ef12 common/tools/populateziptemplate.pl --- a/common/tools/populateziptemplate.pl Thu Sep 17 12:37:19 2009 +0100 +++ b/common/tools/populateziptemplate.pl Thu Sep 17 12:39:31 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,7 +88,6 @@ }, ] }; - } } elsif ($package->{source} =~ m{/rnd/([^/]+)/([^/]+)}) {