diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-08-15 19:44:26 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-08-15 21:29:14 +0200 |
| commit | 8b8e749fae45ba41e361897b447173fb6a26eb38 (patch) | |
| tree | 5eff7e05d1bfc3e40a5e29270cf726fcbc36fc19 | |
| parent | 96410b9e04c1da1f634c3a4ab1ffba335309e46e (diff) | |
gbuild: remove horrible abuses of gb_Jar_use_jars:
Let gb_JavaClassSet_use_customtarget add the customtarget workdir to the
classpath.
Change-Id: I836e890b43bb2ca06d19cf9f83a5fa8f735cf963
| -rw-r--r-- | ridljar/CustomTarget_javamaker.mk | 2 | ||||
| -rw-r--r-- | ridljar/Jar_ridl.mk | 6 | ||||
| -rw-r--r-- | solenv/gbuild/JavaClassSet.mk | 1 | ||||
| -rw-r--r-- | testtools/CustomTarget_bridgetest_javamaker.mk | 2 | ||||
| -rw-r--r-- | testtools/Jar_testComponent.mk | 6 | ||||
| -rw-r--r-- | unoil/Jar_unoil.mk | 2 |
6 files changed, 6 insertions, 13 deletions
diff --git a/ridljar/CustomTarget_javamaker.mk b/ridljar/CustomTarget_javamaker.mk index d9b3a7b4249c..3486d918f20c 100644 --- a/ridljar/CustomTarget_javamaker.mk +++ b/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: diff --git a/ridljar/Jar_ridl.mk b/ridljar/Jar_ridl.mk index e2452251c9e7..700508188172 100644 --- a/ridljar/Jar_ridl.mk +++ b/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,\ diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk index d0c03e75b795..67e48e6f7a1e 100644 --- a/solenv/gbuild/JavaClassSet.mk +++ b/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 diff --git a/testtools/CustomTarget_bridgetest_javamaker.mk b/testtools/CustomTarget_bridgetest_javamaker.mk index e509e0453360..d55126a949e4 100644 --- a/testtools/CustomTarget_bridgetest_javamaker.mk +++ b/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: diff --git a/testtools/Jar_testComponent.mk b/testtools/Jar_testComponent.mk index 12dfe3fa27e9..498edd5e6df7 100644 --- a/testtools/Jar_testComponent.mk +++ b/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,\ diff --git a/unoil/Jar_unoil.mk b/unoil/Jar_unoil.mk index 10444531608f..f53c4b4f1789 100644 --- a/unoil/Jar_unoil.mk +++ b/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: |