Kaydet (Commit) 532b47a6 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

[ABI CHANGE] In SDK, replace regcompare with unoidl-check

...as the latter was the more flexible replacement for the former for LO-
internal use already.  The only gotcha to watch out for is that unoidl-check
cannot be used to check "naked" .urd files, but only ones where the content has
been moved to /UCR via regmerge.

Leave registry/CustomTarget_regcompare_test.mk around to verify that
unoidl-check behaves the same as did regcompare on those old-format .urd/.rdb
files.

Change-Id: Ic13ede48535bf942126c810d88bac7e4081d984e
üst 2f901039
......@@ -58,7 +58,6 @@ $(eval $(call gb_Helper_register_executables,NONE, \
treex \
uiex \
ulfex \
unoidl-check \
unoidl-read \
unoidl-write \
xrmex \
......@@ -82,9 +81,9 @@ $(eval $(call gb_Helper_register_executables_for_install,SDK,sdk, \
cppumaker \
idlc \
javamaker \
regcompare \
$(if $(filter UCPP,$(BUILD_TYPE)),ucpp) \
$(if $(filter ODK,$(BUILD_TYPE)),unoapploader) \
unoidl-check \
$(if $(filter ODK,$(BUILD_TYPE)),uno-skeletonmaker) \
))
......
......@@ -28,7 +28,7 @@ odk_PLATFORM := $(if $(filter WNT,$(OS)),\
$(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
$(SRCDIR)/odk/util/check.pl \
$(if $(DOXYGEN),$(call gb_GeneratedPackage_get_target,odk_doxygen)) \
$(foreach exe,$(if $(filter WNT,$(OS)),climaker) cppumaker idlc javamaker regcompare $(if $(SYSTEM_UCPP),,ucpp) uno-skeletonmaker unoapploader,\
$(foreach exe,$(if $(filter WNT,$(OS)),climaker) cppumaker idlc javamaker $(if $(SYSTEM_UCPP),,ucpp) uno-skeletonmaker unoapploader unoidl-check,\
$(call gb_Executable_get_target,$(exe))) \
$(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_cli)) \
$(call gb_Package_get_target,odk_config) \
......
......@@ -46,7 +46,7 @@ if (-d "$SdkDir") {
print "check binaries: ";
if (check_dir("bin")) {
my @binarylist = ( "idlc","cppumaker","javamaker",
"regcompare",
"unoidl-check",
"unoapploader", "uno-skeletonmaker" );
if ($ENV{SYSTEM_UCPP} eq "") {
push @binarylist,"ucpp";
......
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
$(eval $(call gb_Executable_Executable,regcompare))
$(eval $(call gb_Executable_use_libraries,regcompare,\
sal \
salhelper \
reg \
))
$(eval $(call gb_Executable_use_static_libraries,regcompare,\
registry_helper \
))
$(eval $(call gb_Executable_add_exception_objects,regcompare,\
registry/tools/regcompare \
))
# vim:set noet sw=4 ts=4:
......@@ -18,11 +18,7 @@ $(eval $(call gb_Module_add_targets,registry,\
) \
))
ifneq (,$(filter ODK,$(BUILD_TYPE)))
$(eval $(call gb_Module_add_targets,registry,\
Executable_regcompare \
))
ifneq ($(OS),IOS) # missing regmerge (see above), needed within test
$(eval $(call gb_Module_add_check_targets,registry, \
CustomTarget_regcompare_test \
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment