--- a/README Tue May 11 08:11:21 2010 +0100
+++ b/README Tue May 11 11:57:51 2010 +0100
@@ -26,7 +26,7 @@
This package is a branch from the Symbian Build package
(http://developer.symbian.org/oss/MCL/sftools/dev/build) at Mercurial revision
mentioned in the file baseline.txt. The Build package "provides everything you
-need to build the Symbian platform." This branch work-in-progress toward
+need to build the Symbian platform." This branch is work-in-progress toward
enabling those tools to build without problems and run correctly on a
conventional GNU/Linux host, as well Windows hosts.
--- a/cross-plat-dev-utils/README-LINUX Tue May 11 08:11:21 2010 +0100
+++ b/cross-plat-dev-utils/README-LINUX Tue May 11 11:57:51 2010 +0100
@@ -154,20 +154,20 @@
-d, --diff-file FILE: The diffs will be written to FILE.
Default ./patch-files/diff/patch-N.patch, where N is the baseline revision.
-b, --baseline-dir DIR: The upstream baseline will be cloned into DIR if this
-does not seem to have been done already. Otherwise DIR/build will be udated to
+does not seem to have been done already. Otherwise DIR/build will be updated to
the baseline revision before diffing.
It is assumed that the command 'diff' will invoke the diff tool.
* patch_upstream.pl
-------------------
-Gets a copy of upstream package at the baseline revision in ../baseline.txt and
-applies a patch to it, by default making it the same as the revision of this
+Gets a copy of the upstream package at the baseline revision in ../baseline.txt
+and applies a patch to it, by default making it the same as the revision of this
package that had that upstream baseline.
Options:
-p, --patch-file FILE: Apply the patch file FILE.
Default ./patch-files/diffs/patch-N.patch, where N is the baseline revision
-b, --baseline-dir DIR: The upstream baseline will be cloned into DIR if this
-does not seem to have been done already. Otherwise DIR/build will be udated to
+does not seem to have been done already. Otherwise DIR/build will be updated to
the baseline revision before patching.
It is assumed that the command 'patch' will invoke the patch tool.
--- a/cross-plat-dev-utils/README-WINDOWS Tue May 11 08:11:21 2010 +0100
+++ b/cross-plat-dev-utils/README-WINDOWS Tue May 11 11:57:51 2010 +0100
@@ -153,7 +153,7 @@
-d, --diff-file FILE: The diffs will be written to FILE.
Default ./patch-files/diff/patch-N.patch, where N is the baseline revision.
-b, --baseline-dir DIR: The upstream baseline will be cloned into DIR if this
-does not seem to have been done already. Otherwise DIR/build will be udated to
+does not seem to have been done already. Otherwise DIR/build will be updated to
the baseline revision before diffing.
It is assumed that the command 'diff' will invoke the diff tool. diff is not
standard equioment on Windows but a port is available:
@@ -161,14 +161,14 @@
* patch_upstream.pl
-------------------
-Gets a copy of upstream package at the baseline revision in ../baseline.txt and
-applies a patch to it, by default making it the same as the revision of this
+Gets a copy of the upstream package at the baseline revision in ../baseline.txt
+and applies a patch to it, by default making it the same as the revision of this
package that had that upstream baseline.
Options:
-p, --patch-file FILE: Apply the patch file FILE.
Default ./patch-files/diffs/patch-N.patch, where N is the baseline revision
-b, --baseline-dir DIR: The upstream baseline will be cloned into DIR if this
-does not seem to have been done already. Otherwise DIR/build will be udated to
+does not seem to have been done already. Otherwise DIR/build will be updated to
the baseline revision before patching.
It is assumed that the command 'patch' will invoke the patch tool. patch is not
standard equioment on Windows but a port is available:
--- a/cross-plat-dev-utils/buildlog.txt Tue May 11 08:11:21 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
->>> EPOCROOT not defined. Assuming ../..
->>> EPOCROOT=/home/imk/symbian/epocroot-pdk-3.0.h
->>> OK