On Mon, 2008-03-03 at 10:26 +0100, Bernd Eilers wrote: > Caolan McNamara wrote: > > Some of our bundled things are possibly mangled beyond all repair in > > terms of our ability to move to a later version or getting the changes > > integrated into their upstreams e.g. our xmlsec1 and rhino, and... > > > > Well that´s one of the main things ChildWorkspace handling > (http://wiki.services.openoffice.org/wiki/CWS) has been designed for: > allowing developers to work on a couple of new features and bugfixes > while making it relative easy to rebase the newly developed stuff to > what´s going on in the main branch. There´s an utility called cwsresync > that does most of the work needed to rebase to a new version for you. I > would just wish that all developers would just use them instead of some > maintaining their own private source code on their hardisk and not as a > branch in CVS and not as a CWS and than creating patches from that.
I think you misunderstand, in this case my "our" in "our bundled things" refered to "openoffice.org" itself. We're talking here about the third party code that is bundled into the normal vanilla openoffice.org and is built in the normal vanilla build by auto-unpacking the upstream tarballs of those projects, and then having a patch autoapplied to them by the normal build process before continuing the build. e.g. stlport, icu, agg, jfreereport, jpeg, beanshell, berkleydb, libtextcat, libwpd, libxml2, sndfile, libxmlsec, libxslt, lpsolve, msfontextract, nas, neon, curl, expat, portaudio, python, vigra, boost etc. And of those various projects some are just patched to build, and some are patched to build and to include some fixes, and some are patched heavily to build, to include some fixes and to add some extensive new features. And in the current system a single patch is placed in the module to be auto-applied against the original source which makes it quite difficult to un-munge the individual changes to e.g. re-base the patches on a new version of the bundled berkleydb to move to a version which known fixes, or to e.g. figure out which changes to rhino are intended to just remove "file open" from the menu and which are for adding other features. C. --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
