diff options
| -rw-r--r-- | jurt/CustomTarget_test_urp.mk | 5 | ||||
| -rw-r--r-- | offapi/UnoApi_offapi.mk | 4 | ||||
| -rw-r--r-- | oovbaapi/UnoApi_oovbaapi.mk | 4 | ||||
| -rw-r--r-- | ridljar/CustomTarget_javamaker.mk | 2 | ||||
| -rw-r--r-- | scp2/source/ooo/ure.scp | 5 | ||||
| -rw-r--r-- | solenv/gbuild/TargetLocations.mk | 5 | ||||
| -rw-r--r-- | solenv/gbuild/UnoApi.mk | 13 | ||||
| -rw-r--r-- | udkapi/UnoApi_udkapi.mk | 4 | ||||
| -rw-r--r-- | unoil/CustomTarget_javamaker.mk | 8 |
9 files changed, 21 insertions, 29 deletions
diff --git a/jurt/CustomTarget_test_urp.mk b/jurt/CustomTarget_test_urp.mk index 01bf397fba57..ce2fa371e89c 100644 --- a/jurt/CustomTarget_test_urp.mk +++ b/jurt/CustomTarget_test_urp.mk @@ -15,11 +15,12 @@ $(call gb_CustomTarget_get_target,jurt/test/com/sun/star/lib/uno/protocols/urp) $(jurt_TESTURP)/done : \ $(call gb_UnoApiTarget_get_target,test_urp) \ - $(OUTDIR)/bin/udkapi.rdb \ + $(call gb_UnoApi_get_target,udkapi) \ $(call gb_Executable_get_runtime_dependencies,javamaker) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1) rm -rf $(jurt_TESTURP) && \ - $(call gb_Helper_execute,javamaker -O$(jurt_TESTURP) -nD $< -X$(OUTDIR)/bin/udkapi.rdb) && \ + $(call gb_Helper_execute,javamaker -O$(jurt_TESTURP) -nD $< \ + -X$(call gb_UnoApi_get_target,udkapi)) && \ touch $@ # vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index 4eb72ac4fb7f..8b63afde11c1 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -17,9 +17,7 @@ # the License at http://www.apache.org/licenses/LICENSE-2.0 . # -$(eval $(call gb_UnoApi_UnoApi,offapi,offapi)) - -$(eval $(call gb_UnoApi_install,offapi,$(LIBO_ETC_FOLDER)/types/offapi.rdb)) +$(eval $(call gb_UnoApi_UnoApi,offapi)) $(eval $(call gb_UnoApi_package_idlfiles,offapi)) diff --git a/oovbaapi/UnoApi_oovbaapi.mk b/oovbaapi/UnoApi_oovbaapi.mk index a80fb8825d11..bd883f05797a 100644 --- a/oovbaapi/UnoApi_oovbaapi.mk +++ b/oovbaapi/UnoApi_oovbaapi.mk @@ -17,9 +17,7 @@ # the License at http://www.apache.org/licenses/LICENSE-2.0 . # -$(eval $(call gb_UnoApi_UnoApi,oovbaapi,oovbaapi)) - -$(eval $(call gb_UnoApi_install,oovbaapi,$(LIBO_ETC_FOLDER)/types/oovbaapi.rdb)) +$(eval $(call gb_UnoApi_UnoApi,oovbaapi)) $(eval $(call gb_UnoApi_use_api,oovbaapi,\ udkapi \ diff --git a/ridljar/CustomTarget_javamaker.mk b/ridljar/CustomTarget_javamaker.mk index a06e4858db65..2f53fbf4ca28 100644 --- a/ridljar/CustomTarget_javamaker.mk +++ b/ridljar/CustomTarget_javamaker.mk @@ -13,7 +13,7 @@ ridljar_DIR := $(call gb_CustomTarget_get_workdir,ridljar/javamaker) $(call gb_CustomTarget_get_target,ridljar/javamaker) : $(ridljar_DIR)/done -$(ridljar_DIR)/done : $(OUTDIR)/bin/udkapi.rdb \ +$(ridljar_DIR)/done : $(call gb_UnoApi_get_target,udkapi) \ $(call gb_Executable_get_runtime_dependencies,javamaker) \ | $(ridljar_DIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1) diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index a1b14c66347e..653fb6f8d2df 100644 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -564,9 +564,8 @@ End File gid_File_Misc_TypesRdb TXT_FILE_BODY; Dir = GID_DIR_URE_SHARE_MISC; - Name = "udkapi.rdb"; - InstallName = "types.rdb"; - Styles = (PACKED, SUBST_FILENAME); + Name = "types.rdb"; + Styles = (PACKED); End File gid_File_Misc_ServicesRdb diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index 6131af1ababe..cdf828b3d947 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -35,7 +35,8 @@ gb_PackagePart_get_destinations = \ gb_InstallScript_get_target = $(OUTDIR)/bin/$(1)$(gb_InstallScript_EXT) gb_ResTarget_get_unittest_target = \ $(OUTDIR)/unittest/install/$(LIBO_SHARE_RESOURCE_FOLDER)/$(1).res -gb_UnoApi_get_target = $(OUTDIR)/bin/$(1).rdb +# kind of lame but with just 3 of these why bother with registration etc. +gb_UnoApi_get_target = $(INSTDIR)/$(if $(filter udkapi,$(1)),$(LIBO_URE_SHARE_FOLDER)/misc/types,$(LIBO_ETC_FOLDER)/types/$(1)).rdb # instdir target patterns @@ -307,6 +308,7 @@ $(eval $(call gb_Helper_make_clean_targets,\ UIImageListTarget \ UILocalizeTarget \ UIMenubarTarget \ + UnoApi \ UnoApiHeadersTarget \ UnoApiTarget \ UnpackedTarball \ @@ -329,7 +331,6 @@ $(eval $(call gb_Helper_make_outdir_clean_targets,\ CliNativeLibrary \ CliUnoApi \ InstallScript \ - UnoApi \ )) $(eval $(call gb_Helper_make_dep_targets,\ diff --git a/solenv/gbuild/UnoApi.mk b/solenv/gbuild/UnoApi.mk index 1b6494116f3c..959581539549 100644 --- a/solenv/gbuild/UnoApi.mk +++ b/solenv/gbuild/UnoApi.mk @@ -14,8 +14,9 @@ $(call gb_UnoApi_get_clean_target,%) : $(call gb_Helper_abbreviate_dirs,\ rm -f $(call gb_UnoApi_get_target,$*)) +# call gb_UnoApi_UnoApi,api define gb_UnoApi_UnoApi -$(call gb_UnoApiTarget_UnoApiTarget,$(1),$(2)) +$(call gb_UnoApiTarget_UnoApiTarget,$(1),$(1)) $(call gb_UnoApiHeadersTarget_UnoApiHeadersTarget,$(1)) ifneq ($(gb_UnoApi_ENABLE_INSTALL),) $(call gb_Package_Package_internal,$(1)_idl,$(SRCDIR)) @@ -24,7 +25,7 @@ endif $(call gb_UnoApi_get_target,$(1)) :| $(dir $(call gb_UnoApi_get_target,$(1))).dir $(call gb_UnoApi_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(1)) -$(call gb_UnoApi_get_target,$(1)) : $(call gb_UnoApiHeadersTarget_get_target,$(1)) +$(call gb_UnoApi_get_target,$(1)) :| $(call gb_UnoApiHeadersTarget_get_target,$(1)) $(call gb_UnoApi_get_clean_target,$(1)) : $(call gb_UnoApiTarget_get_clean_target,$(1)) $(call gb_UnoApi_get_clean_target,$(1)) : $(call gb_UnoApiHeadersTarget_get_clean_target,$(1)) @@ -35,14 +36,6 @@ $(call gb_Helper_make_userfriendly_targets,$(1),UnoApi) endef -define gb_UnoApi_install -$(if $(2),,$(call gb_Output_error,gb_UnoApi_install: missing install name.)) -$(call gb_Helper_install,$(call gb_UnoApi_get_target,$(1)), \ - $(INSTROOT)/$(2), \ - $(call gb_UnoApiTarget_get_target,$(1))) - -endef - ifneq ($(gb_UnoApi_ENABLE_INSTALL),) # Create a package of IDL files for putting into SDK. diff --git a/udkapi/UnoApi_udkapi.mk b/udkapi/UnoApi_udkapi.mk index cee6ae4fcef3..2eaee045bfed 100644 --- a/udkapi/UnoApi_udkapi.mk +++ b/udkapi/UnoApi_udkapi.mk @@ -17,9 +17,7 @@ # the License at http://www.apache.org/licenses/LICENSE-2.0 . # -$(eval $(call gb_UnoApi_UnoApi,udkapi,udkapi)) - -$(eval $(call gb_UnoApi_install,udkapi,$(LIBO_URE_SHARE_FOLDER)/misc/types.rdb)) +$(eval $(call gb_UnoApi_UnoApi,udkapi)) $(eval $(call gb_UnoApi_package_idlfiles,udkapi)) diff --git a/unoil/CustomTarget_javamaker.mk b/unoil/CustomTarget_javamaker.mk index 7ec9ec6bfbc1..9c4d07405b8d 100644 --- a/unoil/CustomTarget_javamaker.mk +++ b/unoil/CustomTarget_javamaker.mk @@ -13,13 +13,17 @@ unoil_JAVADIR := $(call gb_CustomTarget_get_workdir,unoil/javamaker) $(call gb_CustomTarget_get_target,unoil/javamaker) : $(unoil_JAVADIR)/done -$(unoil_JAVADIR)/done : $(OUTDIR)/bin/offapi.rdb $(OUTDIR)/bin/udkapi.rdb \ +$(unoil_JAVADIR)/done : \ + $(call gb_UnoApi_get_target,offapi) \ + $(call gb_UnoApi_get_target,udkapi) \ $(call gb_Executable_get_runtime_dependencies,javamaker) \ | $(unoil_JAVADIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1) $(call gb_Helper_abbreviate_dirs, \ rm -r $(unoil_JAVADIR) && \ - $(call gb_Helper_execute,javamaker -O$(unoil_JAVADIR) $(OUTDIR)/bin/offapi.rdb -X$(OUTDIR)/bin/udkapi.rdb) && \ + $(call gb_Helper_execute,javamaker -O$(unoil_JAVADIR) \ + $(call gb_UnoApi_get_target,offapi) \ + -X$(call gb_UnoApi_get_target,udkapi)) && \ touch $@) # vim:set shiftwidth=4 tabstop=4 noexpandtab: |