diff options
35 files changed, 128 insertions, 465 deletions
diff --git a/Repository.mk b/Repository.mk index 051d61c7e871..656d457d0dc7 100755 --- a/Repository.mk +++ b/Repository.mk @@ -98,10 +98,8 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \ )) $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ - cppunit \ icuuc \ icule \ - cppunit \ rdf \ xslt \ )) diff --git a/basebmp/test/makefile.mk b/basebmp/test/makefile.mk index 16dbbf07bd41..5c0790f12acf 100644 --- a/basebmp/test/makefile.mk +++ b/basebmp/test/makefile.mk @@ -33,10 +33,14 @@ TARGETTYPE=GUI ENABLE_EXCEPTIONS=TRUE -.IF "$(GUI)" == "OS2" +.IF "$(WITH_CPPUNIT)" != "YES" || "$(GUI)" == "OS2" @all: +.IF "$(GUI)" == "OS2" @echo "Skipping, cppunit broken." +.ELIF "$(WITH_CPPUNIT)" != "YES" + @echo "cppunit disabled. nothing do do." +.END .ELSE diff --git a/basegfx/prj/build.lst b/basegfx/prj/build.lst index fe3354b3f256..5b6fddad5998 100644 --- a/basegfx/prj/build.lst +++ b/basegfx/prj/build.lst @@ -1,4 +1,4 @@ -fx basegfx : o3tl sal offuh cppuhelper cppu CPPUNIT:cppunit NULL +fx basegfx : o3tl sal offuh cppuhelper cppu NULL fx basegfx usr1 - all fx_mkout NULL fx basegfx\inc nmake - all fx_inc NULL fx basegfx\prj get - all fx_prj NULL diff --git a/basegfx/test/makefile.mk b/basegfx/test/makefile.mk index e71153f46219..4dfe4259e49e 100644 --- a/basegfx/test/makefile.mk +++ b/basegfx/test/makefile.mk @@ -36,12 +36,16 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk -.IF "$(GUI)" == "OS2" +.IF "$(WITH_CPPUNIT)" != "YES" || "$(GUI)" == "OS2" @all: +.IF "$(GUI)" == "OS2" @echo "Skipping, cppunit broken." +.ELIF "$(WITH_CPPUNIT)" != "YES" + @echo "cppunit disabled. nothing do do." +.END -.ELSE +.ELSE # "$(WITH_CPPUNIT)" != "YES" || "$(GUI)" == "OS2" #building with stlport, but cppunit was not built with stlport .IF "$(USE_SYSTEM_STL)"!="YES" @@ -86,7 +90,7 @@ SLOFILES=$(SHL1OBJS) # --- Targets ------------------------------------------------------ -.ENDIF # "$(GUI)" == "OS2" +.ENDIF # "$(WITH_CPPUNIT)" != "YES" || "$(GUI)" == "OS2" .INCLUDE : target.mk .INCLUDE : _cppunit.mk diff --git a/binaryurp/qa/makefile.mk b/binaryurp/qa/makefile.mk index 195c35adb578..43ae8984d74e 100644 --- a/binaryurp/qa/makefile.mk +++ b/binaryurp/qa/makefile.mk @@ -33,10 +33,14 @@ ENABLE_EXCEPTIONS = TRUE .INCLUDE: settings.mk -.IF "$(GUI)" == "OS2" +.IF "$(WITH_CPPUNIT)" != "YES" || "$(GUI)" == "OS2" @all: +.IF "$(GUI)" == "OS2" @echo "Skipping, cppunit broken." +.ELIF "$(WITH_CPPUNIT)" != "YES" + @echo "cppunit disabled. nothing do do." +.END .ELSE diff --git a/configure.in b/configure.in index 0063719976b8..59966abced37 100644 --- a/configure.in +++ b/configure.in @@ -3727,6 +3727,9 @@ if test -n "$with_system_libwpd" -o -n "$with_system_libs" && \ AC_MSG_RESULT([external]) SYSTEM_LIBWPD=YES PKG_CHECK_MODULES( LIBWPD, libwpd-0.8 ) +else + AC_MSG_RESULT([no]) + SYSTEM_LIBWPD= fi AC_SUBST(SYSTEM_LIBWPD) AC_SUBST(LIBWPD_CFLAGS) @@ -3735,21 +3738,30 @@ AC_SUBST(LIBWPD_LIBS) dnl =================================================================== dnl Check for system cppunit dnl =================================================================== +WITH_CPPUNIT= AC_MSG_CHECKING([which cppunit to use]) if test -n "$with_system_cppunit" -o -n "$with_system_libs" && \ test "$with_system_cppunit" != "no"; then - AC_MSG_RESULT([external]) SYSTEM_CPPUNIT=YES # might work for earlier, too but go sure: - PKG_CHECK_MODULES( CPPUNIT, cppunit >= 1.12.0 ) + PKG_CHECK_MODULES( CPPUNIT, + cppunit >= 1.12.0, + WITH_CPPUNIT="YES", + WITH_CPPUNIT=") + if test -n "$WITH_CPPUNIT"; then + AC_MSG_RESULT([found system cppunit $CPPUNIT]) + else + AC_MSG_WARN([dit not find system cppunit version 1.12.0 or later]) + fi + else - AC_MSG_RESULT([internal]) + AC_MSG_WARN([not using cppunit]) SYSTEM_CPPUNIT=NO - BUILD_TYPE="$BUILD_TYPE CPPUNIT" fi AC_SUBST(SYSTEM_CPPUNIT) AC_SUBST(CPPUNIT_CFLAGS) AC_SUBST(CPPUNIT_LIBS) +AC_SUBST(WITH_CPPUNIT) dnl =================================================================== dnl Check whether freetype is available 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 ) \ diff --git a/desktop/qa/deployment_misc/makefile.mk b/desktop/qa/deployment_misc/makefile.mk index c5a2444c1669..29d59e5a6d68 100644 --- a/desktop/qa/deployment_misc/makefile.mk +++ b/desktop/qa/deployment_misc/makefile.mk @@ -25,12 +25,16 @@ # #************************************************************************* -.IF "$(GUI)" == "OS2" +.IF "$(WITH_CPPUNIT)" != "YES" || "$(GUI)" == "OS2" @all: +.IF "$(GUI)" == "OS2" @echo "Skipping, cppunit broken." +.ELIF "$(WITH_CPPUNIT)" != "YES" + @echo "cppunit disabled. nothing do do." +.END -.ENDIF # "$(GUI)" == "OS2" +.ENDIF "$(WITH_CPPUNIT)" != "YES" || "$(GUI)" == "OS2" PRJ := ..$/.. PRJNAME := desktop diff --git a/o3tl/prj/build.lst b/o3tl/prj/build.lst index 2606d1df8586..1e5672d19653 100644 --- a/o3tl/prj/build.lst +++ b/o3tl/prj/build.lst @@ -1,4 +1,4 @@ -ot o3tl : sal CPPUNIT:cppunit BOOST:boost NULL +ot o3tl : sal BOOST:boost NULL ot o3tl usr1 - all ot_mkout NULL ot o3tl\inc get - all ot_inc NULL ot o3tl\prj get - all ot_prj NULL diff --git a/o3tl/qa/makefile.mk b/o3tl/qa/makefile.mk index 464ec4398f50..474dd935e0de 100644 --- a/o3tl/qa/makefile.mk +++ b/o3tl/qa/makefile.mk @@ -25,12 +25,16 @@ # #************************************************************************* -.IF "$(GUI)" == "OS2" +.IF "$(WITH_CPPUNIT)" != "YES" || "$(GUI)" == "OS2" @all: +.IF "$(GUI)" == "OS2" @echo "Skipping, cppunit broken." +.ELIF "$(WITH_CPPUNIT)" != "YES" + @echo "cppunit disabled. nothing do do." +.END -.ENDIF # "$(GUI)" == "OS2" +.ELSE # "$(WITH_CPPUNIT)" != "YES" || "$(GUI)" == "OS2" PRJ=.. @@ -89,3 +93,4 @@ SLOFILES=$(SHL1OBJS) .INCLUDE : _cppunit.mk .ENDIF # L10N_framework +.ENDIF # "$(WITH_CPPUNIT)" != "YES" || "$(GUI)" == "OS2" diff --git a/sal/cppunittester/makefile.mk b/sal/cppunittester/makefile.mk index 61fe7868c9f3..80b7141e5a15 100644 --- a/sal/cppunittester/makefile.mk +++ b/sal/cppunittester/makefile.mk @@ -33,6 +33,12 @@ ENABLE_EXCEPTIONS = TRUE .INCLUDE: settings.mk +.IF "$(WITH_CPPUNIT)" != "YES" +all: + @echo cppunit disabled. nothing to do. + +.ELSE + #building with stlport, but cppunit was not built with stlport .IF "$(USE_SYSTEM_STL)"!="YES" .IF "$(SYSTEM_CPPUNIT)"=="YES" @@ -50,3 +56,5 @@ APP1STDLIBS = $(CPPUNITLIB) $(SALLIB) APP1TARGET = cppunittester .INCLUDE: target.mk + +.ENDIF diff --git a/sal/prj/build.lst b/sal/prj/build.lst index b7786f604eaf..ddc6b105fde1 100644 --- a/sal/prj/build.lst +++ b/sal/prj/build.lst @@ -1,4 +1,4 @@ -sa sal : xml2cmp stlport external BOOST:boost CPPUNIT:cppunit NULL +sa sal : xml2cmp stlport external BOOST:boost NULL sa sal usr1 - all sa_mkout NULL sa sal\inc nmake - all sa_inc NULL sa sal\typesconfig nmake - u sa_tc sa_inc NULL diff --git a/sax/qa/cppunit/makefile.mk b/sax/qa/cppunit/makefile.mk index 0e82b627c187..f6da984ccbcc 100644 --- a/sax/qa/cppunit/makefile.mk +++ b/sax/qa/cppunit/makefile.mk @@ -35,12 +35,16 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk -.IF "$(GUI)" == "OS2" +.IF "$(WITH_CPPUNIT)" != "YES" || "$(GUI)" == "OS2" @all: +.IF "$(GUI)" == "OS2" @echo "Skipping, cppunit broken." +.ELIF "$(WITH_CPPUNIT)" != "YES" + @echo "cppunit disabled. nothing do do." +.END -.ELSE +.ELSE # "$(WITH_CPPUNIT)" != "YES" || "$(GUI)" == "OS2" #building with stlport, but cppunit was not built with stlport .IF "$(USE_SYSTEM_STL)"!="YES" @@ -80,7 +84,7 @@ SLOFILES= \ # --- Targets ------------------------------------------------------ -.ENDIF # "$(GUI)" == "OS2" +.ENDIF # "$(WITH_CPPUNIT)" != "YES" || "$(GUI)" == "OS2" .INCLUDE : target.mk .INCLUDE : _cppunit.mk diff --git a/set_soenv.in b/set_soenv.in index 23269f951766..91d73616838d 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -1923,6 +1923,7 @@ ToFile( "LIBWPD_LIBS", "@LIBWPD_LIBS@", "e" ); ToFile( "SYSTEM_CPPUNIT", "@SYSTEM_CPPUNIT@", "e" ); ToFile( "CPPUNIT_CFLAGS", "@CPPUNIT_CFLAGS@", "e" ); ToFile( "CPPUNIT_LIBS", "@CPPUNIT_LIBS@", "e" ); +ToFile( "WITH_CPPUNIT", "@WITH_CPPUNIT@", "e" ); ToFile( "SYSTEM_LIBXML", "@SYSTEM_LIBXML@", "e" ); ToFile( "USE_FT_EMBOLDEN", "@USE_FT_EMBOLDEN@", "e" ); ToFile( "LIBXML_CFLAGS", "@LIBXML_CFLAGS@", "e" ); diff --git a/sfx2/CppunitTest_sfx2_metadatable.mk b/sfx2/CppunitTest_sfx2_metadatable.mk index 67d5a7f43869..44bd62da307f 100755 --- a/sfx2/CppunitTest_sfx2_metadatable.mk +++ b/sfx2/CppunitTest_sfx2_metadatable.mk @@ -44,4 +44,9 @@ $(eval $(call gb_CppunitTest_set_include,sfx2_metadatable,\ -I$(OUTDIR)/inc \ )) +$(eval $(call gb_CppunitTest_set_ldflags,sfx2_metadatable,\ + $$(LDFLAGS) \ + -lcppunit \ +)) + # vim: set noet sw=4 ts=4: diff --git a/sfx2/Module_sfx2.mk b/sfx2/Module_sfx2.mk index b88e2581f2da..632c90d72d6a 100755 --- a/sfx2/Module_sfx2.mk +++ b/sfx2/Module_sfx2.mk @@ -34,9 +34,11 @@ $(eval $(call gb_Module_add_targets,sfx2,\ Package_sdi \ )) +ifeq ($(WITH_CPPUNIT),YES) $(eval $(call gb_Module_add_check_targets,sfx2,\ CppunitTest_sfx2_metadatable \ )) +endif $(eval $(call gb_Module_add_subsequentcheck_targets,sfx2,\ JunitTest_sfx2_complex \ diff --git a/shell/qa/zip/makefile.mk b/shell/qa/zip/makefile.mk index 946b01db19f1..51d4af7825e6 100644 --- a/shell/qa/zip/makefile.mk +++ b/shell/qa/zip/makefile.mk @@ -34,6 +34,17 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk +.IF "$(WITH_CPPUNIT)" != "YES" || "$(GUI)" == "OS2" + +@all: +.IF "$(GUI)" == "OS2" + @echo "Skipping, cppunit broken." +.ELIF "$(WITH_CPPUNIT)" != "YES" + @echo "cppunit disabled. nothing do do." +.END + +.ELSE + CFLAGSCXX += $(CPPUNIT_CFLAGS) SHL1OBJS = $(SLOFILES) @@ -45,6 +56,8 @@ SHL1VERSIONMAP = $(PRJ)/qa/zip/export.map DEF1NAME=$(SHL1TARGET) SLOFILES=$(SLO)$/ziptest.obj +.ENDIF + # --- Targets ------------------------------------------------------ .INCLUDE : target.mk diff --git a/solenv/gbuild/platform/freebsd.mk b/solenv/gbuild/platform/freebsd.mk index 8785e2d616d8..e4ea7ffcd077 100644 --- a/solenv/gbuild/platform/freebsd.mk +++ b/solenv/gbuild/platform/freebsd.mk @@ -271,15 +271,16 @@ endif gb_Library_PLAINLIBS_NONE += \ dl \ - freetype \ + freetype \ jpeg \ m \ pthread \ X11 \ - Xext \ - SM \ - ICE \ - z + Xext \ + SM \ + ICE \ + z \ + cppunit gb_Library_FILENAMES := \ $(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \ diff --git a/solenv/gbuild/platform/linux.mk b/solenv/gbuild/platform/linux.mk index e0c74a8427ac..a2e6fa02854a 100644 --- a/solenv/gbuild/platform/linux.mk +++ b/solenv/gbuild/platform/linux.mk @@ -285,7 +285,8 @@ gb_Library_PLAINLIBS_NONE += \ Xext \ SM \ ICE \ - z + z \ + cppunit gb_Library_FILENAMES := \ $(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \ diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 2cedcee5fcb5..9ac97e1c29b2 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -328,6 +328,7 @@ gb_Library_PLAINLIBS_NONE += \ m \ pthread \ z \ + cppunit gb_Library_FILENAMES := \ $(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \ diff --git a/solenv/gbuild/platform/os2.mk b/solenv/gbuild/platform/os2.mk index e9b95a80d6d7..fddc110225ab 100644 --- a/solenv/gbuild/platform/os2.mk +++ b/solenv/gbuild/platform/os2.mk @@ -389,7 +389,8 @@ gb_Library_PLAINLIBS_NONE += \ jpeg \ m \ z \ - pthread + pthread \ + cppunit gb_Library_LAYER := \ $(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \ diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index 744ba293bbab..23c8af2aa505 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -265,7 +265,8 @@ gb_Library_PLAINLIBS_NONE += \ Xext \ SM \ ICE \ - z + z \ + cppunit gb_Library_FILENAMES := \ $(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \ diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk index 1b3ab6df9e50..ec4da317f1fa 100644 --- a/solenv/gbuild/platform/windows.mk +++ b/solenv/gbuild/platform/windows.mk @@ -466,6 +466,7 @@ gb_Library_PLAINLIBS_NONE += \ uwinapi \ winspool \ z \ + cppunit gb_Library_LAYER := \ $(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \ diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk index e17ef9551285..bc0123e76485 100644 --- a/solenv/gbuild/platform/winmingw.mk +++ b/solenv/gbuild/platform/winmingw.mk @@ -151,7 +151,7 @@ gb_PrecompiledHeader_EXCEPTIONFLAGS := $(gb_LinkTarget_EXCEPTIONFLAGS) gb_LinkTarget_NOEXCEPTIONFLAGS := \ -DEXCEPTIONS_OFF \ -fno-exceptions \ - + gb_NoexPrecompiledHeader_NOEXCEPTIONFLAGS := $(gb_LinkTarget_NOEXCEPTIONFLAGS) gb_LinkTarget_LDFLAGS := \ @@ -490,6 +490,7 @@ gb_Library_PLAINLIBS_NONE += \ uwinapi \ winspool \ z \ + cppunit gb_Library_LAYER := \ $(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \ diff --git a/test/prj/build.lst b/test/prj/build.lst index e22199a5c437..4f1b04172cc0 100644 --- a/test/prj/build.lst +++ b/test/prj/build.lst @@ -1,4 +1,4 @@ -te test : BOOST:boost cppu cppuhelper CPPUNIT:cppunit javaunohelper offuh ridljar sal solenv stlport unoil NULL +te test : BOOST:boost cppu cppuhelper javaunohelper offuh ridljar sal solenv stlport unoil NULL te test\inc nmake - all inc NULL te test\source\cpp nmake - all source_cpp inc NULL te test\source\cpp\unoexceptionprotector nmake - all source_cpp_unoexceptionprotector inc NULL diff --git a/test/source/cpp/makefile.mk b/test/source/cpp/makefile.mk index 2073f1500c07..bdb2938a7a89 100644 --- a/test/source/cpp/makefile.mk +++ b/test/source/cpp/makefile.mk @@ -32,6 +32,17 @@ VISIBILITY_HIDDEN = TRUE .INCLUDE: settings.mk +.IF "$(WITH_CPPUNIT)" != "YES" || "$(GUI)" == "OS2" + +@all: +.IF "$(GUI)" == "OS2" + @echo "Skipping, cppunit broken." +.ELIF "$(WITH_CPPUNIT)" != "YES" + @echo "cppunit disabled. nothing do do." +.END + +.ELSE + CDEFS += -DOOO_DLLIMPLEMENTATION_TEST CFLAGSCXX += $(CPPUNIT_CFLAGS) @@ -58,4 +69,6 @@ SHL1TARGET = test SHL1USE_EXPORTS = name DEF1NAME = $(SHL1TARGET) +.ENDIF + .INCLUDE: target.mk diff --git a/test/source/cpp/unoexceptionprotector/makefile.mk b/test/source/cpp/unoexceptionprotector/makefile.mk index 7f62199f46dc..8e600df09e2c 100644 --- a/test/source/cpp/unoexceptionprotector/makefile.mk +++ b/test/source/cpp/unoexceptionprotector/makefile.mk @@ -32,6 +32,17 @@ VISIBILITY_HIDDEN = TRUE .INCLUDE: settings.mk +.IF "$(WITH_CPPUNIT)" != "YES" || "$(GUI)" == "OS2" + +@all: +.IF "$(GUI)" == "OS2" + @echo "Skipping, cppunit broken." +.ELIF "$(WITH_CPPUNIT)" != "YES" + @echo "cppunit disabled. nothing do do." +.END + +.ELSE + DLLPRE = CFLAGSCXX += $(CPPUNIT_CFLAGS) @@ -54,3 +65,5 @@ SHL1USE_EXPORTS = name DEF1NAME = $(SHL1TARGET) .INCLUDE: target.mk + +.ENDIF |