diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-09-18 11:49:54 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-09-18 14:44:10 +0200 |
| commit | cbea5d30b99b93b2118f5c1a081740e5880f18c1 (patch) | |
| tree | e1e15213585fff6edeb814c8d42456e02696db45 /solenv | |
| parent | 53d7f614d59a31fdaa8a31b1181e469de3e517af (diff) | |
New unoidl-check tool to replace regcompare
...for checking compatibility with the reference rdbs. unoidl-check is no
longer based on the legacy registry format, but can process all the various new
UNOIDL registry formats. regcompare is still included in the SDK for now.
(gb_UnoApi[Target]_set_reference_rdbfile now takes a non-empty sequence of rdb
files, any necessary dependencies of the final rdf file preceding it just like
it is required on the unoidl-check command line. Also, executing the
unoidl-check now properly depends on those rdb files.)
TODO: unoidl-check is too conservative for now and flags some changes as
incompatible that are not.
Change-Id: I92e4c69403c5e3fcb31707c98c65a2f509592dd4
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/LinkTarget.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/UnoApiTarget.mk | 15 | ||||
| -rw-r--r-- | solenv/gbuild/extensions/pre_BuildTools.mk | 3 |
3 files changed, 10 insertions, 10 deletions
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index b7150f0db44b..dc213bdeb7cd 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -850,10 +850,10 @@ gb_BUILD_HELPER_LIBS := basegfx \ gb_BUILD_HELPER_TOOLS := cppumaker \ idlc \ - regcompare \ regmerge \ rsc \ svidl \ + unoidl-check \ unoidl-write \ define gb_LinkTarget__is_build_lib diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk index 92b812c15dd2..b1c3e08ea033 100644 --- a/solenv/gbuild/UnoApiTarget.mk +++ b/solenv/gbuild/UnoApiTarget.mk @@ -78,8 +78,8 @@ endif # UnoApiTarget -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_UNOIDLCHECKDEPS := $(call gb_Executable_get_runtime_dependencies,unoidl-check) +gb_UnoApiTarget_UNOIDLCHECKCOMMAND := SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(call gb_Executable_get_command,unoidl-check) 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) @@ -103,10 +103,8 @@ rm -f $(1) && \ $(call gb_UnoApiTarget__command_impl,$(1),$(UNOAPI_ROOT),$(UNOAPI_FILES),$(UNOAPI_DEPRDBS)) \ $(if $(UNOAPI_REFERENCE), \ $(call gb_Output_announce,$(2),$(true),DBc,3) \ - && $(gb_UnoApiTarget_REGCOMPARECOMMAND) \ - -f -t \ - -r1 $(UNOAPI_REFERENCE) \ - -r2 $(1).oldformat) + && $(gb_UnoApiTarget_UNOIDLCHECKCOMMAND) $(UNOAPI_REFERENCE) -- \ + $(foreach rdb,$(4),$(call gb_UnoApiTarget_get_target,$(rdb))) $(1)) endef define gb_UnoApiTarget__check_mode @@ -223,8 +221,9 @@ $$(call gb_Output_error,gb_UnoApiTarget_add_reference_rdbfile: use gb_UnoApiTarg endef define gb_UnoApiTarget_set_reference_rdbfile -$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_REFERENCE := $(SRCDIR)/$(strip $(2)).rdb -$(call gb_UnoApiTarget_get_target,$(1)) : $(gb_UnoApiTarget_REGCOMPAREDEPS) +$(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)) : $(gb_UnoApiTarget_UNOIDLCHECKDEPS) endef diff --git a/solenv/gbuild/extensions/pre_BuildTools.mk b/solenv/gbuild/extensions/pre_BuildTools.mk index 76d94d83ff59..2e0c208d4a9b 100644 --- a/solenv/gbuild/extensions/pre_BuildTools.mk +++ b/solenv/gbuild/extensions/pre_BuildTools.mk @@ -24,7 +24,6 @@ gb_BUILD_TOOLS = \ javamaker \ makedepend \ propex \ - regcompare \ regmerge \ regview \ rsc \ @@ -35,6 +34,8 @@ gb_BUILD_TOOLS = \ treex \ uiex \ ulfex \ + unoidl-check \ + unoidl-write \ xrmex \ $(call gb_Helper_optional_for_host,DESKTOP, \ gengal \ |