i118608 - IP clearance: Remove internal cppunit source, use system-cppunit instead. Patch by Andre Fischer (af).

9 files changed, 0 insertions, 434 deletions

diff --git a/cppunit/ldflags.patch b/cppunit/ldflags.patch
deleted file mode 100644
index ee8d5ed897ce..000000000000
--- a/cppunit/ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- misc/cppunit-1.12.1/src/cppunit/Makefile.in	2008-02-20 06:59:55.000000000 +0100
-+++ misc/build/cppunit-1.12.1/src/cppunit/Makefile.in	2010-06-21 17:01:38.324370072 +0200
-@@ -300,7 +300,7 @@
- 
- libcppunit_la_LDFLAGS = \
-  -no-undefined -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-- -release $(LT_RELEASE)
-+ -release $(LT_RELEASE) $(LIBADD_DL)
- 
- all: all-am
- 
diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk
deleted file mode 100644
index 043ce740655d..000000000000
--- a/cppunit/makefile.mk
+++ /dev/null
@@ -1,193 +0,0 @@
-#*************************************************************************
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#***********************************************************************/
-
-PRJ = .
-PRJNAME = cppunit
-TARGET = cppunit
-
-.INCLUDE: settings.mk
-
-TARFILE_NAME = cppunit-1.12.1
-TARFILE_MD5=bd30e9cf5523cdfc019b94f5e1d7fd19
-    # from <https://sourceforge.net/projects/cppunit/files/cppunit/1.12.1/
-    #  cppunit-1.12.1.tar.gz/download>
-
-PATCH_FILES = solarisfinite.patch warnings.patch windows.patch ldflags.patch
-    # solarisfinite.patch: see <https://sourceforge.net/tracker/?func=detail&
-    #  aid=2912590&group_id=11795&atid=311795>
-    # warnings.patch: see <https://sourceforge.net/tracker/?func=detail&
-    #  aid=2912630&group_id=11795&atid=311795>
-
-.IF "$(OS)" == "WNT"
-.IF "$(COM)" == "MSC"
-
-# On Windows, CppUnit appears to support either the Unix-style configure/make
-# approach with cygwin and gcc (and libtool fails miserably if gcc is replaced
-# by MSVC cl), or a Visual Studio project (CppUnitLibraries.dsw).  However, the
-# latter is too old to work with vcbuild from a wntmsci12 tool chain.  So, the
-# easiest way appears to inject hand-crafted dmake makefiles to build the
-# relevant parts.  (Another approach would be to manually use the Visual Studio
-# IDE to convert CppUnitLibraries.dsw to modern format, inject the resulting
-# cppunit_dll.vcproj and DllPlugInTester.vcproj and build those with vcbuild.)
-
-CONFIGURE_ACTION = $(SED) -e s:@BACKPATH@:../$(BACK_PATH): \
-    < ../$(BACK_PATH)$(PATH_IN_MODULE)/ooo-cppunit_dll.mk \
-    > src/cppunit/ooo-cppunit_dll.mk && \
-    $(SED) -e s:@BACKPATH@:../$(BACK_PATH): \
-    < ../$(BACK_PATH)$(PATH_IN_MODULE)/ooo-DllPlugInTester.mk \
-    > src/DllPlugInTester/ooo-DllPlugInTester.mk
-
-BUILD_ACTION = cd src/cppunit && dmake -f ooo-cppunit_dll.mk && \
-    cd ../DllPlugInTester && dmake -f ooo-DllPlugInTester.mk
-
-OUTDIR2INC = include/cppunit
-
-.INCLUDE: set_ext.mk
-.INCLUDE: target.mk
-.INCLUDE: tg_ext.mk
-
-$(PACKAGE_DIR)/$(CONFIGURE_FLAG_FILE): ooo-cppunit_dll.mk ooo-DllPlugInTester.mk
-
-.ELSE
-.IF "$(COM)" == "GCC"
-EXTRA_CFLAGS += -mthreads
-LDFLAGS += -Wl,--enable-runtime-pseudo-reloc-v2
-
-.IF "$(USE_SYSTEM_STL)" != "YES"
-
-OOO_STLPORT_CXXFLAGS = -I$(SOLARINCDIR)/stl
-.IF "$(USE_STLP_DEBUG)" == "TRUE"
-OOO_STLPORT_CXXFLAGS += -D_STLP_DEBUG
-.END
-OOO_STLPORT_CXXFLAGS += -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH)
-
-OOO_STLPORT_LDFLAGS = -L$(SOLARLIBDIR)
-OOO_STLPORT_LIBS = $(LIBSTLPORT)
-
-.END
-
-CONFIGURE_ACTION = ./configure
-CONFIGURE_FLAGS = --prefix=$(shell cd $(PACKAGE_DIR) && \
-    pwd $(PWDFLAGS))/$(TARFILE_ROOTDIR)/ooo-install \
-    --disable-dependency-tracking --disable-static --disable-doxygen \
-    --disable-html-docs --disable-latex-docs CC='$(CC)' CXX='$(CXX)' \
-    CXXFLAGS='$(EXTRA_CFLAGS) $(OOO_STLPORT_CXXFLAGS)' \
-    LDFLAGS='$(LDFLAGS) $(OOO_STLPORT_LDFLAGS)' \
-    LIBS='$(OOO_STLPORT_LIBS) $(MY_LIBS)'
-
-BUILD_ACTION = $(GNUMAKE) -j$(EXTMAXPROCESS)
-BUILD_FLAGS = install
-
-OUTDIR2INC = ooo-install/include/cppunit
-
-OUT2BIN = ooo-install/bin/DllPlugInTester.exe \
-    ooo-install/bin/cygcppunit-1-12-1.dll
-OUT2LIB = ooo-install/lib/libcppunit.dll.a
-
-.INCLUDE: set_ext.mk
-.INCLUDE: target.mk
-.INCLUDE: tg_ext.mk
-
-.ENDIF # "$(COM)" == "GCC"
-.ENDIF # "$(COM)" == "MSC"
-
-.ELSE
-
-.IF "$(USE_SYSTEM_STL)" != "YES"
-
-OOO_STLPORT_CXXFLAGS = -I$(SOLARINCDIR)/stl
-.IF "$(USE_STLP_DEBUG)" == "TRUE"
-OOO_STLPORT_CXXFLAGS += -D_STLP_DEBUG
-.END
-.IF "$(COM)" == "GCC"
-OOO_STLPORT_CXXFLAGS += -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH)
-.END
-
-OOO_STLPORT_LDFLAGS = -L$(SOLARLIBDIR)
-OOO_STLPORT_LIBS = $(LIBSTLPORT)
-
-# When "checking for C compiler default output file name" configure
-# unfortunately uses "$CC $CFLAGS $CPPFLAGS $LDFLAGS conftest.c $LIBS" to build
-# a C program that links against $(LIBSTLPORT); at least on one unxlngi6
-# machine, this has been observed to fail with "/lib/libm.so.6: undefined
-# reference to `_rtld_global_ro@GLIBC_PRIVATE'" unless -lm is also specified:
-.IF "$(OS)" == "LINUX" && "$(COM)" == "GCC" && "$(CPU)" == "I"
-OOO_STLPORT_LIBS += -lm
-# #i112124# furthermore, STLPort seems to require libstdc++
-OOO_STLPORT_LIBS += -lstdc++
-.END
-
-# And later, when "checking whether the C compiler works" configure tries to
-# execute that program; however, the program would fail to locate the STLport
-# library (another work-around might be to add something like --as-needed around
-# $(LIBSTLPORT)):
-.IF "$(OS)" == "FREEBSD" || "$(OS)" == "LINUX" || "$(OS)" == "SOLARIS"
-.IF "$(LD_LIBRARY_PATH)" == ""
-LD_LIBRARY_PATH := $(SOLARLIBDIR)
-    # strictly speaking, this is incorrect if the LD_LIBRARY_PATH environment
-    # variable is set to the empty string
-.ELSE
-LD_LIBRARY_PATH := $(LD_LIBRARY_PATH):$(SOLARLIBDIR)
-.END
-.EXPORT: LD_LIBRARY_PATH
-.END
-
-.END
-
-# At least on Solaris with Sun CC, linking the cppunit dynamic library fails as
-# TestAssert.o uses fabs but -lm is missing from the command line (cppunit's
-# aclocal.m4 contains an unused AC_CHECK_LIBM, maybe using that would be a
-# better fix):
-.IF "$(OS)" == "SOLARIS" && "$(COM)" == "C52"
-MY_LIBS = -lm
-.END
-
-CONFIGURE_ACTION = ./configure
-CONFIGURE_FLAGS = --prefix=$(shell cd $(PACKAGE_DIR) && \
-    pwd $(PWDFLAGS))/$(TARFILE_ROOTDIR)/ooo-install \
-    --disable-dependency-tracking --disable-static --disable-doxygen \
-    --disable-html-docs --disable-latex-docs CC='$(CC)' CXX='$(CXX)' \
-    CXXFLAGS='$(EXTRA_CFLAGS) $(OOO_STLPORT_CXXFLAGS)' \
-    LDFLAGS='$(LDFLAGS) $(OOO_STLPORT_LDFLAGS)' \
-    LIBS='$(OOO_STLPORT_LIBS) $(MY_LIBS)'
-
-BUILD_ACTION = $(GNUMAKE) -j$(EXTMAXPROCESS)
-BUILD_FLAGS = install
-
-OUTDIR2INC = ooo-install/include/cppunit
-
-OUT2BIN = ooo-install/bin/DllPlugInTester
-.IF "$(OS)" == "MACOSX"
-OUT2LIB = ooo-install/lib/libcppunit-1.12.1.dylib
-EXTRPATH = NONE
-.ELSE
-OUT2LIB = ooo-install/lib/libcppunit-1.12.so.1
-.END
-
-.INCLUDE: set_ext.mk
-.INCLUDE: target.mk
-.INCLUDE: tg_ext.mk
-
-.END
diff --git a/cppunit/ooo-DllPlugInTester.mk b/cppunit/ooo-DllPlugInTester.mk
deleted file mode 100644
index 1c8c8a0a167b..000000000000
--- a/cppunit/ooo-DllPlugInTester.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#***********************************************************************/
-
-PRJ = @BACKPATH@../..
-PRJNAME = cppunit
-TARGET = DllPlugInTester
-
-ENABLE_EXCEPTIONS = TRUE
-nodep = TRUE
-
-.INCLUDE: settings.mk
-
-CDEFS += -DCPPUNIT_DLL
-CFLAGSCXX += -I../../include
-UWINAPILIB =
-
-OBJFILES = $(APP1OBJS)
-
-APP1OBJS = \
-   $(OBJ)/CommandLineParser.obj \
-   $(OBJ)/DllPlugInTester.obj
-APP1RPATH = NONE
-APP1STDLIBS = icppunit_dll.lib
-APP1TARGET = DllPlugInTester_dll
-
-.INCLUDE: target.mk
diff --git a/cppunit/ooo-cppunit_dll.mk b/cppunit/ooo-cppunit_dll.mk
deleted file mode 100644
index 048a51e90926..000000000000
--- a/cppunit/ooo-cppunit_dll.mk
+++ /dev/null
@@ -1,100 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#***********************************************************************/
-
-PRJ = @BACKPATH@../..
-PRJNAME = cppunit
-TARGET = cppunit_dll
-
-ENABLE_EXCEPTIONS = TRUE
-EXTERNAL_WARNINGS_NOT_ERRORS = TRUE
-nodep = TRUE
-
-.INCLUDE: settings.mk
-
-CDEFS += -DCPPUNIT_BUILD_DLL
-CFLAGSCXX += -I../../include
-UWINAPILIB =
-
-SLOFILES = $(SHL1OBJS)
-
-SHL1IMPLIB = i$(SHL1TARGET)
-SHL1OBJS = \
-    $(SLO)/AdditionalMessage.obj \
-    $(SLO)/Asserter.obj \
-    $(SLO)/BeosDynamicLibraryManager.obj \
-    $(SLO)/BriefTestProgressListener.obj \
-    $(SLO)/CompilerOutputter.obj \
-    $(SLO)/DefaultProtector.obj \
-    $(SLO)/DllMain.obj \
-    $(SLO)/DynamicLibraryManager.obj \
-    $(SLO)/DynamicLibraryManagerException.obj \
-    $(SLO)/Exception.obj \
-    $(SLO)/Message.obj \
-    $(SLO)/PlugInManager.obj \
-    $(SLO)/PlugInParameters.obj \
-    $(SLO)/Protector.obj \
-    $(SLO)/ProtectorChain.obj \
-    $(SLO)/RepeatedTest.obj \
-    $(SLO)/SourceLine.obj \
-    $(SLO)/StringTools.obj \
-    $(SLO)/SynchronizedObject.obj \
-    $(SLO)/Test.obj \
-    $(SLO)/TestAssert.obj \
-    $(SLO)/TestCase.obj \
-    $(SLO)/TestCaseDecorator.obj \
-    $(SLO)/TestComposite.obj \
-    $(SLO)/TestDecorator.obj \
-    $(SLO)/TestFactoryRegistry.obj \
-    $(SLO)/TestFailure.obj \
-    $(SLO)/TestLeaf.obj \
-    $(SLO)/TestNamer.obj \
-    $(SLO)/TestPath.obj \
-    $(SLO)/TestPlugInDefaultImpl.obj \
-    $(SLO)/TestResult.obj \
-    $(SLO)/TestResultCollector.obj \
-    $(SLO)/TestRunner.obj \
-    $(SLO)/TestSetUp.obj \
-    $(SLO)/TestSuccessListener.obj \
-    $(SLO)/TestSuite.obj \
-    $(SLO)/TestSuiteBuilderContext.obj \
-    $(SLO)/TextOutputter.obj \
-    $(SLO)/TextTestProgressListener.obj \
-    $(SLO)/TextTestResult.obj \
-    $(SLO)/TextTestRunner.obj \
-    $(SLO)/TypeInfoHelper.obj \
-    $(SLO)/UnixDynamicLibraryManager.obj \
-    $(SLO)/Win32DynamicLibraryManager.obj \
-    $(SLO)/XmlDocument.obj \
-    $(SLO)/XmlElement.obj \
-    $(SLO)/XmlOutputter.obj \
-    $(SLO)/XmlOutputterHook.obj
-SHL1RPATH = NONE
-SHL1TARGET = cppunit_dll
-SHL1USE_EXPORTS = name
-DEF1NAME = $(SHL1TARGET)
-
-.INCLUDE: target.mk
diff --git a/cppunit/prj/build.lst b/cppunit/prj/build.lst
deleted file mode 100644
index 9bfcb57f9e89..000000000000
--- a/cppunit/prj/build.lst
+++ /dev/null
@@ -1,2 +0,0 @@
-c5t cppunit : stlport NULL
-c5t cppunit nmake - all cppunit NULL
diff --git a/cppunit/prj/d.lst b/cppunit/prj/d.lst
deleted file mode 100644
index fb7c1195fc0a..000000000000
--- a/cppunit/prj/d.lst
+++ /dev/null
@@ -1,30 +0,0 @@
-mkdir: %_DEST%\inc%_EXT%\cppunit
-..\%__SRC%\inc\cppunit\*.h %_DEST%\inc%_EXT%\cppunit\*.h
-mkdir: %_DEST%\inc%_EXT%\cppunit\config
-..\%__SRC%\inc\cppunit\config\*.h %_DEST%\inc%_EXT%\cppunit\config\*.h
-mkdir: %_DEST%\inc%_EXT%\cppunit\extensions
-..\%__SRC%\inc\cppunit\extensions\*.h %_DEST%\inc%_EXT%\cppunit\extensions\*.h
-mkdir: %_DEST%\inc%_EXT%\cppunit\plugin
-..\%__SRC%\inc\cppunit\plugin\*.h %_DEST%\inc%_EXT%\cppunit\plugin\*.h
-mkdir: %_DEST%\inc%_EXT%\cppunit\portability
-..\%__SRC%\inc\cppunit\portability\*.h %_DEST%\inc%_EXT%\cppunit\portability\*.h
-mkdir: %_DEST%\inc%_EXT%\cppunit\tools
-..\%__SRC%\inc\cppunit\tools\*.h %_DEST%\inc%_EXT%\cppunit\tools\*.h
-mkdir: %_DEST%\inc%_EXT%\cppunit\ui\text
-..\%__SRC%\inc\cppunit\ui\text\*.h %_DEST%\inc%_EXT%\cppunit\ui\text\*.h
-
-..\%__SRC%\bin\cppunit_dll.dll %_DEST%\bin%_EXT%\cppunit_dll.dll
-..\%__SRC%\lib\icppunit_dll.lib %_DEST%\lib%_EXT%\icppunit_dll.lib
-
-..\%__SRC%\bin\cygcppunit-1-12-1.dll %_DEST%\bin%_EXT%\cygcppunit-1-12-1.dll
-..\%__SRC%\lib\libcppunit.dll.a %_DEST%\lib%_EXT%\libcppunit.dll.a
-
-..\%__SRC%\lib\libcppunit-1.12.1.dylib %_DEST%\lib%_EXT%\libcppunit-1.12.1.dylib
-symlink: %_DEST%\lib%_EXT%\libcppunit-1.12.1.dylib %_DEST%\lib%_EXT%\libcppunit.dylib
-
-..\%__SRC%\lib\libcppunit-1.12.so.1 %_DEST%\lib%_EXT%\libcppunit-1.12.so.1
-symlink: %_DEST%\lib%_EXT%\libcppunit-1.12.so.1 %_DEST%\lib%_EXT%\libcppunit.so
-
-..\%__SRC%\bin\DllPlugInTester %_DEST%\bin%_EXT%\DllPlugInTester
-..\%__SRC%\bin\DllPlugInTester.exe %_DEST%\bin%_EXT%\DllPlugInTester.exe
-..\%__SRC%\bin\DllPlugInTester_dll.exe %_DEST%\bin%_EXT%\DllPlugInTester_dll.exe
diff --git a/cppunit/solarisfinite.patch b/cppunit/solarisfinite.patch
deleted file mode 100644
index 0c15cdcb77a7..000000000000
--- a/cppunit/solarisfinite.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- misc/cppunit-1.12.1/include/cppunit/portability/FloatingPoint.h	Mon Mar  5 04:16:42 2007
-+++ misc/build/cppunit-1.12.1/include/cppunit/portability/FloatingPoint.h	Thu Dec  3 16:34:23 2009
-@@ -3,6 +3,11 @@
- 
- #include <cppunit/Portability.h>
- #include <math.h>
-+
-+#if defined(__sun) && !defined(CPPUNIT_HAVE_ISFINITE) && defined(CPPUNIT_HAVE_FINITE)
-+#include <ieeefp.h>
-+  // <math.h> is still needed for usage of fabs in TestAssert.cpp
-+#endif
- 
- CPPUNIT_NS_BEGIN
- 
diff --git a/cppunit/warnings.patch b/cppunit/warnings.patch
deleted file mode 100644
index 39e804aff7f0..000000000000
--- a/cppunit/warnings.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- misc/cppunit-1.12.1/include/cppunit/plugin/TestPlugIn.h	2007-01-12 05:54:34.000000000 +0100
-+++ misc/build/cppunit-1.12.1/include/cppunit/plugin/TestPlugIn.h	2009-12-02 15:33:29.639857272 +0100
-@@ -151,9 +151,7 @@
- #include <windows.h>
- #endif
- #define CPPUNIT_PLUGIN_IMPLEMENT_MAIN()               \
--  BOOL APIENTRY DllMain( HANDLE hModule,              \
--                         DWORD  ul_reason_for_call,   \
--                         LPVOID lpReserved )          \
-+  BOOL APIENTRY DllMain( HANDLE, DWORD, LPVOID )      \
-   {                                                   \
-       return TRUE;                                    \
-   }                                                   \
-@@ -162,7 +160,7 @@
- // Unix
- #elif defined(CPPUNIT_HAVE_UNIX_DLL_LOADER) || defined(CPPUNIT_HAVE_UNIX_SHL_LOADER)
- #define CPPUNIT_PLUGIN_IMPLEMENT_MAIN()               \
--  int main( int argc, char *argv[] )                  \
-+  int main( int, char *[] )                           \
-   {                                                   \
-     return 0;                                         \
-   }                                                   \
diff --git a/cppunit/windows.patch b/cppunit/windows.patch
deleted file mode 100644
index da346924ea44..000000000000
--- a/cppunit/windows.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- misc/cppunit-1.12.1/include/cppunit/plugin/TestPlugIn.h	2010-01-11 14:42:25.084658287 +0100
-+++ misc/build/cppunit-1.12.1/include/cppunit/plugin/TestPlugIn.h	2010-01-11 14:42:18.660706180 +0100
-@@ -149,6 +149,9 @@
- #define NOMINMAX
- #define BLENDFUNCTION void    // for mingw & gcc
- #include <windows.h>
-+#if defined(OPTIONAL) // set within windows.h
-+#undef OPTIONAL
-+#endif
- #endif
- #define CPPUNIT_PLUGIN_IMPLEMENT_MAIN()               \
-   BOOL APIENTRY DllMain( HANDLE, DWORD, LPVOID )      \