There are two distinct InternalUnoApis in testtools

Change-Id: Ie9663bfa522c0d2ee4f996c2f7d744aaf0600623
This commit is contained in:
Stephan Bergmann
2013-09-18 22:32:12 +02:00
parent dba4e216c9
commit ecaadbf787
4 changed files with 28 additions and 5 deletions

View File

@@ -15,12 +15,13 @@ $(call gb_CustomTarget_get_target,testtools/bridgetest_javamaker) : $(testtools_
$(testtools_JAVADIR)/done : \
$(call gb_UnoApiTarget_get_target,bridgetest) \
$(call gb_UnoApiTarget_get_target,performance) \
$(call gb_UnoApiTarget_get_target,udkapi) \
$(call gb_Executable_get_runtime_dependencies,javamaker) \
| $(testtools_JAVADIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1)
$(call gb_Helper_abbreviate_dirs, \
rm -r $(testtools_JAVADIR) && \
$(call gb_Helper_execute,javamaker -nD -O$(testtools_JAVADIR) -X$(call gb_UnoApiTarget_get_target,udkapi) $<) && touch $@)
$(call gb_Helper_execute,javamaker -nD -O$(testtools_JAVADIR) -X$(call gb_UnoApiTarget_get_target,udkapi) $(call gb_UnoApiTarget_get_target,bridgetest) $(call gb_UnoApiTarget_get_target,performance)) && touch $@)
# vim:set shiftwidth=4 tabstop=4 noexpandtab:

View File

@@ -22,8 +22,4 @@ $(eval $(call gb_InternalUnoApi_add_idlfiles,bridgetest,testtools/source/bridget
bridgetest \
))
$(eval $(call gb_InternalUnoApi_add_idlfiles,bridgetest,testtools/source/bridgetest/idl/com/sun/star/test/performance,\
XPerformanceTest \
))
# vim:set noet sw=4 ts=4:

View File

@@ -0,0 +1,25 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# 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/.
#
$(eval $(call gb_InternalUnoApi_InternalUnoApi,performance))
$(eval $(call gb_InternalUnoApi_use_api,performance,\
udkapi \
))
$(eval $(call gb_InternalUnoApi_set_include,performance,\
-I$(SRCDIR)/udkapi \
$$(INCLUDE) \
))
$(eval $(call gb_InternalUnoApi_add_idlfiles,performance,testtools/source/bridgetest/idl/com/sun/star/test/performance,\
XPerformanceTest \
))
# vim:set noet sw=4 ts=4:

View File

@@ -14,6 +14,7 @@ ifneq ($(CROSS_COMPILING),YES)
$(eval $(call gb_Module_add_targets,testtools,\
CustomTarget_bridgetest \
InternalUnoApi_bridgetest \
InternalUnoApi_performance \
StaticLibrary_bridgetest \
Library_cppobj \
Library_bridgetest \