[Libreoffice-commits] core.git: testtools/CustomTarget_bridgetest_javamaker.mk testtools/InternalUnoApi_bridgetest.mk testtools/InternalUnoApi_performance.mk testtools/Module_testtools.mk

[Stephan Bergmann]

 testtools/CustomTarget_bridgetest_javamaker.mk |    3 ++-
 testtools/InternalUnoApi_bridgetest.mk         |    4 ----
 testtools/InternalUnoApi_performance.mk        |   25 +++++++++++++++++++++++++
 testtools/Module_testtools.mk                  |    1 +
 4 files changed, 28 insertions(+), 5 deletions(-)

New commits:
commit ecaadbf78794174c5f744b4982546901cb7fe8e8
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Sep 18 22:32:12 2013 +0200

    There are two distinct InternalUnoApis in testtools
    
    Change-Id: Ie9663bfa522c0d2ee4f996c2f7d744aaf0600623

diff --git a/testtools/CustomTarget_bridgetest_javamaker.mk b/testtools/CustomTarget_bridgetest_javamaker.mk
index 7435296..8302900 100644
--- a/testtools/CustomTarget_bridgetest_javamaker.mk
+++ b/testtools/CustomTarget_bridgetest_javamaker.mk
@@ -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:
diff --git a/testtools/InternalUnoApi_bridgetest.mk b/testtools/InternalUnoApi_bridgetest.mk
index 0e095bf..dfe8344 100644
--- a/testtools/InternalUnoApi_bridgetest.mk
+++ b/testtools/InternalUnoApi_bridgetest.mk
@@ -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:
diff --git a/testtools/InternalUnoApi_performance.mk b/testtools/InternalUnoApi_performance.mk
new file mode 100644
index 0000000..978eb09
--- /dev/null
+++ b/testtools/InternalUnoApi_performance.mk
@@ -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:
diff --git a/testtools/Module_testtools.mk b/testtools/Module_testtools.mk
index 0200405..dd35012 100644
--- a/testtools/Module_testtools.mk
+++ b/testtools/Module_testtools.mk
@@ -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 \