diff options
| author | David Tardon <dtardon@redhat.com> | 2013-04-01 14:06:50 +0200 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-04-05 23:35:45 +0000 |
| commit | 3e8016ddc576dafaa93505d5673c8013f3ed2d09 (patch) | |
| tree | 6ed10962afdf5d43c3d0a00892299414cf138896 /solenv/gbuild/UnoApi.mk | |
| parent | a593069ff9f64dd94e8210b0cff03b65fe059b40 (diff) | |
use filelist install method for udkapi and offapi
... so we can drop ZipUnoApi again.
Change-Id: Id5925b8c101cd7cb70614a9a26f328dec92db8fa
Reviewed-on: https://gerrit.libreoffice.org/3152
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'solenv/gbuild/UnoApi.mk')
| -rw-r--r-- | solenv/gbuild/UnoApi.mk | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/solenv/gbuild/UnoApi.mk b/solenv/gbuild/UnoApi.mk index 43b7b77b0af8..a7a6a1563f6d 100644 --- a/solenv/gbuild/UnoApi.mk +++ b/solenv/gbuild/UnoApi.mk @@ -33,6 +33,8 @@ $(call gb_UnoApi_get_clean_target,%) : define gb_UnoApi_UnoApi $(call gb_UnoApiTarget_UnoApiTarget,$(1)) $(call gb_UnoApiHeadersTarget_UnoApiHeadersTarget,$(1)) +$(call gb_Package_Package_internal,$(1)_idl,$(SRCDIR)) +$(call gb_Package_set_outdir,$(1)_idl,$(INSTDIR)) $(call gb_Package_Package_internal,$(1)_inc,$(call gb_UnoApiHeadersTarget_get_dir,$(1))) $(call gb_UnoApiTarget_set_root,$(1),UCR) @@ -44,6 +46,7 @@ $(call gb_UnoApi_get_clean_target,$(1)) : $(call gb_UnoApiTarget_get_clean_targe $(call gb_UnoApi_get_clean_target,$(1)) : $(call gb_UnoApiHeadersTarget_get_clean_target,$(1)) $(call gb_UnoApi_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(1)_inc) +$(call gb_UnoApiTarget_get_headers_target,$(1)) : $(call gb_Package_get_target,$(1)_idl) $(call gb_Package_get_preparation_target,$(1)_inc) : $(call gb_UnoApiHeadersTarget_get_target,$(1)) $(call gb_Deliver_add_deliverable,$(call gb_UnoApi_get_target,$(1)),$(call gb_UnoApiTarget_get_target,$(1)),$(1)) @@ -53,6 +56,20 @@ $(call gb_Helper_make_userfriendly_targets,$(1),UnoApi) endef +# Create a package of IDL files for putting into SDK. +# +# gb_UnoApi_package_idlfiles api +define gb_UnoApi_package_idlfiles +$(call gb_UnoApi_get_target,$(1)) : $(call gb_Package_get_target,$(1)_idl) +$(call gb_UnoApi_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(1)_idl) + +endef + +define gb_UnoApi__add_idlfile +$(call gb_Package_add_file,$(1)_idl,$(patsubst $(1)/%,$(gb_Package_SDKDIRNAME)/idl/%,$(2)),$(2)) + +endef + define gb_UnoApi__add_headerfile_impl $(call gb_Package_add_file,$(1)_inc,inc/$(2),$(3)) $(call gb_UnoApiHeadersTarget_add_headerfile,$(1),$(2),$(3)) @@ -66,7 +83,13 @@ $(call gb_UnoApi__add_headerfile_impl,$(1),$(2),$(subst $() $(),/,$(wordlist 2,$ endef +define gb_UnoApi__add_idlfile_noheader +$(call gb_UnoApi__add_idlfile,$(1),$(2).idl) + +endef + define gb_UnoApi__add_idlfile_nohdl +$(call gb_UnoApi__add_idlfile_noheader,$(1),$(2)) $(call gb_UnoApi__add_headerfile,$(1),$(2).hpp) endef @@ -106,11 +129,13 @@ endef # for old-style services and modules define gb_UnoApi_add_idlfile_noheader $(call gb_UnoApiTarget_add_idlfile,$(1),$(2),$(3)) +$(call gb_UnoApi__add_idlfile_noheader,$(1),$(2)/$(3)) endef define gb_UnoApi_add_idlfiles_noheader $(call gb_UnoApiTarget_add_idlfiles,$(1),$(2),$(3)) +$(foreach idl,$(3),$(call gb_UnoApi__add_idlfile_noheader,$(1),$(2)/$(idl))) endef |