Apache OpenOffice (AOO) Bugzilla – Issue 118608
IP clearance: Remove cppunit source
Last modified: 2013-02-21 23:22:48 UTC
cppunit has LGPL license and therefore its source code can not be part of Apache OpenOffice. A pre-installed version can still be used. It is also not essential for building the office, but is, of course, desirable during development.
Created attachment 77040 [details] Removed cppunit module. Removed cppunit module that builds the tar-ball from ext-sources. Made the use of cppunit optional. The --with-system-cppunit tells configure to search a pre-installed cppunit. The new gnu make build system had the use of the internal cppunit hard-wired. Changed that.
Hi; I still see some files in cppunit: ls -la cppunit total 56 drwxr-xr-x 5 pedro wheel 512 Nov 21 21:53 . drwxr-xr-x 203 pedro wheel 4608 Nov 22 14:05 .. drwxr-xr-x 6 pedro wheel 512 Nov 22 14:03 .svn -rw-r--r-- 1 pedro wheel 374 Nov 21 16:13 ldflags.patch -rw-r--r-- 1 pedro wheel 6797 Nov 21 16:13 makefile.mk -rw-r--r-- 1 pedro wheel 1517 Nov 21 16:13 ooo-DllPlugInTester.mk -rw-r--r-- 1 pedro wheel 3112 Nov 21 16:13 ooo-cppunit_dll.mk drwxr-xr-x 3 pedro wheel 512 Nov 21 16:13 prj -rw-r--r-- 1 pedro wheel 471 Nov 21 16:13 solarisfinite.patch -rw-r--r-- 1 pedro wheel 1161 Nov 21 16:13 warnings.patch -rw-r--r-- 1 pedro wheel 502 Nov 21 16:13 windows.patch Can I remove the directory? (I'll try removing it in my testing anyways).
(In reply to comment #2) > Hi; > I still see some files in cppunit: > Can I remove the directory? > (I'll try removing it in my testing anyways). OK.. the issue seems to be a malformed patch. It doesn't work cleanly with GNU patch or FreeBSD's patch: Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |--- a/main/cppunit/ldflags.patch |+++ a/main/cppunit/ldflags.patch -------------------------- Patching file main/cppunit/ldflags.patch using Plan A... patch: **** malformed patch at line 148: +++ a/main/cppunit/makefile.mk ... I cut the cppunit dir patches that were causing trouble and applied the rest. Keep tuned ... ;)
Created attachment 77041 [details] Update cppunit removal patch This is Andre's patch but generated by SVN. I tested this all I could but the tree was broken by an unrelated commit so I can't test it anymore.
svn commit -m "i118608 - IP clearance: Remove internal cppunit source, use system-cppunit instead. Patch by Andre Fischer (af)." Sending Repository.mk Sending basebmp/test/makefile.mk Sending basegfx/prj/build.lst Sending basegfx/test/makefile.mk Sending binaryurp/qa/makefile.mk Sending configure.in Deleting cppunit Sending desktop/qa/deployment_misc/makefile.mk Sending o3tl/prj/build.lst Sending o3tl/qa/makefile.mk Sending sal/cppunittester/makefile.mk Sending sal/prj/build.lst Sending sax/qa/cppunit/makefile.mk Sending set_soenv.in Sending sfx2/CppunitTest_sfx2_metadatable.mk Sending sfx2/Module_sfx2.mk Sending shell/qa/zip/makefile.mk Sending solenv/gbuild/platform/freebsd.mk Sending solenv/gbuild/platform/linux.mk Sending solenv/gbuild/platform/macosx.mk Sending solenv/gbuild/platform/os2.mk Sending solenv/gbuild/platform/solaris.mk Sending solenv/gbuild/platform/windows.mk Sending solenv/gbuild/platform/winmingw.mk Sending test/prj/build.lst Sending test/source/cpp/makefile.mk Sending test/source/cpp/unoexceptionprotector/makefile.mk Transmitting file data .......................... Committed revision 1205912. Very nice, Thank you! Hope you start using your commit bit soon :).
Forget to changing the state of this issue. Doing this now.
Closing resolved issue.