mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Get rid of UnoApiMerge_uretypes, which is just a duplicate of UnoApi_udkapi

Browse Source 
What is a little confusing is that the udkapi.rdb ends up as types.rdb in the
installation set (in the URE's sub-tree).  So all places that reference it
during the build do so as "udkapi" while all places that reference it in an
installation set do so as "types."

Change-Id: I35d0695966b3bd703f5494b636b9782efc0d3fcb
This commit is contained in:
Stephan Bergmann
2013-04-24 10:42:40 +02:00
parent 294ad90704
commit ab149c7e3f
9 changed files with 16 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
RepositoryExternal.mk
View File

@@ -2810,7 +2810,7 @@ $(call gb_Executable_add_runtime_dependencies,climaker,\
$(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \
$(call gb_Package_get_target_for_build,cppuhelper_unorc) \
$(call gb_Rdb_get_outdir_target_for_build,ure/services) \
$(call gb_UnoApiMerge_get_target_for_build,ure/types) \
$(call gb_UnoApi_get_target_for_build,udkapi) \
)
endef
@@ -2838,7 +2838,7 @@ $(call gb_Executable_add_runtime_dependencies,localize,\
)
endef
# The dependencies on ure/services.rdb and ure/types.rdb are implicitly required
# The dependencies on ure/services.rdb and udkapi.rdb are implicitly required
# due to the settings for URE_SERVICES and URE_TYPES in cppuhelper/source/unorc:
# FIXME: the library target should be for build too
define gb_Executable__register_saxparser
@@ -2847,11 +2847,11 @@ $(call gb_Executable_add_runtime_dependencies,saxparser,\
$(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \
$(call gb_Package_get_target_for_build,cppuhelper_unorc) \
$(call gb_Rdb_get_outdir_target_for_build,ure/services) \
$(call gb_UnoApiMerge_get_target_for_build,ure/types) \
$(call gb_UnoApi_get_target_for_build,udkapi) \
)
endef
# NOTE: the dependencies on ure/services.rdb and ure/types.rdb are implicitly
# NOTE: the dependencies on ure/services.rdb and udkapi.rdb are implicitly
# required due to the settings for URE_SERVICES and URE_TYPES in
# cppuhelper/source/unorc
# FIXME: the library target should be for build too
@@ -2860,7 +2860,7 @@ $(call gb_Executable_add_runtime_dependencies,uno,\
$(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \
$(call gb_Package_get_target_for_build,cppuhelper_unorc) \
$(call gb_Rdb_get_outdir_target_for_build,ure/services) \
$(call gb_UnoApiMerge_get_target_for_build,ure/types) \
$(call gb_UnoApi_get_target_for_build,udkapi) \
)
endef

2
cppuhelper/source/unorc
View File

@@ -19,4 +19,4 @@
[Bootstrap]
URE_INTERNAL_LIB_DIR=${ORIGIN}
UNO_SERVICES=${ORIGIN}/../xml/ure/services.rdb ${URE_MORE_SERVICES}
UNO_TYPES=${ORIGIN}/../bin/ure/types.rdb ${URE_MORE_TYPES}
UNO_TYPES=${ORIGIN}/../bin/udkapi.rdb ${URE_MORE_TYPES}

5
scp2/source/ooo/ure.scp
View File

@@ -603,8 +603,9 @@ End
File gid_File_Misc_TypesRdb
TXT_FILE_BODY;
Dir = gid_Dir_Ure_Misc;
Name = "/ure/types.rdb";
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
Name = "udkapi.rdb";
InstallName = "types.rdb";
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID, SUBST_FILENAME);
// CompID = "E5086F6A-855B-4CAE-AD3A-A85A21C5AE44";
End

2
solenv/bin/linkoo
View File

@@ -515,7 +515,7 @@ sub link_rdb_files()
do_link ($src_prefix . "xml" , $dest_prefix . $brand_program_dir . "/services", "services.rdb", "services.rdb");
do_link ($src_prefix . "xml/ure" , $dest_prefix . "ure/share/misc", "services.rdb", "services.rdb");
do_link ($src_prefix . "bin/ure" , $dest_prefix . "ure/share/misc", "types.rdb", "types.rdb");
do_link ($src_prefix . "bin" , $dest_prefix . "ure/share/misc", "udkapi.rdb", "types.rdb");
print "\n";
}

2
testtools/CustomTarget_uno_test.mk
View File

@@ -34,7 +34,7 @@ $(call gb_CustomTarget_get_target,testtools/uno_test) : \
$(call gb_InternalUnoApi_get_target,bridgetest) \
$(call gb_Rdb_get_outdir_target,uno_services) \
$(call gb_Rdb_get_outdir_target,ure/services) \
$(call gb_UnoApi_get_target,ure/types)
$(call gb_UnoApi_get_target,udkapi)
$(call gb_Helper_abbreviate_dirs,\
$(call gb_Executable_get_command,uno) \
-s com.sun.star.test.bridge.BridgeTest \

4
touch/CustomTarget_touch_javamaker.mk
View File

@@ -12,11 +12,11 @@ touch_javamaker_DIR := $(call gb_CustomTarget_get_workdir,touch)
$(call gb_CustomTarget_get_target,touch/touch_javamaker) : $(touch_javamaker_DIR)/done
$(touch_javamaker_DIR)/done : $(call gb_UnoApiTarget_get_target,touch) $(OUTDIR)/bin/types.rdb \
$(touch_javamaker_DIR)/done : $(call gb_UnoApiTarget_get_target,touch) $(call gb_UnoApiTarget_get_target,udkapi) \
$(call gb_Executable_get_runtime_dependencies,javamaker) | $(touch_javamaker_DIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1)
$(call gb_Helper_abbreviate_dirs, \
rm -r $(touch_javamaker_DIR) && \
$(call gb_Helper_execute,javamaker -nD -O$(touch_javamaker_DIR)/class -X$(OUTDIR)/bin/types.rdb $<) && touch $@)
$(call gb_Helper_execute,javamaker -nD -O$(touch_javamaker_DIR)/class -X$(call gb_UnoApiTarget_get_target,udkapi) $<) && touch $@)
# vim: set noet sw=4 ts=4:

1
udkapi/Module_udkapi.mk
View File

@@ -31,7 +31,6 @@ $(eval $(call gb_Module_Module,udkapi))
$(eval $(call gb_Module_add_targets,udkapi,\
UnoApi_udkapi \
UnoApiMerge_uretypes \
))
# vim: set noet sw=4 ts=4:

3
udkapi/README
View File

@@ -2,5 +2,8 @@ Low level UNO stuff API IDL files
i.e. those that are part of the standalone URE.
During the build the resulting .rdb file is known as udkapi.rdb. In the
installation set, it is known as types.rdb (in the URE's sub-tree).
See also:
[[offapi]]

35
udkapi/UnoApiMerge_uretypes.mk
View File

@@ -1,35 +0,0 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License version 3
# only, as published by the Free Software Foundation.
#
# OpenOffice.org is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Lesser General Public License version 3 for more details
# (a copy is included in the LICENSE file that accompanied this code).
#
# You should have received a copy of the GNU Lesser General Public License
# version 3 along with OpenOffice.org. If not, see
# <http://www.openoffice.org/license.html>
# for a copy of the LGPLv3 License.
#
#*************************************************************************
$(eval $(call gb_UnoApiMerge_UnoApiMerge,ure/types))
$(eval $(call gb_UnoApiMerge_use_api,ure/types,\
udkapi \
))
# vim: set noet sw=4 ts=4: