Kaydet (Commit) 8efa42c3 authored tarafından sb's avatar sb

sb118: Replace (heavily modified) CppUnit 1.8.0 with (unmodified) latest 1.12.1.

- Old modifications were necessary for testshl2, which has simply been excluded
  from the build for now.
- Tests in basebmp, basegfx, o3tl (that are executed during build) have been
  converted from using modified CppUnit/testshl2 to using unmodified CppUnit.
- CppUnit's DllPlugInTester has problems with OOo tests on Windows, see
  #i107562#, so for now a new cppunittester from sal is used instead.
üst f66a3fe0
This diff is collapsed.
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
#
# Copyright 2008 by Sun Microsystems, Inc.
#
# OpenOffice.org - a multi-platform office productivity suite
#
# $RCSfile: makefile.mk,v $
# $RCSfile: makefile,v $
#
# $Revision: 1.1.2.3 $
# $Revision: 1.4 $
#
# This file is part of OpenOffice.org.
#
......@@ -26,106 +25,123 @@
# 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
# from <https://sourceforge.net/projects/cppunit/files/cppunit/1.12.1/
# cppunit-1.12.1.tar.gz/download>
PATCH_FILES = solarisfinite.patch warnings.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" && "$(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 "$(USE_SYSTEM_STL)" != "YES"
OOO_STLPORT_CXXFLAGS = -I$(SOLARINCDIR)/stl
.IF "$(COM)" == "GCC"
OOO_STLPORT_CXXFLAGS += -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH)
.ENDIF
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
.ENDIF
# 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)" == "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)
.ENDIF
.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
.ENDIF
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='$(OOO_STLPORT_CXXFLAGS)' \
LDFLAGS='$(LDFLAGS) $(OOO_STLPORT_LDFLAGS)' \
LIBS='$(OOO_STLPORT_LIBS) $(MY_LIBS)'
BUILD_ACTION = $(GNUMAKE)
BUILD_FLAGS = install
OUTDIR2INC = ooo-install/include/cppunit
.IF "$(OS)" == "MACOSX"
OUT2LIB = ooo-install/lib/libcppunit-1.12.1.dylib
.ELSE
OUT2LIB = ooo-install/lib/libcppunit-1.12.so.1
.ENDIF
OUT2BIN = ooo-install/bin/DllPlugInTester
PRJ=.
PRJNAME=so_cppunit
TARGET=so_cppunit
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
# --- Files --------------------------------------------------------
TARFILE_NAME=cppunit-1.8.0
MOVED_FILES=\
include$/cppunit$/result$/SynchronizedObject.h \
include$/cppunit$/result$/TestListener.h \
include$/cppunit$/result$/TestResultCollector.h \
include$/cppunit$/result$/TestResult.h \
include$/cppunit$/result$/TestSucessListener.h \
include$/cppunit$/result$/TextTestResult.h \
include$/cppunit$/portability$/config-bcb5.h \
include$/cppunit$/portability$/config-msvc6.h \
src$/result$/SynchronizedObject.cpp \
src$/result$/TestResultCollector.cpp \
src$/result$/TestResult.cpp \
src$/result$/TestSucessListener.cpp \
src$/result$/TextTestResult.cpp
ADDITIONAL_FILES=\
$(MOVED_FILES) \
include$/cppunit$/additionalfunc.hxx \
include$/cppunit$/autoregister$/callbackfunc_fktptr.h \
include$/cppunit$/autoregister$/callbackstructure.h \
include$/cppunit$/autoregister$/htestresult.h \
include$/cppunit$/autoregister$/registerfunc.h \
include$/cppunit$/autoregister$/registertestfunction.h \
include$/cppunit$/autoregister$/testfunc.h \
include$/cppunit$/checkboom.hxx \
include$/cppunit$/cmdlinebits.hxx \
include$/cppunit$/externcallbackfunc.hxx \
include$/cppunit$/joblist.hxx \
include$/cppunit$/nocopy.hxx \
include$/cppunit$/portability$/config-auto.h \
include$/cppunit$/result$/callbackfunc.h \
include$/cppunit$/result$/emacsTestResult.hxx \
include$/cppunit$/result$/log.hxx \
include$/cppunit$/result$/optionhelper.hxx \
include$/cppunit$/result$/outputter.hxx \
include$/cppunit$/result$/testshlTestResult.h \
include$/cppunit$/signaltest.h \
include$/cppunit$/simpleheader.hxx \
include$/cppunit$/stringhelper.hxx \
include$/cppunit$/taghelper.hxx \
include$/cppunit$/tagvalues.hxx \
include$/testshl$/autoregisterhelper.hxx \
include$/testshl$/dynamicregister.hxx \
include$/testshl$/filehelper.hxx \
include$/testshl$/getopt.hxx \
include$/testshl$/log.hxx \
include$/testshl$/tresstatewrapper.h \
include$/testshl$/tresstatewrapper.hxx \
include$/testshl$/versionhelper.hxx \
include$/testshl$/winstuff.hxx \
include$/makefile.mk \
makefile.mk \
src$/makefile.mk \
src$/cppunit$/cmdlinebits.cxx \
src$/cppunit$/joblist.cxx \
src$/cppunit$/makefile.mk \
src$/cppunit$/registertestfunction.cxx \
src$/cppunit$/signaltest.cxx \
src$/cppunit$/t_print.cxx \
src$/cppunit$/tresregister.cxx \
src$/cppunit$/tresstatewrapper.cxx \
src$/result$/emacsTestResult.cxx \
src$/result$/log.cxx \
src$/result$/makefile.mk \
src$/result$/optionhelper.cxx \
src$/result$/outputter.cxx \
src$/result$/signal.cxx \
src$/result$/signal.hxx \
src$/result$/testshlTestResult.cxx \
src$/result$/treswrapper.cxx \
src$/win32$/makefile.mk \
src$/win32$/winstuff.cxx
PATCH_FILES=cppunit-1.8.0-r1.patch
# CONFIGURE_DIR=
# CONFIGURE_ACTION=
#
# BUILD_DIR=
BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
# --- Targets ------------------------------------------------------
.INCLUDE : set_ext.mk
.INCLUDE : target.mk
.INCLUDE : tg_ext.mk
.INCLUDE: set_ext.mk
.INCLUDE: target.mk
.INCLUDE: tg_ext.mk
.ENDIF
#*************************************************************************
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# Copyright 2008 by Sun Microsystems, Inc.
#
# OpenOffice.org - a multi-platform office productivity suite
#
# $RCSfile: makefile,v $
#
# $Revision: 1.4 $
#
# 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
#*************************************************************************
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# Copyright 2008 by Sun Microsystems, Inc.
#
# OpenOffice.org - a multi-platform office productivity suite
#
# $RCSfile: makefile,v $
#
# $Revision: 1.4 $
#
# 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
c5t cppunit : sal NULL
c5t cppunit usr1 - all c5t_mkout NULL
c5t cppunit nmake - all c5t_make NULL
c5t cppunit : stlport NULL
c5t cppunit nmake - all cppunit NULL
mkdir: %_DEST%\inc%_EXT%\cppunit
mkdir: %_DEST%\inc%_EXT%\cppunit\portability
mkdir: %_DEST%\inc%_EXT%\cppunit\autoregister
..\%__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
mkdir: %_DEST%\inc%_EXT%\cppunit\result
mkdir: %_DEST%\inc%_EXT%\testshl
..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/Asserter.h %_DEST%\inc%_EXT%/cppunit/Asserter.h
..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/Exception.h %_DEST%\inc%_EXT%/cppunit/Exception.h
..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/NotEqualException.h %_DEST%\inc%_EXT%/cppunit/NotEqualException.h
..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/Portability.h %_DEST%\inc%_EXT%/cppunit/Portability.h
..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/SourceLine.h %_DEST%\inc%_EXT%/cppunit/SourceLine.h
..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/Test.h %_DEST%\inc%_EXT%/cppunit/Test.h
..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/TestAssert.h %_DEST%\inc%_EXT%/cppunit/TestAssert.h
..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/TestCaller.h %_DEST%\inc%_EXT%/cppunit/TestCaller.h
..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/TestCase.h %_DEST%\inc%_EXT%/cppunit/TestCase.h
..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/TestFailure.h %_DEST%\inc%_EXT%/cppunit/TestFailure.h
..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/TestFixture.h %_DEST%\inc%_EXT%/cppunit/TestFixture.h
..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/TestSuite.h %_DEST%\inc%_EXT%/cppunit/TestSuite.h
..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/additionalfunc.hxx %_DEST%\inc%_EXT%/cppunit/additionalfunc.hxx
..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/autoregister/callbackfunc_fktptr.h %_DEST%\inc%_EXT%/cppunit/autoregister/callbackfunc_fktptr.h
..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/autoregister/callbackstructure.h %_DEST%\inc%_EXT%/cppunit/autoregister/callbackstructure.h
..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/autoregister/htestresult.h %_DEST%\inc%_EXT%/cppunit/autoregister/htestresult.h
..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/autoregister/registerfunc.h %_DEST%\inc%_EXT%/cppunit/autoregister/registerfunc.h
..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/autoregister/registertestfunction.h %_DEST%\inc%_EXT%/cppunit/autoregister/registertestfunction.h
..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/autoregister/testfunc.h %_DEST%\inc%_EXT%/cppunit/autoregister/testfunc.h
..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/checkboom.hxx %_DEST%\inc%_EXT%/cppunit/checkboom.hxx
..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/cmdlinebits.hxx %_DEST%\inc%_EXT%/cppunit/cmdlinebits.hxx
..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/extensions/AutoRegisterSuite.h %_DEST%\inc%_EXT%/cppunit/extensions/AutoRegisterSuite.h
..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/extensions/HelperMacros.h %_DEST%\inc%_EXT%/cppunit/extensions/HelperMacros.h
..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/extensions/TestFactory.h %_DEST%\inc%_EXT%/cppunit/extensions/TestFactory.h
..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/extensions/TestFactoryRegistry.h %_DEST%\inc%_EXT%/cppunit/extensions/TestFactoryRegistry.h
..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/extensions/TestSuiteBuilder.h %_DEST%\inc%_EXT%/cppunit/extensions/TestSuiteBuilder.h
..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/extensions/TestSuiteFactory.h %_DEST%\inc%_EXT%/cppunit/extensions/TestSuiteFactory.h
..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/extensions/TypeInfoHelper.h %_DEST%\inc%_EXT%/cppunit/extensions/TypeInfoHelper.h
..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/externcallbackfunc.hxx %_DEST%\inc%_EXT%/cppunit/externcallbackfunc.hxx
..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/joblist.hxx %_DEST%\inc%_EXT%/cppunit/joblist.hxx
..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/nocopy.hxx %_DEST%\inc%_EXT%/cppunit/nocopy.hxx
..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/portability/config-auto.h %_DEST%\inc%_EXT%/cppunit/portability/config-auto.h
..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/portability/config-bcb5.h %_DEST%\inc%_EXT%/cppunit/portability/config-bcb5.h
..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/portability/config-msvc6.h %_DEST%\inc%_EXT%/cppunit/portability/config-msvc6.h
..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/result/SynchronizedObject.h %_DEST%\inc%_EXT%/cppunit/result/SynchronizedObject.h
..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/result/TestListener.h %_DEST%\inc%_EXT%/cppunit/result/TestListener.h
..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/result/TestResult.h %_DEST%\inc%_EXT%/cppunit/result/TestResult.h
..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/result/TestResultCollector.h %_DEST%\inc%_EXT%/cppunit/result/TestResultCollector.h
..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/result/TestSucessListener.h %_DEST%\inc%_EXT%/cppunit/result/TestSucessListener.h
..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/result/TextTestResult.h %_DEST%\inc%_EXT%/cppunit/result/TextTestResult.h
..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/result/callbackfunc.h %_DEST%\inc%_EXT%/cppunit/result/callbackfunc.h
..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/result/emacsTestResult.hxx %_DEST%\inc%_EXT%/cppunit/result/emacsTestResult.hxx
..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/result/log.hxx %_DEST%\inc%_EXT%/cppunit/result/log.hxx
..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/result/optionhelper.hxx %_DEST%\inc%_EXT%/cppunit/result/optionhelper.hxx
..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/result/outputter.hxx %_DEST%\inc%_EXT%/cppunit/result/outputter.hxx
..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/result/testshlTestResult.h %_DEST%\inc%_EXT%/cppunit/result/testshlTestResult.h
..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/signaltest.h %_DEST%\inc%_EXT%/cppunit/signaltest.h
..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/simpleheader.hxx %_DEST%\inc%_EXT%/cppunit/simpleheader.hxx
..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/stringhelper.hxx %_DEST%\inc%_EXT%/cppunit/stringhelper.hxx
..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/taghelper.hxx %_DEST%\inc%_EXT%/cppunit/taghelper.hxx
..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/tagvalues.hxx %_DEST%\inc%_EXT%/cppunit/tagvalues.hxx
..\%__SRC%\misc\build\cppunit-1.8.0\include/testshl/autoregisterhelper.hxx %_DEST%\inc%_EXT%/testshl/autoregisterhelper.hxx
..\%__SRC%\misc\build\cppunit-1.8.0\include/testshl/dynamicregister.hxx %_DEST%\inc%_EXT%/testshl/dynamicregister.hxx
..\%__SRC%\misc\build\cppunit-1.8.0\include/testshl/filehelper.hxx %_DEST%\inc%_EXT%/testshl/filehelper.hxx
..\%__SRC%\misc\build\cppunit-1.8.0\include/testshl/getopt.hxx %_DEST%\inc%_EXT%/testshl/getopt.hxx
..\%__SRC%\misc\build\cppunit-1.8.0\include/testshl/log.hxx %_DEST%\inc%_EXT%/testshl/log.hxx
..\%__SRC%\misc\build\cppunit-1.8.0\include/testshl/tresstatewrapper.h %_DEST%\inc%_EXT%/testshl/tresstatewrapper.h
..\%__SRC%\misc\build\cppunit-1.8.0\include/testshl/tresstatewrapper.hxx %_DEST%\inc%_EXT%/testshl/tresstatewrapper.hxx
..\%__SRC%\misc\build\cppunit-1.8.0\include/testshl/versionhelper.hxx %_DEST%\inc%_EXT%/testshl/versionhelper.hxx
..\%__SRC%\misc\build\cppunit-1.8.0\include/testshl/winstuff.hxx %_DEST%\inc%_EXT%/testshl/winstuff.hxx
..\%__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%\lib\cppunit.lib %_DEST%\lib%_EXT%\cppunit.lib
..\%__SRC%\lib\c5t_*.lib %_DEST%\lib%_EXT%\c5t_*.lib
..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a
..\%__SRC%\bin\cppunit_dll.dll %_DEST%\bin%_EXT%\cppunit_dll.dll
..\%__SRC%\lib\icppunit_dll.lib %_DEST%\lib%_EXT%\icppunit_dll.lib
..\%__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%\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%\bin\DllPlugInTester %_DEST%\bin%_EXT%\DllPlugInTester
..\%__SRC%\bin\DllPlugInTester_dll.exe %_DEST%\bin%_EXT%\DllPlugInTester_dll.exe
--- 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
--- 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; \
} \
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment