mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

convert test helper library to dynamic

Browse Source 
Change-Id: I5992cc7ac9ffb3974fa49bb7feec4b0212032386
This commit is contained in:
David Tardon 2016-12-02 15:07:40 +01:00
parent e60a60f570
commit 01c75db710
11 changed files with 50 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Repository.mk
View File

@ -499,6 +499,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
vclbootstrapprotector \
scqahelper \
unowinreg \
wpftqahelper \
$(if $(filter MSC,$(COM)),cli_cppuhelper) \
$(if $(filter $(OS),ANDROID),lo-bootstrap) \
$(if $(filter $(OS),MACOSX),OOoSpotlightImporter) \

5
writerperfect/CppunitTest_writerperfect_calc.mk
View File

@ -24,13 +24,10 @@ $(eval $(call gb_CppunitTest_use_libraries,writerperfect_calc,\
tl \
ucbhelper \
unotest \
wpftqahelper \
$(gb_UWINAPI) \
))
$(eval $(call gb_CppunitTest_use_static_libraries,writerperfect_calc,\
writerperfect_filtertestbase \
))
$(eval $(call gb_CppunitTest_use_ure,writerperfect_calc))
$(eval $(call gb_CppunitTest_use_vcl,writerperfect_calc))

5
writerperfect/CppunitTest_writerperfect_draw.mk
View File

@ -24,13 +24,10 @@ $(eval $(call gb_CppunitTest_use_libraries,writerperfect_draw,\
tl \
ucbhelper \
unotest \
wpftqahelper \
$(gb_UWINAPI) \
))
$(eval $(call gb_CppunitTest_use_static_libraries,writerperfect_draw,\
writerperfect_filtertestbase \
))
$(eval $(call gb_CppunitTest_use_ure,writerperfect_draw))
$(eval $(call gb_CppunitTest_use_vcl,writerperfect_draw))

5
writerperfect/CppunitTest_writerperfect_impress.mk
View File

@ -24,13 +24,10 @@ $(eval $(call gb_CppunitTest_use_libraries,writerperfect_impress,\
tl \
ucbhelper \
unotest \
wpftqahelper \
$(gb_UWINAPI) \
))
$(eval $(call gb_CppunitTest_use_static_libraries,writerperfect_impress,\
writerperfect_filtertestbase \
))
$(eval $(call gb_CppunitTest_use_ure,writerperfect_impress))
$(eval $(call gb_CppunitTest_use_vcl,writerperfect_impress))

5
writerperfect/CppunitTest_writerperfect_writer.mk
View File

@ -24,13 +24,10 @@ $(eval $(call gb_CppunitTest_use_libraries,writerperfect_writer,\
tl \
ucbhelper \
unotest \
wpftqahelper \
$(gb_UWINAPI) \
))
$(eval $(call gb_CppunitTest_use_static_libraries,writerperfect_writer,\
writerperfect_filtertestbase \
))
$(eval $(call gb_CppunitTest_use_ure,writerperfect_writer))
$(eval $(call gb_CppunitTest_use_vcl,writerperfect_writer))

17
writerperfect/StaticLibrary_writerperfect_filtertestbase.mk → writerperfect/Library_wpftqahelper.mk
View File

@ -7,28 +7,33 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
$(eval $(call gb_StaticLibrary_StaticLibrary,writerperfect_filtertestbase))
$(eval $(call gb_Library_Library,wpftqahelper))
$(eval $(call gb_StaticLibrary_set_include,writerperfect_filtertestbase,\
$(eval $(call gb_Library_set_include,wpftqahelper,\
-I$(SRCDIR)/writerperfect/qa/unit \
$$(INCLUDE) \
))
$(eval $(call gb_StaticLibrary_use_externals,writerperfect_filtertestbase,\
$(eval $(call gb_Library_add_defs,wpftqahelper,\
-DWPFTQAHELPER_DLLIMPLEMENTATION \
))
$(eval $(call gb_Library_use_externals,wpftqahelper,\
boost_headers \
cppunit \
))
$(eval $(call gb_StaticLibrary_use_sdk_api,writerperfect_filtertestbase))
$(eval $(call gb_Library_use_sdk_api,wpftqahelper))
$(eval $(call gb_StaticLibrary_use_libraries,writerperfect_filtertestbase,\
$(eval $(call gb_Library_use_libraries,wpftqahelper,\
cppu \
sal \
test \
ucbhelper \
unotest \
))
$(eval $(call gb_StaticLibrary_add_exception_objects,writerperfect_filtertestbase,\
$(eval $(call gb_Library_add_exception_objects,wpftqahelper,\
writerperfect/qa/unit/WpftFilterFixture \
writerperfect/qa/unit/WpftFilterTestBase \
writerperfect/qa/unit/WpftLoader \

2
writerperfect/Module_writerperfect.mk
View File

@ -41,7 +41,7 @@ $(eval $(call gb_Module_add_slowcheck_targets,writerperfect,\
CppunitTest_writerperfect_draw \
CppunitTest_writerperfect_impress \
CppunitTest_writerperfect_writer \
StaticLibrary_writerperfect_filtertestbase \
Library_wpftqahelper \
))
# vim: set noet sw=4 ts=4:

4
writerperfect/qa/unit/WpftFilterFixture.hxx
View File

@ -12,6 +12,8 @@
#include "config_writerperfect.h"
#include "wpftqahelperdllapi.h"
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx>
@ -63,7 +65,7 @@ namespace writerperfect
namespace test
{
class WpftFilterFixture : public ::test::BootstrapFixture
class WPFTQAHELPER_DLLPUBLIC WpftFilterFixture : public ::test::BootstrapFixture
{
public:
virtual void setUp() override;

4
writerperfect/qa/unit/WpftFilterTestBase.hxx
View File

@ -10,6 +10,8 @@
#ifndef INCLUDED_WRITERPERFECT_QA_UNIT_WPFTFILTERTESTBASE_HXX
#define INCLUDED_WRITERPERFECT_QA_UNIT_WPFTFILTERTESTBASE_HXX
#include "wpftqahelperdllapi.h"
#include <unordered_map>
#include <com/sun/star/uno/Reference.hxx>
@ -41,7 +43,7 @@ namespace test
typedef std::unordered_map<rtl::OUString, bool, rtl::OUStringHash> WpftOptionalMap_t;
class WpftFilterTestBase
class WPFTQAHELPER_DLLPUBLIC WpftFilterTestBase
: public ::test::FiltersTest
, public WpftFilterFixture
{

4
writerperfect/qa/unit/WpftLoader.hxx
View File

@ -10,6 +10,8 @@
#ifndef INCLUDED_WRITERPERFECT_QA_UNIT_WPFTLOADER_HXX
#define INCLUDED_WRITERPERFECT_QA_UNIT_WPFTLOADER_HXX
#include "wpftqahelperdllapi.h"
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx>
@ -55,7 +57,7 @@ namespace writerperfect
namespace test
{
class WpftLoader
class WPFTQAHELPER_DLLPUBLIC WpftLoader
{
public:
WpftLoader(

24
writerperfect/qa/unit/wpftqahelperdllapi.h Normal file
View File

@ -0,0 +1,24 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#ifndef INCLUDED_WRITERPERFECT_QA_UNIT_WPFTQAHELPERDLLAPI_H
#define INCLUDED_WRITERPERFECT_QA_UNIT_WPFTQAHELPERDLLAPI_H
#include <sal/types.h>
#if defined(WPFTQAHELPER_DLLIMPLEMENTATION)
#define WPFTQAHELPER_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
#else
#define WPFTQAHELPER_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
#endif
#define WPFTQAHELPER_DLLPRIVATE SAL_DLLPRIVATE
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */