--- a/tcpiputils/dhcp/te_dhcp/te_dhcpTestServer.iby Fri Jul 02 18:44:43 2010 +0530
+++ b/tcpiputils/dhcp/te_dhcp/te_dhcpTestServer.iby Thu Jul 08 15:21:49 2010 +0530
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -22,10 +22,9 @@
file=ABI_DIR\DEBUG_DIR\DhcpTestServer.exe System\bin\DhcpTestServer.exe
-#ifndef __DHCP
+#ifdef SYMBIAN_EXCLUDE_DHCP
REM Feature DHCP is not included in this ROM
data=\epoc32\data\z\testdata\scripts\DHCP\te_dhcpremovedtest_ip4.script TestData\scripts\DHCP\te_dhcpremovedtest_ip4.script
-
data=\epoc32\data\z\TestData\configs\DHCP\DHCPced_ip4.xml.omapxxx TestData\configs\DHCP\DHCPced_ip4.xml
data=\epoc32\data\z\TestData\configs\DHCP\dhcptest.ini TestData\configs\DHCP\dhcptest.ini
@@ -34,8 +33,13 @@
//##################### script files
//-- ip4 specific
+#ifdef INCLUDE_SIROCCO_CODE_MIGRATION
+data=\epoc32\data\z\testdata\scripts\DHCP\DHCP_OOM6_ip4_wlan.script TestData\scripts\DHCP\DHCP_OOM6_ip4.script
+data=\epoc32\data\z\testdata\scripts\DHCP\te_DHCPTest_ip4_wlan.script TestData\scripts\DHCP\te_DHCPTest_ip4.script
+#else
data=\epoc32\data\z\testdata\scripts\DHCP\DHCP_OOM6_ip4.script TestData\scripts\DHCP\DHCP_OOM6_ip4.script
data=\epoc32\data\z\testdata\scripts\DHCP\te_DHCPTest_ip4.script TestData\scripts\DHCP\te_DHCPTest_ip4.script
+#endif //INCLUDE_SIROCCO_CODE_MIGRATION
data=\epoc32\data\z\testdata\scripts\DHCP\DHCPBasicInteractions1_ip4.script TestData\scripts\DHCP\DHCPBasicInteractions1_ip4.script
data=\epoc32\data\z\testdata\scripts\DHCP\DHCPConfiguration2_ip4.script TestData\scripts\DHCP\DHCPConfiguration2_ip4.script
data=\epoc32\data\z\testdata\scripts\DHCP\DHCPRenewAndRelease3_ip4.script TestData\scripts\DHCP\DHCPRenewAndRelease3_ip4.script
@@ -46,8 +50,13 @@
file=ABI_DIR\DEBUG_DIR\ramod1.prt SYSTEM_BINDIR\ramod1.prt
file=ABI_DIR\DEBUG_DIR\ramod2.prt SYSTEM_BINDIR\ramod2.prt
file=ABI_DIR\DEBUG_DIR\ramod3.prt SYSTEM_BINDIR\ramod3.prt
+#ifdef INCLUDE_SIROCCO_CODE_MIGRATION
+data=\epoc32\data\z\testdata\scripts\DHCP\DHCP_OOM6_ip6_wlan.script TestData\scripts\DHCP\DHCP_OOM6_ip6.script
+data=\epoc32\data\z\testdata\scripts\DHCP\te_DHCPTest_ip6_wlan.script TestData\scripts\DHCP\te_DHCPTest_ip6.script
+#else
data=\epoc32\data\z\testdata\scripts\DHCP\DHCP_OOM6_ip6.script TestData\scripts\DHCP\DHCP_OOM6_ip6.script
data=\epoc32\data\z\testdata\scripts\DHCP\te_DHCPTest_ip6.script TestData\scripts\DHCP\te_DHCPTest_ip6.script
+#endif //INCLUDE_SIROCCO_CODE_MIGRATION
data=\epoc32\data\z\testdata\scripts\DHCP\DHCPBasicInteractions1_ip6.script TestData\scripts\DHCP\DHCPBasicInteractions1_ip6.script
data=\epoc32\data\z\testdata\scripts\DHCP\DHCPConfiguration2_ip6.script TestData\scripts\DHCP\DHCPConfiguration2_ip6.script
data=\epoc32\data\z\testdata\scripts\DHCP\DHCPRenewAndRelease3_ip6.script TestData\scripts\DHCP\DHCPRenewAndRelease3_ip6.script
@@ -67,7 +76,11 @@
data=\epoc32\data\z\testdata\configs\DHCP\TestDHCPv6Config3\ip.ramod.esk TestData\configs\DHCP\TestDHCPv6Config3\ip.ramod.esk
//SIP server
+#ifdef INCLUDE_SIROCCO_CODE_MIGRATION
+data=\epoc32\data\z\testdata\scripts\DHCP\TE_SIPServer_DHCP_hwonly_ip4_wlan.script TestData\scripts\DHCP\TE_SIPServer_DHCP_hwonly_ip4.script
+#else
data=\epoc32\data\z\testdata\scripts\DHCP\TE_SIPServer_DHCP_hwonly_ip4.script TestData\scripts\DHCP\TE_SIPServer_DHCP_hwonly_ip4.script
+#endif //INCLUDE_SIROCCO_CODE_MIGRATION
data=\epoc32\data\z\testdata\scripts\SipServer_setup.script TestData\scripts\SipServer_setup.script
data=\epoc32\data\z\testdata\scripts\TE_SIPServerTesting.script TestData\scripts\TE_SIPServerTesting.script
data=\epoc32\data\z\testdata\configs\SipServer.xml TestData\configs\SipServer.xml
@@ -81,7 +94,11 @@
#ifdef OMAP16XX
data=\epoc32\data\z\TestData\configs\DHCP\DHCPced_ip4.xml.omapxxx TestData\configs\DHCP\DHCPced_ip4.xml
#else
+#ifdef INCLUDE_SIROCCO_CODE_MIGRATION
+data=\epoc32\data\z\TestData\configs\DHCP\cccccc00_dhcptest_ip4.cre TestData\configs\DHCP\cccccc00_dhcptest_ip4.cre
+#else
data=\epoc32\data\z\TestData\configs\DHCP\DHCPced_ip4.xml.lubbock TestData\configs\DHCP\DHCPced_ip4.xml
+#endif //INCLUDE_SIROCCO_CODE_MIGRATION
#endif
@@ -89,7 +106,11 @@
#ifdef OMAP16XX
data=\epoc32\data\z\TestData\configs\DHCP\DHCPced_ip6.xml.omapxxx TestData\configs\DHCP\DHCPced_ip6.xml
#else
+#ifdef INCLUDE_SIROCCO_CODE_MIGRATION
+data=\epoc32\data\z\TestData\configs\DHCP\cccccc00_dhcptest_ip6.cre TestData\configs\DHCP\cccccc00_dhcptest_ip6.cre
+#else
data=\epoc32\data\z\TestData\configs\DHCP\DHCPced_ip6.xml.lubbock TestData\configs\DHCP\DHCPced_ip6.xml
+#endif //INCLUDE_SIROCCO_CODE_MIGRATION
#endif