diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-09-16 16:48:09 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-09-16 16:48:09 +0200 |
| commit | fc54915c461dc753866627bd52ea60b12b71a012 (patch) | |
| tree | 8f71995fb5420ae1c32e8669e3fd249c82728f8e /solenv | |
| parent | 95e566b9a0df06d130e118181058273f034bcf2c (diff) | |
Replace reg2unoidl with unoidl-write
...that can also generate an .rdb containing a specific set of entities,
intended to replace idlc (when reading directly from .idl source registries).
Change-Id: I630ce4640828979d7952dc24dbbef80a42a8140a
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/LinkTarget.mk | 4 | ||||
| -rw-r--r-- | solenv/gbuild/UnoApiTarget.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 44fc886ef0bd..b7150f0db44b 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -850,11 +850,11 @@ gb_BUILD_HELPER_LIBS := basegfx \ gb_BUILD_HELPER_TOOLS := cppumaker \ idlc \ - reg2unoidl \ regcompare \ regmerge \ rsc \ - svidl + svidl \ + unoidl-write \ define gb_LinkTarget__is_build_lib $(if $(filter $(1),$(foreach lib,$(gb_BUILD_HELPER_LIBS),$(call gb_Library_get_linktargetname,$(lib)))),$(true),$(false)) diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk index 97ec26411e14..92b812c15dd2 100644 --- a/solenv/gbuild/UnoApiTarget.mk +++ b/solenv/gbuild/UnoApiTarget.mk @@ -80,7 +80,7 @@ endif gb_UnoApiTarget_REGCOMPAREDEPS := $(call gb_Executable_get_runtime_dependencies,regcompare) gb_UnoApiTarget_REGCOMPARECOMMAND := SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(call gb_Executable_get_command,regcompare) -gb_UnoApiTarget_REGMERGEDEPS := $(call gb_Executable_get_runtime_dependencies,regmerge) $(call gb_Executable_get_runtime_dependencies,reg2unoidl) +gb_UnoApiTarget_REGMERGEDEPS := $(call gb_Executable_get_runtime_dependencies,regmerge) $(call gb_Executable_get_runtime_dependencies,unoidl-write) gb_UnoApiTarget_REGMERGECOMMAND := SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(call gb_Executable_get_command,regmerge) gb_UnoApiTarget_TYPESRDB := $(call gb_UnoApiTarget_get_target,types) @@ -90,7 +90,7 @@ RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,$(1).oldformat $(2) $(3)) $(gb_UnoApiTarget_REGMERGECOMMAND) @$${RESPONSEFILE} && \ rm -f $${RESPONSEFILE} && \ SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin \ - $(call gb_Executable_get_command,reg2unoidl) \ + $(call gb_Executable_get_command,unoidl-write) \ $(foreach rdb,$(4),$(call gb_UnoApiTarget_get_target,$(rdb))) \ $(1).oldformat $(1) endef |