[Libreoffice-commits] .: editeng/Module_editeng.mk editeng/qa

[Cédric Bosdonnat]

 editeng/Module_editeng.mk            |    1 
 editeng/qa/items/borderline_test.cxx |    1 
 editeng/qa/items/makefile.mk         |   94 -----------------------------------
 editeng/qa/items/version.map         |   34 ------------
 4 files changed, 2 insertions(+), 128 deletions(-)

New commits:
commit d68424e3fea47220cb42ed8eea07b6d2eacba623
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date:   Mon Mar 21 12:29:05 2011 +0100

    editeng: Adapted borderline unit test to new build system

diff --git a/editeng/Module_editeng.mk b/editeng/Module_editeng.mk
index 4a5dbcf..e84a158 100755
--- a/editeng/Module_editeng.mk
+++ b/editeng/Module_editeng.mk
@@ -36,6 +36,7 @@ $(eval $(call gb_Module_add_targets,editeng,\
 # add any runtime tests (unit tests) here
 # remove if no tests
 $(eval $(call gb_Module_add_check_targets,editeng,\
+    CppunitTest_editeng_borderline \
 ))
 
 # add any subsequent checks (e.g. complex tests) here
diff --git a/editeng/qa/items/borderline_test.cxx b/editeng/qa/items/borderline_test.cxx
index 870a6a7..995ccef 100644
--- a/editeng/qa/items/borderline_test.cxx
+++ b/editeng/qa/items/borderline_test.cxx
@@ -32,6 +32,7 @@
 #include <cppunit/plugin/TestPlugIn.h>
 
 #include <editeng/borderline.hxx>
+#include <sal/cppunit.h>
 
 #define TEST_WIDTH long( 40 )
 
diff --git a/editeng/qa/items/makefile.mk b/editeng/qa/items/makefile.mk
deleted file mode 100644
index 3d6b16e..0000000
--- a/editeng/qa/items/makefile.mk
+++ /dev/null
@@ -1,94 +0,0 @@
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-#       [ Novell Inc. Cédric Bosdonnat <cbosdonnat at novell.com> ]
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-#
-PRJ=..$/..
-
-PRJNAME=editeng
-TARGET=test-items
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-#building with stlport, but cppunit was not built with stlport
-.IF "$(USE_SYSTEM_STL)"!="YES"
-.IF "$(SYSTEM_CPPUNIT)"=="YES"
-CFLAGSCXX+=-DADAPT_EXT_STL
-.ENDIF
-.ENDIF
-
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
-DLLPRE = # no leading "lib" on .so files
-
-
-# --- Targets ------------------------------------------------------
-
-SHL1TARGET = borderline_test
-SHL1OBJS = \
-             $(SLO)$/borderline_test.obj
-
-SHL1LIBS= \
-    $(SLB)$/items.lib     \
-    $(SLB)$/misc.lib	\
-    $(SLB)$/rtf.lib	\
-    $(SLB)$/uno.lib	\
-    $(SLB)$/accessibility.lib	\
-    $(SLB)$/editeng.lib \
-    $(SLB)$/outliner.lib \
-    $(SLB)$/xml.lib
-
-SHL1STDLIBS= \
-             $(CPPUNITLIB) \
-             $(XMLOFFLIB) \
-             $(BASEGFXLIB) \
-             $(LNGLIB) \
-             $(SVTOOLLIB) \
-             $(TKLIB) \
-             $(VCLLIB) \
-             $(SVLLIB) \
-             $(SOTLIB) \
-             $(UNOTOOLSLIB) \
-             $(TOOLSLIB) \
-             $(I18NISOLANGLIB) \
-             $(I18NPAPERLIB) \
-             $(COMPHELPERLIB) \
-             $(UCBHELPERLIB) \
-             $(CPPUHELPERLIB) \
-             $(CPPULIB) \
-             $(SALLIB) \
-             $(SALHELPERLIB) \
-             $(ICUUCLIB)
-
-SHL1VERSIONMAP = version.map
-SHL1IMPLIB = i$(SHL1TARGET)
-DEF1NAME = $(SHL1TARGET)
-
-
-SLOFILES = $(SHL1OBJS)
-
-.INCLUDE :  target.mk
-.INCLUDE : _cppunit.mk
diff --git a/editeng/qa/items/version.map b/editeng/qa/items/version.map
deleted file mode 100644
index 01cc9af..0000000
--- a/editeng/qa/items/version.map
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-#       [ insert your name / company etc. here eg. Jim Bob <jim at bob.org> ]
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
-# Contributor(s): Jim Bob <jim at bob.org>
-#                 Ted <ted at bear.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-#
-UDK_3_0_0 {
-    global:
-        cppunitTestPlugIn;
-
-    local:
-        *;
-};