[Libreoffice-commits] .: 3 commits - connectivity/source solenv/gbuild stoc/InternalUnoApi_bootstrap.mk stoc/Library_bootstrap.mk stoc/Module_stoc.mk
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Oct 5 01:11:37 PDT 2012
connectivity/source/drivers/ado/AStatement.cxx | 2
solenv/gbuild/InternalUnoApi.mk | 5 -
solenv/gbuild/UnoApiTarget.mk | 46 ++---------
stoc/InternalUnoApi_bootstrap.mk | 99 -------------------------
stoc/Library_bootstrap.mk | 2
stoc/Module_stoc.mk | 1
6 files changed, 14 insertions(+), 141 deletions(-)
New commits:
commit fbd30b2a09e7e92ad83db669d81199d7f3a4a8a1
Author: David Tardon <dtardon at redhat.com>
Date: Thu Oct 4 13:47:13 2012 +0200
re-add accidentally dropped modeline
Change-Id: Ie59b0bab6bec6957f13a3931b6be46985e3db2c4
diff --git a/connectivity/source/drivers/ado/AStatement.cxx b/connectivity/source/drivers/ado/AStatement.cxx
index b76bf81..6e97e8e 100644
--- a/connectivity/source/drivers/ado/AStatement.cxx
+++ b/connectivity/source/drivers/ado/AStatement.cxx
@@ -815,3 +815,5 @@ void SAL_CALL OStatement::release() throw()
{
return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 3a282cc97cb846efd065983aa17f9b1875fbef66
Author: David Tardon <dtardon at redhat.com>
Date: Thu Oct 4 10:58:14 2012 +0200
drop rdbmaker support from UnoApiTarget
Change-Id: I02ca44cc33d1d8e1ebc9f158f859c9218d2ed832
diff --git a/solenv/gbuild/InternalUnoApi.mk b/solenv/gbuild/InternalUnoApi.mk
index f80fe01..587e624 100644
--- a/solenv/gbuild/InternalUnoApi.mk
+++ b/solenv/gbuild/InternalUnoApi.mk
@@ -117,11 +117,6 @@ $(foreach dep,$(3),$(call gb_InternalUnoApi_define_api_dependency,$(1),$(2),$(de
endef
-define gb_InternalUnoApi_set_types
-$(call gb_UnoApiTarget_set_types,$(1)_out,$(2))
-
-endef
-
define gb_InternalUnoApi_set_include
$(call gb_UnoApiTarget_set_include,$(1)_out,$(2))
diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index b8c219e..a5d69fe 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -82,8 +82,6 @@ endif
# UnoApiTarget
-gb_UnoApiTarget_RDBMAKERTARGET := $(call gb_Executable_get_target_for_build,rdbmaker)
-gb_UnoApiTarget_RDBMAKERCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_RDBMAKERTARGET)
gb_UnoApiTarget_REGCOMPARETARGET := $(call gb_Executable_get_target_for_build,regcompare)
gb_UnoApiTarget_REGCOMPARECOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_REGCOMPARETARGET)
gb_UnoApiTarget_REGMERGETARGET := $(call gb_Executable_get_target_for_build,regmerge)
@@ -92,30 +90,17 @@ gb_UnoApiTarget_REGMERGECOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR
gb_UnoApiTarget_TYPESRDB := $(call gb_UnoApiTarget_get_target,types)
define gb_UnoApiTarget__command_impl
-RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,$(2)) && \
-$(1) @$${RESPONSEFILE} && \
+RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,$(1) $(2) $(3)) && \
+$(gb_UnoApiTarget_REGMERGECOMMAND) @$${RESPONSEFILE} && \
rm -f $${RESPONSEFILE}
endef
-define gb_UnoApiTarget__regmerge_command_impl
-$(call gb_UnoApiTarget__command_impl,$(gb_UnoApiTarget_REGMERGECOMMAND),$(1) $(2) $(3))
-endef
-
-define gb_UnoApiTarget__rdbmaker_command_impl
-$(call gb_UnoApiTarget__command_impl,$(gb_UnoApiTarget_RDBMAKERCOMMAND),-O$(1) -B$(2) -b$(3) $(4) $(5))
-endef
-
define gb_UnoApiTarget__command
-$(call gb_Output_announce,$*,$(true),UNO,4)
+$(call gb_Output_announce,$(2),$(true),UNO,4)
mkdir -p $(dir $(1)) && \
-$(if $(UNOAPI_FILES),\
- $(call gb_UnoApiTarget__regmerge_command_impl,$(1),$(UNOAPI_ROOT),$(UNOAPI_FILES)),\
- $(if $(UNOAPI_MERGE),\
- $(call gb_UnoApiTarget__regmerge_command_impl,$(1),$(UNOAPI_ROOT),$(UNOAPI_MERGE)),\
- $(call gb_UnoApiTarget__rdbmaker_command_impl,$(1),UCR,$(UNOAPI_ROOT),\
- $(addprefix -T,$(UNOAPI_TYPES)),$(gb_UnoApiTarget_TYPESRDB)))) \
+$(call gb_UnoApiTarget__command_impl,$(1),$(UNOAPI_ROOT),$(if $(UNOAPI_FILES),$(UNOAPI_FILES),$(UNOAPI_MERGE))) \
$(if $(UNOAPI_REFERENCE), \
- $(call gb_Output_announce,$*,$(true),DBc,3) \
+ $(call gb_Output_announce,$(2),$(true),DBc,3) \
&& $(gb_UnoApiTarget_REGCOMPARECOMMAND) \
-f -t \
-r1 $(UNOAPI_REFERENCE) \
@@ -123,11 +108,11 @@ $(if $(UNOAPI_REFERENCE), \
endef
define gb_UnoApiTarget__check_mode
-$(if $(or $(and $(1),$(2),$(3)),$(and $(1),$(2)),$(and $(2),$(3)),$(and $(1),$(3))),\
- $(error More than one mode of function of UnoApiTarget used: this is not supported),\
- $(if $(or $(1),$(2),$(3)),,\
- $(error Neither IDL files nor merged RDBs nor type list were used: nothing will be produced)))
-$(if $(4),,$(error No root has been set for the rdb file))
+$(if $(and $(UNOAPI_FILES),$(UNOAPI_MERGE)),\
+ $(error Both IDL files and merged RDBs were used: this is not supported))
+$(if $(or $(UNOAPI_FILES),$(UNOAPI_MERGE)),,\
+ $(error Neither IDL files nor merged RDBs were used: nothing will be produced))
+$(if $(UNOAPI_ROOT),,$(error No root has been set for the rdb file))
endef
$(call gb_UnoApiTarget_get_external_headers_target,%) :
@@ -137,7 +122,7 @@ $(call gb_UnoApiTarget_get_headers_target,%) : $(call gb_UnoApiTarget_get_extern
mkdir -p $(dir $@) && touch $@
$(call gb_UnoApiTarget_get_target,%) :
- $(call gb_UnoApiTarget__check_mode,$(UNOAPI_FILES),$(UNOAPI_MERGE),$(UNOAPI_TYPES),$(UNOAPI_ROOT))
+ $(call gb_UnoApiTarget__check_mode)
$(call gb_UnoApiTarget__command,$@,$*)
.PHONY : $(call gb_UnoApiTarget_get_clean_target,%)
@@ -174,7 +159,6 @@ define gb_UnoApiTarget_UnoApiTarget
$(call gb_UnoApiTarget_get_target,$(1)) : INCLUDE :=
$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_FILES :=
$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_MERGE :=
-$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_TYPES :=
$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_REFERENCE :=
$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_ROOT :=
@@ -247,14 +231,6 @@ $(call gb_UnoApiTarget_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(2)
endef
-# Set XML component dependencies description.
-define gb_UnoApiTarget_set_types
-$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_TYPES := $(2)
-$(call gb_UnoApiTarget_get_target,$(1)) : $(gb_UnoApiTarget_TYPESRDB)
-$(call gb_UnoApiTarget_get_target,$(1)) : $(gb_UnoApiTarget_RDBMAKERTARGET)
-
-endef
-
define gb_UnoApiTarget_add_reference_rdbfile
$$(call gb_Output_error,gb_UnoApiTarget_add_reference_rdbfile: use gb_UnoApiTarget_set_reference_rdbfile instead.)
endef
commit 6f4a8f93c8944628d6d56b21d9a9c4b360884d1d
Author: David Tardon <dtardon at redhat.com>
Date: Thu Oct 4 10:37:52 2012 +0200
directly use udkapi
Change-Id: I44c3b830a61ef1f65833732b5bc66c061ed27c21
diff --git a/stoc/InternalUnoApi_bootstrap.mk b/stoc/InternalUnoApi_bootstrap.mk
deleted file mode 100644
index cd56224..0000000
--- a/stoc/InternalUnoApi_bootstrap.mk
+++ /dev/null
@@ -1,99 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon at redhat.com>
-# (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_InternalUnoApi_InternalUnoApi,bootstrap))
-
-$(eval $(call gb_InternalUnoApi_set_types,bootstrap, \
- com.sun.star.beans.PropertyAttribute \
- com.sun.star.beans.XPropertySet \
- com.sun.star.connection.SocketPermission \
- com.sun.star.container.NoSuchElementException \
- com.sun.star.container.XContentEnumerationAccess \
- com.sun.star.container.XEnumeration \
- com.sun.star.container.XEnumerationAccess \
- com.sun.star.container.XHierarchicalNameAccess \
- com.sun.star.container.XSet \
- com.sun.star.io.FilePermission \
- com.sun.star.lang.DisposedException \
- com.sun.star.lang.IllegalArgumentException \
- com.sun.star.lang.XComponent \
- com.sun.star.lang.XEventListener \
- com.sun.star.lang.XInitialization \
- com.sun.star.lang.XMultiComponentFactory \
- com.sun.star.lang.XMultiServiceFactory \
- com.sun.star.lang.XServiceInfo \
- com.sun.star.lang.XSingleComponentFactory \
- com.sun.star.lang.XSingleServiceFactory \
- com.sun.star.lang.XTypeProvider \
- com.sun.star.lang.XUnoTunnel \
- com.sun.star.loader.XImplementationLoader \
- com.sun.star.reflection.XArrayTypeDescription \
- com.sun.star.reflection.XCompoundTypeDescription \
- com.sun.star.reflection.XConstantsTypeDescription \
- com.sun.star.reflection.XConstantTypeDescription \
- com.sun.star.reflection.XEnumTypeDescription \
- com.sun.star.reflection.XIndirectTypeDescription \
- com.sun.star.reflection.XInterfaceAttributeTypeDescription \
- com.sun.star.reflection.XInterfaceAttributeTypeDescription2 \
- com.sun.star.reflection.XInterfaceMemberTypeDescription \
- com.sun.star.reflection.XInterfaceMethodTypeDescription \
- com.sun.star.reflection.XInterfaceTypeDescription \
- com.sun.star.reflection.XInterfaceTypeDescription2 \
- com.sun.star.reflection.XMethodParameter \
- com.sun.star.reflection.XModuleTypeDescription \
- com.sun.star.reflection.XParameter \
- com.sun.star.reflection.XPropertyTypeDescription \
- com.sun.star.reflection.XPublished \
- com.sun.star.reflection.XServiceConstructorDescription \
- com.sun.star.reflection.XServiceTypeDescription \
- com.sun.star.reflection.XServiceTypeDescription2 \
- com.sun.star.reflection.XSingletonTypeDescription \
- com.sun.star.reflection.XSingletonTypeDescription2 \
- com.sun.star.reflection.XStructTypeDescription \
- com.sun.star.reflection.XTypeDescription \
- com.sun.star.reflection.XTypeDescriptionEnumerationAccess \
- com.sun.star.reflection.XUnionTypeDescription \
- com.sun.star.registry.XImplementationRegistration2 \
- com.sun.star.registry.XRegistryKey \
- com.sun.star.registry.XSimpleRegistry \
- com.sun.star.security.AllPermission \
- com.sun.star.security.RuntimePermission \
- com.sun.star.security.XAccessController \
- com.sun.star.security.XPolicy \
- com.sun.star.uno.DeploymentException \
- com.sun.star.uno.RuntimeException \
- com.sun.star.uno.TypeClass \
- com.sun.star.uno.XAggregation \
- com.sun.star.uno.XComponentContext \
- com.sun.star.uno.XCurrentContext \
- com.sun.star.uno.XInterface \
- com.sun.star.uno.XUnloadingPreference \
- com.sun.star.uno.XWeak \
- com.sun.star.util.XMacroExpander \
-))
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/stoc/Library_bootstrap.mk b/stoc/Library_bootstrap.mk
index a757611..b9d0f18 100644
--- a/stoc/Library_bootstrap.mk
+++ b/stoc/Library_bootstrap.mk
@@ -43,7 +43,7 @@ $(eval $(call gb_Library_set_include,bootstrap,\
))
$(eval $(call gb_Library_use_internal_bootstrap_api,bootstrap,\
- bootstrap \
+ udkapi \
))
$(eval $(call gb_Library_use_libraries,bootstrap,\
diff --git a/stoc/Module_stoc.mk b/stoc/Module_stoc.mk
index a6d3181..1d3e7a6 100644
--- a/stoc/Module_stoc.mk
+++ b/stoc/Module_stoc.mk
@@ -28,7 +28,6 @@
$(eval $(call gb_Module_Module,stoc))
$(eval $(call gb_Module_add_targets,stoc,\
- InternalUnoApi_bootstrap \
Library_bootstrap \
Library_introspection \
Library_invocadapt \
More information about the Libreoffice-commits
mailing list