summaryrefslogtreecommitdiff
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
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
-rw-r--r--jurt/CustomTarget_test_urp.mk1
-rw-r--r--ridljar/CustomTarget_javamaker.mk1
-rw-r--r--testtools/CustomTarget_bridgetest_javamaker.mk1
-rw-r--r--touch/CustomTarget_touch_javamaker.mk1
4 files changed, 4 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 $@
diff --git a/ridljar/CustomTarget_javamaker.mk b/ridljar/CustomTarget_javamaker.mk
index 3486d918f20c..974de518eefc 100644
--- a/ridljar/CustomTarget_javamaker.mk
+++ b/ridljar/CustomTarget_javamaker.mk
@@ -36,6 +36,7 @@ $(ridljar_DIR)/done : $(OUTDIR)/bin/udkapi.rdb \
| $(ridljar_DIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1)
$(call gb_Helper_abbreviate_dirs, \
+ rm -r $(ridljar_DIR) && \
$(call gb_Helper_execute,javamaker -BUCR -O$(ridljar_DIR) $<) && touch $@)
# vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/testtools/CustomTarget_bridgetest_javamaker.mk b/testtools/CustomTarget_bridgetest_javamaker.mk
index 00ea2b6baa25..2dd0af4a587f 100644
--- a/testtools/CustomTarget_bridgetest_javamaker.mk
+++ b/testtools/CustomTarget_bridgetest_javamaker.mk
@@ -37,6 +37,7 @@ $(testtools_JAVADIR)/done : \
| $(testtools_JAVADIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1)
$(call gb_Helper_abbreviate_dirs, \
+ rm -r $(testtools_JAVADIR) && \
$(call gb_Helper_execute,javamaker -BUCR -nD -O$(testtools_JAVADIR) -X$(OUTDIR)/bin/types.rdb $<) && touch $@)
# vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/touch/CustomTarget_touch_javamaker.mk b/touch/CustomTarget_touch_javamaker.mk
index 7ccf6f10f290..ccb135a768e4 100644
--- a/touch/CustomTarget_touch_javamaker.mk
+++ b/touch/CustomTarget_touch_javamaker.mk
@@ -16,6 +16,7 @@ $(touch_javamaker_DIR)/done : $(call gb_UnoApiTarget_get_target,touch) $(OUTDIR)
$(call gb_Executable_get_target_for_build,javamaker) | $(touch_javamaker_DIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1)
$(call gb_Helper_abbreviate_dirs, \
+ rm -r $(touch_javamaker_DIR) && \
$(call gb_Helper_execute,javamaker -BUCR -nD -O$(touch_javamaker_DIR)/class -X$(OUTDIR)/bin/types.rdb $<) && touch $@)
# vim: set noet sw=4 ts=4: