gbuild: remove horrible abuses of gb_Jar_use_jars:

Let gb_JavaClassSet_use_customtarget add the customtarget workdir to the
classpath.

Change-Id: I836e890b43bb2ca06d19cf9f83a5fa8f735cf963

ridljar/CustomTarget_javamaker.mk

@@ -36,6 +36,6 @@ $(ridljar_DIR)/done : $(OUTDIR)/bin/udkapi.rdb \
 		| $(ridljar_DIR)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1)
 	$(call gb_Helper_abbreviate_dirs, \
-	$(call gb_Helper_execute,javamaker -BUCR -O$(ridljar_DIR)/class $<) && touch $@)
+	$(call gb_Helper_execute,javamaker -BUCR -O$(ridljar_DIR) $<) && touch $@)
 
 # vim:set shiftwidth=4 tabstop=4 noexpandtab:

ridljar/Jar_ridl.mk

@@ -31,14 +31,10 @@ $(eval $(call gb_Jar_use_customtargets,ridl,\
     ridljar/javamaker \
 ))
 
-$(eval $(call gb_Jar_use_jars,ridl,\
-    $(WORKDIR)/CustomTarget/ridljar/javamaker/class \
-))
-
 $(eval $(call gb_Jar_set_packageroot,ridl,com))
 
 $(eval $(call gb_Jar_add_packagedirs,ridl,\
-    $(WORKDIR)/CustomTarget/ridljar/javamaker/class/com \
+    $(call gb_CustomTarget_get_workdir,ridljar/javamaker)/com \
 ))
 
 $(eval $(call gb_Jar_add_sourcefiles,ridl,\

solenv/gbuild/JavaClassSet.mk

@@ -195,6 +195,7 @@ endef
 define gb_JavaClassSet_use_customtarget
 $(call gb_JavaClassSet_get_preparation_target,$(1)) : \
 	$(call gb_CustomTarget_get_target,$(2))
+$(call gb_JavaClassSet_add_classpath,$(1),$(call gb_CustomTarget_get_workdir,$(2)))
 
 endef
 

testtools/CustomTarget_bridgetest_javamaker.mk

@@ -34,6 +34,6 @@ $(testtools_JAVADIR)/done : $(call gb_UnoApiTarget_get_target,bridgetest) \
 	$(call gb_Executable_get_target_for_build,javamaker) | $(testtools_JAVADIR)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1)
 	$(call gb_Helper_abbreviate_dirs, \
-	$(call gb_Helper_execute,javamaker -BUCR -nD -O$(testtools_JAVADIR)/class -X$(OUTDIR)/bin/types.rdb $<) && touch $@)
+	$(call gb_Helper_execute,javamaker -BUCR -nD -O$(testtools_JAVADIR) -X$(OUTDIR)/bin/types.rdb $<) && touch $@)
 
 # vim:set shiftwidth=4 tabstop=4 noexpandtab:

testtools/Jar_testComponent.mk

@@ -36,10 +36,6 @@ $(eval $(call gb_Jar_use_customtargets,testComponent,\
     testtools/bridgetest_javamaker \
 ))
 
-$(eval $(call gb_Jar_use_jars,testComponent,\
-    $(WORKDIR)/CustomTarget/testtools/bridgetest_javamaker/class \
-))
-
 $(eval $(call gb_Jar_set_packageroot,testComponent,com))
 
 $(eval $(call gb_Jar_set_manifest,testComponent,$(SRCDIR)/testtools/com/sun/star/comp/bridge/manifest))
@@ -47,7 +43,7 @@ $(eval $(call gb_Jar_set_manifest,testComponent,$(SRCDIR)/testtools/com/sun/star
 $(eval $(call gb_Jar_set_componentfile,testComponent,testtools/source/bridgetest/testComponent,URE))
 
 $(eval $(call gb_Jar_add_packagedirs,testComponent,\
-    $(WORKDIR)/CustomTarget/testtools/bridgetest_javamaker/class/test \
+    $(call gb_CustomTarget_get_workdir,testtools/bridgetest_javamaker)/test \
 ))
 
 $(eval $(call gb_Jar_add_sourcefiles,testComponent,\

unoil/Jar_unoil.mk

@@ -32,7 +32,7 @@ $(eval $(call gb_Jar_use_customtargets,unoil,\
 ))
 
 $(eval $(call gb_Jar_add_packagedirs,unoil,\
-    $(WORKDIR)/CustomTarget/unoil/javamaker/com \
+    $(call gb_CustomTarget_get_workdir,unoil/javamaker)/com \
 ))
 
 # vim:set shiftwidth=4 softtabstop=4 expandtab: