mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gbuild: refactor UnoApi to remove rdb files from OUTDIR

Browse Source 
- gb_UnoApi_get_target returns the files in INSTDIR
- stop using rdb files from OUTDIR
- remove gb_UnoApi_install
- remove pointless 2nd parameter of gb_UnoApi_UnoApi
- order-only dependency from gb_UnoApi_get_target to
  gb_UnoApiHeadersTarget_get_target because INSTDIR .rdb is always outdated

Change-Id: Id418f75e9b38d6fe135b55eca2594c2624bc41cc
This commit is contained in:
Michael Stahl
2013-10-25 16:45:41 +02:00
parent 7d97ec9a3e
commit 5b29d3a7fd
9 changed files with 21 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
jurt/CustomTarget_test_urp.mk
View File

@@ -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:

4
offapi/UnoApi_offapi.mk
View File

@@ -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))

4
oovbaapi/UnoApi_oovbaapi.mk
View File

@@ -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 \

2
ridljar/CustomTarget_javamaker.mk
View File

@@ -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)

5
scp2/source/ooo/ure.scp
View File

@@ -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

5
solenv/gbuild/TargetLocations.mk
View File

@@ -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,\

13
solenv/gbuild/UnoApi.mk
View File

@@ -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.

4
udkapi/UnoApi_udkapi.mk
View File

@@ -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))

8
unoil/CustomTarget_javamaker.mk
View File

@@ -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: