# HG changeset patch # User mikek # Date 1275653949 -3600 # Node ID d2fccb2bbe1aba3edbd097a5050cef5457e1ed1a # Parent de5b887c98f76706b303a48406e97aff73191758# Parent af35094e1bc48c26ab020a418ea73aa2bae648a8 Merge from symbian repo diff -r de5b887c98f7 -r d2fccb2bbe1a .hgignore --- 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* - diff -r de5b887c98f7 -r d2fccb2bbe1a README --- 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 diff -r de5b887c98f7 -r d2fccb2bbe1a TODO --- 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. diff -r de5b887c98f7 -r d2fccb2bbe1a cross-plat-dev-utils/patch-files/diffs/patch-0f5e3a7fb6af.patch diff -r de5b887c98f7 -r d2fccb2bbe1a sbsv2/raptor/python/filter_interface.pyc Binary file sbsv2/raptor/python/filter_interface.pyc has changed diff -r de5b887c98f7 -r d2fccb2bbe1a sbsv2/raptor/python/filter_list.pyc Binary file sbsv2/raptor/python/filter_list.pyc has changed diff -r de5b887c98f7 -r d2fccb2bbe1a sbsv2/raptor/python/filter_utils.pyc Binary file sbsv2/raptor/python/filter_utils.pyc has changed diff -r de5b887c98f7 -r d2fccb2bbe1a sbsv2/raptor/python/generic_path.pyc Binary file sbsv2/raptor/python/generic_path.pyc has changed diff -r de5b887c98f7 -r d2fccb2bbe1a sbsv2/raptor/python/mmpparser.pyc Binary file sbsv2/raptor/python/mmpparser.pyc has changed diff -r de5b887c98f7 -r d2fccb2bbe1a sbsv2/raptor/python/pluginbox.pyc Binary file sbsv2/raptor/python/pluginbox.pyc has changed diff -r de5b887c98f7 -r d2fccb2bbe1a sbsv2/raptor/python/plugins/dummyplugin.pyc Binary file sbsv2/raptor/python/plugins/dummyplugin.pyc has changed diff -r de5b887c98f7 -r d2fccb2bbe1a sbsv2/raptor/python/plugins/filter_carbide.pyc Binary file sbsv2/raptor/python/plugins/filter_carbide.pyc has changed diff -r de5b887c98f7 -r d2fccb2bbe1a sbsv2/raptor/python/plugins/filter_checksource.pyc Binary file sbsv2/raptor/python/plugins/filter_checksource.pyc has changed diff -r de5b887c98f7 -r d2fccb2bbe1a sbsv2/raptor/python/plugins/filter_clean.pyc Binary file sbsv2/raptor/python/plugins/filter_clean.pyc has changed diff -r de5b887c98f7 -r d2fccb2bbe1a sbsv2/raptor/python/plugins/filter_logfile.pyc Binary file sbsv2/raptor/python/plugins/filter_logfile.pyc has changed diff -r de5b887c98f7 -r d2fccb2bbe1a sbsv2/raptor/python/plugins/filter_splitlog.pyc Binary file sbsv2/raptor/python/plugins/filter_splitlog.pyc has changed diff -r de5b887c98f7 -r d2fccb2bbe1a sbsv2/raptor/python/plugins/filter_squashlog.pyc Binary file sbsv2/raptor/python/plugins/filter_squashlog.pyc has changed diff -r de5b887c98f7 -r d2fccb2bbe1a sbsv2/raptor/python/plugins/filter_terminal.pyc Binary file sbsv2/raptor/python/plugins/filter_terminal.pyc has changed diff -r de5b887c98f7 -r d2fccb2bbe1a sbsv2/raptor/python/plugins/filter_what.pyc Binary file sbsv2/raptor/python/plugins/filter_what.pyc has changed diff -r de5b887c98f7 -r d2fccb2bbe1a sbsv2/raptor/python/pyparsing.pyc Binary file sbsv2/raptor/python/pyparsing.pyc has changed diff -r de5b887c98f7 -r d2fccb2bbe1a sbsv2/raptor/python/raptor.pyc Binary file sbsv2/raptor/python/raptor.pyc has changed diff -r de5b887c98f7 -r d2fccb2bbe1a sbsv2/raptor/python/raptor_cache.pyc Binary file sbsv2/raptor/python/raptor_cache.pyc has changed diff -r de5b887c98f7 -r d2fccb2bbe1a sbsv2/raptor/python/raptor_cli.pyc Binary file sbsv2/raptor/python/raptor_cli.pyc has changed diff -r de5b887c98f7 -r d2fccb2bbe1a sbsv2/raptor/python/raptor_data.pyc Binary file sbsv2/raptor/python/raptor_data.pyc has changed diff -r de5b887c98f7 -r d2fccb2bbe1a sbsv2/raptor/python/raptor_make.pyc Binary file sbsv2/raptor/python/raptor_make.pyc has changed diff -r de5b887c98f7 -r d2fccb2bbe1a sbsv2/raptor/python/raptor_makefile.pyc Binary file sbsv2/raptor/python/raptor_makefile.pyc has changed diff -r de5b887c98f7 -r d2fccb2bbe1a sbsv2/raptor/python/raptor_meta.pyc Binary file sbsv2/raptor/python/raptor_meta.pyc has changed diff -r de5b887c98f7 -r d2fccb2bbe1a sbsv2/raptor/python/raptor_utilities.pyc Binary file sbsv2/raptor/python/raptor_utilities.pyc has changed diff -r de5b887c98f7 -r d2fccb2bbe1a sbsv2/raptor/python/raptor_version.pyc Binary file sbsv2/raptor/python/raptor_version.pyc has changed diff -r de5b887c98f7 -r d2fccb2bbe1a sbsv2/raptor/python/raptor_xml.pyc Binary file sbsv2/raptor/python/raptor_xml.pyc has changed