summaryrefslogtreecommitdiff
path: root/jurt/CustomTarget_test_urp.mk
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2012-11-28 20:35:31 +0100
committerMichael Stahl <mstahl@redhat.com>2012-11-28 20:36:49 +0100
commit287a18429f007207571f9f308c0ae5f76ab03afa (patch)
tree28e19894d75b19b7a6ea4e9e175351240f77e2fb /jurt/CustomTarget_test_urp.mk
parent6032ed44430e1f3b34cb89a40a8f8ad52e50a53f (diff)
jurt: actually, why does this not simply use InternalUnoApi
... which makes things much simpler, and the custom target now only contains Java classes. Change-Id: I4aead3a2468085212e2384cad97e34f9cfce7270
Diffstat (limited to 'jurt/CustomTarget_test_urp.mk')
-rw-r--r--jurt/CustomTarget_test_urp.mk20
1 files changed, 4 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: