diff options
| -rw-r--r-- | jurt/CustomTarget_test_urp.mk | 20 | ||||
| -rw-r--r-- | jurt/InternalUnoApi_test_urp.mk | 25 | ||||
| -rw-r--r-- | jurt/Module_jurt.mk | 1 |
3 files changed, 30 insertions, 16 deletions
diff --git a/jurt/CustomTarget_test_urp.mk b/jurt/CustomTarget_test_urp.mk index 60086f1faf72..10db4f7f00d5 100644 --- a/jurt/CustomTarget_test_urp.mk +++ b/jurt/CustomTarget_test_urp.mk @@ -31,25 +31,13 @@ jurt_TESTURP := $(call gb_CustomTarget_get_workdir,jurt/test/com/sun/star/lib/un $(call gb_CustomTarget_get_target,jurt/test/com/sun/star/lib/uno/protocols/urp) : $(jurt_TESTURP)/done -$(jurt_TESTURP)/done : $(jurt_TESTURP)/registry.rdb $(OUTDIR)/bin/types.rdb \ +$(jurt_TESTURP)/done : \ + $(call gb_UnoApiTarget_get_target,test_urp) \ + $(OUTDIR)/bin/udkapi.rdb \ $(call gb_Executable_get_target_for_build,javamaker) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1) - rm -rf $(jurt_TESTURP)/com && \ + rm -rf $(jurt_TESTURP) && \ $(call gb_Helper_execute,javamaker -BUCR -O$(jurt_TESTURP) -nD $< -X$(OUTDIR)/bin/types.rdb) && \ touch $@ -# TODO: would it be possible to reuse UnoApiTarget for this? -$(jurt_TESTURP)/registry.rdb : $(jurt_TESTURP)/interfaces.urd \ - $(call gb_Executable_get_target_for_build,regmerge) - $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),RGM,1) - rm -f $@ && \ - $(call gb_Helper_execute,regmerge $@ /UCR $<) - -$(jurt_TESTURP)/interfaces.urd : \ - $(SRCDIR)/jurt/test/com/sun/star/lib/uno/protocols/urp/interfaces.idl \ - $(call gb_Executable_get_target_for_build,idlc) \ - | $(jurt_TESTURP)/urd/.dir - $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),IDL,1) - $(call gb_Helper_execute,idlc -O$(jurt_TESTURP) -I$(OUTDIR)/idl -cid -we $<) - # vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/jurt/InternalUnoApi_test_urp.mk b/jurt/InternalUnoApi_test_urp.mk new file mode 100644 index 000000000000..11d20cb8eb79 --- /dev/null +++ b/jurt/InternalUnoApi_test_urp.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,test_urp)) + +$(eval $(call gb_InternalUnoApi_use_api,test_urp,\ + udkapi \ +)) + +$(eval $(call gb_InternalUnoApi_set_include,test_urp,\ + -I$(OUTDIR)/idl \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_InternalUnoApi_add_idlfiles,test_urp,jurt/test/com/sun/star/lib/uno/protocols/urp,\ + interfaces \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/jurt/Module_jurt.mk b/jurt/Module_jurt.mk index 2026de26f57c..e367b6f30a07 100644 --- a/jurt/Module_jurt.mk +++ b/jurt/Module_jurt.mk @@ -50,6 +50,7 @@ endif $(eval $(call gb_Module_add_subsequentcheck_targets,jurt,\ CustomTarget_test_urp \ + InternalUnoApi_test_urp \ JunitTest_bridgefactory \ JunitTest_connections \ JunitTest_java \ |