summaryrefslogtreecommitdiff
path: root/jurt
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2012-11-28 16:26:19 +0100
committerMichael Stahl <mstahl@redhat.com>2012-11-28 16:56:16 +0100
commit76324b35095a9fe2d65e224fba554d12e4af7a70 (patch)
tree937a6529be22710ffeb1ecf23bebf505ddbff9ba /jurt
parentd9e14c63e3bdd5e289c846ca9448e3864ccbe566 (diff)
ridljar etc.: javamaker invocations must rm -r targetdir
... because otherwise types that have been removed from the input rdb still end up in the resulting jar file. Change-Id: Ia73ecffcc9d831f2627ac0fcc5f57acf1f52a799
Diffstat (limited to 'jurt')
-rw-r--r--jurt/CustomTarget_test_urp.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/jurt/CustomTarget_test_urp.mk b/jurt/CustomTarget_test_urp.mk
index cf04e192d2c7..b83d914eaf48 100644
--- a/jurt/CustomTarget_test_urp.mk
+++ b/jurt/CustomTarget_test_urp.mk
@@ -34,6 +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 && \
$(call gb_Helper_execute,javamaker -BUCR -O$(jurt_TESTURP) -nD $< -X$(OUTDIR)/bin/types.rdb) && \
touch $@