--- a/kernel/eka/compsupp/bld.inf Wed Jun 09 11:10:19 2010 +0300
+++ b/kernel/eka/compsupp/bld.inf Tue Jul 06 11:40:58 2010 +0100
@@ -32,47 +32,62 @@
PRJ_MMPFILES
-#if !defined GCCXML && !defined GCCE
+#if !defined(GCCXML) && !defined(GCCE)
symcpp/scppnwdl.mmp
rvct/dfprvct-thunk.mmp
rvct/usrt.mmp
rvct/ksrt.mmp
- #ifndef SMP // Only static libraries build for SMP.
+ #ifndef SMP // Don't build dynamic libraries for SMP.
- rvct/drtaeabi.mmp
+ rvct/drtaeabi.mmp
- rvct/dfpaeabi.mmp
- rvct/dfpaeabi_vfpv2.mmp
+ rvct/dfpaeabi.mmp
+ rvct/dfpaeabi_vfpv2.mmp
- #if defined(ARMCC_2_2) || defined(ARMCC_3_1)
+ #if defined(ARMCC_2_2) || defined(ARMCC_3_1)
- rvct/drtrvct.mmp
- rvct/drtrvct_vfpv2.mmp
+ rvct/drtrvct.mmp
+ rvct/drtrvct_vfpv2.mmp
+
+ rvct/dfprvct.mmp
+ rvct/dfprvct_vfpv2.mmp
- rvct/dfprvct.mmp
- rvct/dfprvct_vfpv2.mmp
- #endif
+ #endif
- #endif
+ #endif // #ifndef SMP
+
+#endif // #if !defined(GCCXML) && !defined(GCCE)
+
PRJ_EXTENSIONS
-// Unzip RVCT3.1 runtime if being built with RVCT2.2 or RVCT4.0
+#if !defined(GCCXML) && !defined(GCCE)
+
+ // We need the runtime libraries for all versions of the compiler.
+ // The version we're running with will build its own runtime library;
+ // we need to extract the other versions from archives.
-start extension tools/compsupp
+ #ifndef ARMCC_2_2
+ start extension tools/compsupp
+ option FILE $(EXTENSION_ROOT)/rt_2_2.zip
+ option TODIR $(EPOCROOT)epoc32/release
+ end
+ #endif
-#if defined(ARMCC_2_2) || defined(ARMCC_4_0)
-option FILE $(EXTENSION_ROOT)/rt_3_1.zip
-#elif defined(ARMCC_3_1)
-option FILE $(EXTENSION_ROOT)/rt_2_2.zip
-#endif
+ #ifndef ARMCC_3_1
+ start extension tools/compsupp
+ option FILE $(EXTENSION_ROOT)/rt_3_1.zip
+ option TODIR $(EPOCROOT)epoc32/release
+ end
+ #endif
-option TODIR $(EPOCROOT)epoc32/release
-
-end
+ #ifndef ARMCC_4_0
+ start extension tools/compsupp
+ option FILE $(EXTENSION_ROOT)/rt_4_0.zip
+ option TODIR $(EPOCROOT)epoc32/release
+ end
+ #endif
-#endif // #if !defined GCCXML && !defined GCCE
-
-
+#endif // #if !defined(GCCXML) && !defined(GCCE)
Binary file kernel/eka/compsupp/rt_2_2.zip has changed
Binary file kernel/eka/compsupp/rt_3_1.zip has changed
Binary file kernel/eka/compsupp/rt_4_0.zip has changed
--- a/kerneltest/e32utils/group/base_e32utils.mrp Wed Jun 09 11:10:19 2010 +0300
+++ b/kerneltest/e32utils/group/base_e32utils.mrp Tue Jul 06 11:40:58 2010 +0100
@@ -16,8 +16,6 @@
source \sf\os\kernelhwsrv\kerneltest\e32utils\testusbcldd
source \sf\os\kernelhwsrv\kerneltest\e32utils\trace
source \sf\os\kernelhwsrv\kerneltest\e32utils\usbmsapp
-source \sf\os\kernelhwsrv\kerneltest\e32utils\sdpartition
-source \sf\os\kernelhwsrv\kerneltest\e32utils\nandboot\coreldr\bootstrap_smrif.h
#MattD: Reltools 2.67 don't understand 'cwtools' are the CW equivelent of 'tools' and try to do '-what cwtools udeb' instead of '-what cwtools deb'.
#binary \sf\os\kernelhwsrv\kerneltest\e32utils\group cwtools
@@ -27,7 +25,6 @@
binary \epoc32\release\tools\rel\analyse.exe
binary \epoc32\release\tools\rel\netcards.exe
--export_file \sf\os\kernelhwsrv\kerneltest\e32utils\analyse\profiler.rtf \epoc32\engdoc\profiler\Profiler.rtf
notes_source \component_defs\release.src
--- a/kerneltest/e32utils/group/bld.inf Wed Jun 09 11:10:19 2010 +0300
+++ b/kerneltest/e32utils/group/bld.inf Tue Jul 06 11:40:58 2010 +0100
@@ -30,12 +30,8 @@
PRJ_EXPORTS
-../nandboot/coreldr/bootstrap_smrif.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bootstrap_smrif.h)
-
../profiler/profiler.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(profiler.h)
-../analyse/profiler.rtf /epoc32/engdoc/profiler/profiler.rtf
-
../d_exc/printstk.pl /epoc32/rom/tools/printstk.pl
../d_exc/printsym.pl /epoc32/rom/tools/printsym.pl