From 76324b35095a9fe2d65e224fba554d12e4af7a70 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Wed, 28 Nov 2012 16:26:19 +0100 Subject: 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 --- touch/CustomTarget_touch_javamaker.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'touch') 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: -- cgit