summaryrefslogtreecommitdiff
path: root/unoil
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2012-04-14 18:04:24 +0200
committerMichael Stahl <mstahl@redhat.com>2012-04-14 21:07:14 +0200
commit0ff30829a607eb84669988f424b22df88db7c2de (patch)
treef9d3075c672ca59b38399f6a7d140f7b7076345c /unoil
parent8c0a9bca425bffd87d12c3f18ec852f083c11bef (diff)
unoil: remove generated classes before calling javamaker
Otherwise the class files for IDL files that were removed still end up in unoil.jar and may cause JunitTest to fail with "binaryurp::Unmarshal: type with unknown name: ".
Diffstat (limited to 'unoil')
-rw-r--r--unoil/CustomTarget_javamaker.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/unoil/CustomTarget_javamaker.mk b/unoil/CustomTarget_javamaker.mk
index 73fd4363868c..943732a61d7c 100644
--- a/unoil/CustomTarget_javamaker.mk
+++ b/unoil/CustomTarget_javamaker.mk
@@ -35,6 +35,7 @@ $(UIJM)/done : $(OUTDIR)/bin/offapi.rdb $(OUTDIR)/bin/udkapi.rdb \
$(call gb_Executable_get_target_for_build,javamaker) | $(UIJM)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1)
$(call gb_Helper_abbreviate_dirs_native, \
+ rm -r $(UIJM) && \
$(call gb_Helper_execute,javamaker -BUCR -O$(UIJM) $(OUTDIR)/bin/offapi.rdb -X$(OUTDIR)/bin/udkapi.rdb) && \
touch $@)