Am 03/22/2016 08:08 PM, schrieb Damjan Jovanovic:
Hi
For the past month I've been working on preparing the gbuild branch
for merge into trunk, and I believe it to be essentially ready.
My work can be found in branches/gbuild-reintegration which started as
a branch of trunk to which all patches from branches/gbuild patches
were gradually merged, and can be now checked out for testing with
"svn co
https://svn.apache.org/repos/asf/openoffice/branches/gbuild-reintegration";.
There is total of 136 patches ported from branches/gbuild, and various
others I've written myself to fix problems. The changes are mostly
build related but there are others. Here is an overview:
* 20 more modules ported from dmake to gbuild, doubling the number of
gbuild modules we have.
* IDL files build with gbuild.
* Java files can also build with gbuild now.
* JAR and ZIP can be built with gbuild.
* Fixes bugs 117685, 117218, 117340, 116880, 116755, 117350, 117340,
117610, 116959, 117845, 117687, and 117171. Note how at least 116755
is a user-visible bug in OOXML parsing.
* Many general gbuild improvements. Better diagnostics when deliver
fails, compiler/linker flags are added instead of overwritten, flags
can be overridden from the command line, etc.
* RepositoryExternal.mk for external dependencies instead of various hacks.
* Currently gbuild doesn't pass -D_DLL to MSVC's cl.exe, resulting in
the inability to link executables and Google Tests to the C++ standard
library on Windows. This is fixed.
A RAT scan of the branch is clean. Linux, FreeBSD and Windows build
and pass all Google Tests. The bvt QA tests pass and preliminary fvt
results look good.
I don't have the ability to test Mac OS and it would be appreciated if
someone could or remote access could be given to me so I can. MingW
might be worth a look. I don't have Solaris, and Illumos needs serious
attention, as a large number of patches needed for even AOO trunk to
build there, submitted by Alexander Pyhalov on 1 August 2014, still
hasn't been committed yet. OS/2 is beyond me.
But those strike me as minority platforms and compilers anyway, and
can be fixed in trunk at a later stage. Can I merge
branches/gbuild-reintegration to trunk now?
wow and \o/ . Thats great news. :-)
As non-coder I've not the biggest inside and knowledge. However, I'm
still afraid of breaking something in Trunk. So, please bear with me
when I ask the following:
How big is the effort to do the opposite first?
Copying your branch into a clone, updating it with the current Trunk, do
needed cleanup and fixes and then see how stable the builds on all our
supported platforms are.
If this shows no bigger problems and little bugs can be handled in a
short time and are fixable, then we can think about how to bring your
branch into Trunk.
Yes, maybe it looks a bit paranoid. But doing bigger fixes on Trunk
could be a problem for a longer time and this must be avoided.
My 2 ct.
Marcus
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@openoffice.apache.org
For additional commands, e-mail: dev-h...@openoffice.apache.org
