summaryrefslogtreecommitdiffstats
path: root/solenv
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-09-18 13:38:21 +0200
committerStephan Bergmann <sbergman@redhat.com>2013-09-18 14:44:10 +0200
commit8001d9f4fed8f32410128b180d881d1131317255 (patch)
tree69bf3c4656432fcf6b1139892dd99feb7dc7024e /solenv
parentNew unoidl-check tool to replace regcompare (diff)
downloadcore-8001d9f4fed8f32410128b180d881d1131317255.tar.gz
core-8001d9f4fed8f32410128b180d881d1131317255.zip
Replace binary type_references with human-readable .idl versions
...obtained from the old .rdb files via "unoidl-read --published". This removes the need for update-rdb.sh. Change-Id: I73c0d026af7e27370602f83c61dfa76fc4d17a83
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gbuild/UnoApi.mk5
-rw-r--r--solenv/gbuild/UnoApiTarget.mk8
2 files changed, 2 insertions, 11 deletions
diff --git a/solenv/gbuild/UnoApi.mk b/solenv/gbuild/UnoApi.mk
index 4ebeb854713c..7325c35cc013 100644
--- a/solenv/gbuild/UnoApi.mk
+++ b/solenv/gbuild/UnoApi.mk
@@ -148,11 +148,6 @@ $(foreach rdb,$(2),$(call gb_UnoApi__use_api,$(1),$(rdb)))
endef
-define gb_UnoApi_add_reference_rdbfile
-$$(call gb_Output_error,gb_UnoApi_add_reference_rdbfile: use gb_UnoApi_set_reference_rdbfile instead.)
-
-endef
-
define gb_UnoApi_set_reference_rdbfile
$(call gb_UnoApiTarget_set_reference_rdbfile,$(1),$(2))
diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index b1c3e08ea033..7fef39244deb 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -216,13 +216,9 @@ $(call gb_UnoApiTarget__add_idlfile,$(1),$(2),$(3))
endef
-define gb_UnoApiTarget_add_reference_rdbfile
-$$(call gb_Output_error,gb_UnoApiTarget_add_reference_rdbfile: use gb_UnoApiTarget_set_reference_rdbfile instead.)
-endef
-
define gb_UnoApiTarget_set_reference_rdbfile
-$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_REFERENCE := $(foreach rdb,$(2),$(SRCDIR)/$(rdb).rdb)
-$(call gb_UnoApiTarget_get_target,$(1)) : $(foreach rdb,$(2),$(SRCDIR)/$(rdb).rdb)
+$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_REFERENCE := $(2)
+$(call gb_UnoApiTarget_get_target,$(1)) : $(2)
$(call gb_UnoApiTarget_get_target,$(1)) : $(gb_UnoApiTarget_UNOIDLCHECKDEPS)
endef