[Libreoffice-commits] .: 2 commits - jurt/CustomTarget_test_urp.mk jurt/InternalUnoApi_test_urp.mk jurt/Module_jurt.mk

[Libreoffice Gerrit user]

 jurt/CustomTarget_test_urp.mk   |   20 ++++----------------
 jurt/InternalUnoApi_test_urp.mk |   25 +++++++++++++++++++++++++
 jurt/Module_jurt.mk             |    1 +
 3 files changed, 30 insertions(+), 16 deletions(-)

New commits:
commit 287a18429f007207571f9f308c0ae5f76ab03afa
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Nov 28 20:35:31 2012 +0100

    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

diff --git a/jurt/CustomTarget_test_urp.mk b/jurt/CustomTarget_test_urp.mk
index 60086f1..10db4f7 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 0000000..11d20cb
--- /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 2026de2..e367b6f 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 \
commit 6032ed44430e1f3b34cb89a40a8f8ad52e50a53f
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Nov 28 20:10:14 2012 +0100

    jurt: remove that with -f because it may not exist...
    
    Change-Id: Ic93cf3d81bf2cbda9365998f4e41d582a5436227

diff --git a/jurt/CustomTarget_test_urp.mk b/jurt/CustomTarget_test_urp.mk
index b83d914..60086f1 100644
--- a/jurt/CustomTarget_test_urp.mk
+++ b/jurt/CustomTarget_test_urp.mk
@@ -34,7 +34,7 @@ $(call gb_CustomTarget_get_target,jurt/test/com/sun/star/lib/uno/protocols/urp)
 $(jurt_TESTURP)/done : $(jurt_TESTURP)/registry.rdb $(OUTDIR)/bin/types.rdb \
 		$(call gb_Executable_get_target_for_build,javamaker)
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1)
-	rm -r $(jurt_TESTURP)/com && \
+	rm -rf $(jurt_TESTURP)/com && \
 	$(call gb_Helper_execute,javamaker -BUCR -O$(jurt_TESTURP) -nD $< -X$(OUTDIR)/bin/types.rdb) && \
 	touch $@