From 77e8f7f49e8d183fb84d858749e0159ed215a5a0 Mon Sep 17 00:00:00 2001 From: Matúš Kukan Date: Tue, 2 Aug 2011 17:08:14 +0200 Subject: convert o3tl to gbuild --- o3tl/qa/export.map | 34 ------------------ o3tl/qa/makefile.mk | 82 -------------------------------------------- o3tl/qa/test-cow_wrapper.cxx | 2 +- 3 files changed, 1 insertion(+), 117 deletions(-) delete mode 100644 o3tl/qa/export.map delete mode 100644 o3tl/qa/makefile.mk (limited to 'o3tl/qa') diff --git a/o3tl/qa/export.map b/o3tl/qa/export.map deleted file mode 100644 index 3308588ef6f8..000000000000 --- a/o3tl/qa/export.map +++ /dev/null @@ -1,34 +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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -UDK_3_0_0 { - global: - cppunitTestPlugIn; - - local: - *; -}; diff --git a/o3tl/qa/makefile.mk b/o3tl/qa/makefile.mk deleted file mode 100644 index 14dbe622a30f..000000000000 --- a/o3tl/qa/makefile.mk +++ /dev/null @@ -1,82 +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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=.. - -PRJNAME=o3tl -TARGET=tests - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -.IF "$(CROSS_COMPILING)"=="YES" -all: - @echo Nothing done when cross-compiling -.ENDIF - -CFLAGSCXX += $(CPPUNIT_CFLAGS) - -.IF "$(L10N_framework)"=="" -# --- Common ---------------------------------------------------------- - -# BEGIN ---------------------------------------------------------------- -SHL1OBJS= \ - $(SLO)$/cow_wrapper_clients.obj \ - $(SLO)$/test-cow_wrapper.obj \ - $(SLO)$/test-vector_pool.obj \ - $(SLO)$/test-heap_ptr.obj \ - $(SLO)$/test-range.obj - -SHL1TARGET= tests -SHL1STDLIBS= $(SALLIB) \ - $(CPPUNITLIB) - -SHL1IMPLIB= i$(SHL1TARGET) - -DEF1NAME =$(SHL1TARGET) -SHL1VERSIONMAP = export.map -SHL1RPATH = NONE - -# END ------------------------------------------------------------------ - -#------------------------------- All object files ------------------------------- -# do this here, so we get right dependencies -SLOFILES=$(SHL1OBJS) - -# --- Targets ------------------------------------------------------ -.ENDIF # L10N_framework - -.INCLUDE : target.mk - -# --- Enable test execution in normal build ------------------------ -.IF "$(L10N_framework)"=="" -.INCLUDE : _cppunit.mk -.ENDIF # L10N_framework - diff --git a/o3tl/qa/test-cow_wrapper.cxx b/o3tl/qa/test-cow_wrapper.cxx index 06881b333802..fbf9fe49b336 100644 --- a/o3tl/qa/test-cow_wrapper.cxx +++ b/o3tl/qa/test-cow_wrapper.cxx @@ -4,7 +4,7 @@ #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" -#include "cppunit/plugin/TestPlugIn.h" +#include #include "cow_wrapper_clients.hxx" -- cgit