Merge from symbian repo
authormikek
Fri, 04 Jun 2010 13:19:09 +0100
changeset 19 d2fccb2bbe1a
parent 18 de5b887c98f7 (current diff)
parent 17 af35094e1bc4 (diff)
child 20 f2446ffbf2b5
Merge from symbian repo
cross-plat-dev-utils/patch-files/diffs/patch-0f5e3a7fb6af.patch
sbsv2/raptor/python/filter_interface.pyc
sbsv2/raptor/python/filter_list.pyc
sbsv2/raptor/python/filter_utils.pyc
sbsv2/raptor/python/generic_path.pyc
sbsv2/raptor/python/mmpparser.pyc
sbsv2/raptor/python/pluginbox.pyc
sbsv2/raptor/python/plugins/dummyplugin.pyc
sbsv2/raptor/python/plugins/filter_carbide.pyc
sbsv2/raptor/python/plugins/filter_checksource.pyc
sbsv2/raptor/python/plugins/filter_clean.pyc
sbsv2/raptor/python/plugins/filter_logfile.pyc
sbsv2/raptor/python/plugins/filter_splitlog.pyc
sbsv2/raptor/python/plugins/filter_squashlog.pyc
sbsv2/raptor/python/plugins/filter_terminal.pyc
sbsv2/raptor/python/plugins/filter_what.pyc
sbsv2/raptor/python/pyparsing.pyc
sbsv2/raptor/python/raptor.pyc
sbsv2/raptor/python/raptor_cache.pyc
sbsv2/raptor/python/raptor_cli.pyc
sbsv2/raptor/python/raptor_data.pyc
sbsv2/raptor/python/raptor_make.pyc
sbsv2/raptor/python/raptor_makefile.pyc
sbsv2/raptor/python/raptor_meta.pyc
sbsv2/raptor/python/raptor_utilities.pyc
sbsv2/raptor/python/raptor_version.pyc
sbsv2/raptor/python/raptor_xml.pyc
--- a/.hgignore	Fri Jun 04 13:09:28 2010 +0100
+++ b/.hgignore	Fri Jun 04 13:19:09 2010 +0100
@@ -5,4 +5,3 @@
 *.pyc
 *linux-*-libc*
 
-
--- a/README	Fri Jun 04 13:09:28 2010 +0100
+++ b/README	Fri Jun 04 13:19:09 2010 +0100
@@ -39,7 +39,8 @@
 Mingw GCC 3.4.x toolchain Standard C++ Library, from a Symbian PDT 1.6
 installation.
 
-(There is one unimportant target that cannot be built. This is the sbsv2guide
+(The Raptor test-suite targets are skipped, and there is one unimportant
+target export target that cannot be built. This is the sbsv2guide
 target, which merely exports documentation for Raptor. It cannot be fixed
 because the documentation is not present in the upstream package at the branched
 revision, bug #2607.)
@@ -102,16 +103,20 @@
 * Install libxml2 and its headers. These are also bundled with the upstream
 package for building the imgtools/imgcheck target, but there is no target that
 exports them so they are not found by the imgcheck build.
+
+* N.B. On a 64-bit host, you must install the 32-bit variants of the boost and libxml2
+libraries. Raptor is built to the host's native wordsize, but all the targets
+that are built with Raptor must be 32-bit for compatibility with epoc32 APIs.
     
 * Clone, copy or extract this package into a directory that is going to be your
 EPOCROOT for Raptor builds.
 
 * Browse to the Symbian Developer website, http://developer.symbian.org
 * Navigate: Tools & Kits -> Download the Symbian^3 kits.
-* This package is built using Symbian headers from PDK 3.0.h. If that is not the
+* This package is built using Symbian headers from PDK 3.0.i. If that is not the
 current PDK listed under Downloads, then click "Previous releases" and navigate
-to the download page for PDK 3.0.h.
-* Download the following 3 zip archives from PDK 3.0.h and extract them into
+to the download page for PDK 3.0.i.
+* Download the following 3 zip archives from PDK 3.0.i and extract them into
 your EPOCROOT directory:
   - binaries_epoc.zip, 
   - binaries_epoc_sdk.zip 
@@ -134,10 +139,10 @@
 
 * Browse to the Symbian Developer website, http://developer.symbian.org
 * Navigate: Tools & Kits -> Download the Symbian^3 kits.
-* This package is built using Symbian headers from PDK 3.0.h. If that is not the
+* This package is built using Symbian headers from PDK 3.0.i. If that is not the
 current PDK listed under Downloads, then click "Previous releases" and navigate
-to the download page for PDK 3.0.h.
-* Download the following 3 zip archives from PDK 3.0.h and extract them into
+to the download page for PDK 3.0.i.
+* Download the following 3 zip archives from PDK 3.0.i and extract them into
 your EPOCROOT directory:
   - binaries_epoc.zip, 
   - binaries_epoc_sdk.zip 
--- a/TODO	Fri Jun 04 13:09:28 2010 +0100
+++ b/TODO	Fri Jun 04 13:19:09 2010 +0100
@@ -9,9 +9,7 @@
 2.	Build the package on platforms not listed here, and add them to the
 	list:
 		Windows XP 32bit
-		Ubuntu 10.4 32bit
-
-3.	Fix the package to be 32/64 bit portable. *Not easy*
+		Ubuntu 9.04,10.4 32/64bit
 
 4.	Find all the perl scripts that are exported and ensure they run on
 	Linux.
Binary file sbsv2/raptor/python/filter_interface.pyc has changed
Binary file sbsv2/raptor/python/filter_list.pyc has changed
Binary file sbsv2/raptor/python/filter_utils.pyc has changed
Binary file sbsv2/raptor/python/generic_path.pyc has changed
Binary file sbsv2/raptor/python/mmpparser.pyc has changed
Binary file sbsv2/raptor/python/pluginbox.pyc has changed
Binary file sbsv2/raptor/python/plugins/dummyplugin.pyc has changed
Binary file sbsv2/raptor/python/plugins/filter_carbide.pyc has changed
Binary file sbsv2/raptor/python/plugins/filter_checksource.pyc has changed
Binary file sbsv2/raptor/python/plugins/filter_clean.pyc has changed
Binary file sbsv2/raptor/python/plugins/filter_logfile.pyc has changed
Binary file sbsv2/raptor/python/plugins/filter_splitlog.pyc has changed
Binary file sbsv2/raptor/python/plugins/filter_squashlog.pyc has changed
Binary file sbsv2/raptor/python/plugins/filter_terminal.pyc has changed
Binary file sbsv2/raptor/python/plugins/filter_what.pyc has changed
Binary file sbsv2/raptor/python/pyparsing.pyc has changed
Binary file sbsv2/raptor/python/raptor.pyc has changed
Binary file sbsv2/raptor/python/raptor_cache.pyc has changed
Binary file sbsv2/raptor/python/raptor_cli.pyc has changed
Binary file sbsv2/raptor/python/raptor_data.pyc has changed
Binary file sbsv2/raptor/python/raptor_make.pyc has changed
Binary file sbsv2/raptor/python/raptor_makefile.pyc has changed
Binary file sbsv2/raptor/python/raptor_meta.pyc has changed
Binary file sbsv2/raptor/python/raptor_utilities.pyc has changed
Binary file sbsv2/raptor/python/raptor_version.pyc has changed
Binary file sbsv2/raptor/python/raptor_xml.pyc has changed