cli_ure/source/native/msvc.map | 24 ---------------------- cli_ure/source/uno_bridge/bridge_exports.map | 26 ------------------------ cli_ure/source/uno_bridge/cli_bridge.cxx | 4 +-- officecfg/Configuration_officecfg.mk | 12 +++++------ reportbuilder/Configuration_reportbuilder.mk | 2 - solenv/gbuild/Configuration.mk | 2 - solenv/gbuild/CppunitTest.mk | 2 - writerfilter/CppunitTest_writerfilter_rtftok.mk | 4 +++ 8 files changed, 15 insertions(+), 61 deletions(-)
New commits: commit 45dc98fb6f9510ccef5f1f906a2b42ee27b07f0b Author: David Tardon <[email protected]> Date: Tue Aug 7 07:49:15 2012 +0200 fix configuration deps Change-Id: Ie431fadb4f11284e231112744af80bfb5c219d94 diff --git a/reportbuilder/Configuration_reportbuilder.mk b/reportbuilder/Configuration_reportbuilder.mk index 1e6b30e..4690cfc 100644 --- a/reportbuilder/Configuration_reportbuilder.mk +++ b/reportbuilder/Configuration_reportbuilder.mk @@ -27,7 +27,7 @@ $(eval $(call gb_Configuration_Configuration,sun-report-builder,nodeliver)) -$(eval $(call gb_Configuration_use_configuration,sun-report-builder,officecfg)) +$(eval $(call gb_Configuration_use_configuration,sun-report-builder,registry)) $(eval $(call gb_Configuration_add_schemas,sun-report-builder,reportbuilder/registry/schema,\ org/openoffice/Office/ReportDesign.xcs \ diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk index 9efe084..a27d820 100644 --- a/solenv/gbuild/Configuration.mk +++ b/solenv/gbuild/Configuration.mk @@ -505,7 +505,7 @@ endef # # Example: # # foo needs schemas from the main configuration -# $(eval $(call gb_Configuration_use_configuration,foo,officecfg)) +# $(eval $(call gb_Configuration_use_configuration,foo,registry)) define gb_Configuration_use_configuration $(call gb_Configuration_get_preparation_target,$(1)) : $(call gb_Configuration_get_target,$(2)) $(call gb_Configuration_get_target,$(1)) : SCHEMA_ROOT := $(gb_Configuration_registry)/schema diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index ab33bd9..e1fe68d 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -289,7 +289,7 @@ endef # Use standard configuration. define gb_CppunitTest_use_configuration -$(call gb_CppunitTest_get_target,$(1)) : $(call gb_Configuration_get_target,officecfg) +$(call gb_CppunitTest_get_target,$(1)) : $(call gb_Configuration_get_target,registry) $(call gb_CppunitTest__use_configuration,$(1),xcsxcu,$(gb_Configuration_registry)) endef commit ae5cfba4d52c7dfbe5b6a071b05263e4cad9d1d4 Author: David Tardon <[email protected]> Date: Tue Aug 7 07:47:50 2012 +0200 let's do this the other way around... This reverts commit 587ac17d51ded650ed72bb68a126587a9c2ca698. diff --git a/officecfg/Configuration_officecfg.mk b/officecfg/Configuration_officecfg.mk index 4ae5d5a..682a3e2 100644 --- a/officecfg/Configuration_officecfg.mk +++ b/officecfg/Configuration_officecfg.mk @@ -16,9 +16,9 @@ # the License at http://www.apache.org/licenses/LICENSE-2.0 . # -$(eval $(call gb_Configuration_Configuration,officecfg)) +$(eval $(call gb_Configuration_Configuration,registry)) -$(eval $(call gb_Configuration_add_schemas,officecfg,officecfg/registry/schema,\ +$(eval $(call gb_Configuration_add_schemas,registry,officecfg/registry/schema,\ org/openoffice/LDAP.xcs \ org/openoffice/Inet.xcs \ org/openoffice/Setup.xcs \ @@ -119,7 +119,7 @@ $(eval $(call gb_Configuration_add_schemas,officecfg,officecfg/registry/schema,\ org/openoffice/ucb/Store.xcs \ )) -$(eval $(call gb_Configuration_add_datas,officecfg,officecfg/registry/data,\ +$(eval $(call gb_Configuration_add_datas,registry,officecfg/registry/data,\ org/openoffice/Inet.xcu \ org/openoffice/System.xcu \ org/openoffice/UserProfile.xcu \ @@ -149,7 +149,7 @@ $(eval $(call gb_Configuration_add_datas,officecfg,officecfg/registry/data,\ org/openoffice/ucb/Configuration.xcu \ )) -$(eval $(call gb_Configuration_add_spool_modules,officecfg,officecfg/registry/data,\ +$(eval $(call gb_Configuration_add_spool_modules,registry,officecfg/registry/data,\ org/openoffice/Inet-macosx.xcu \ org/openoffice/Inet-unixdesktop.xcu \ org/openoffice/Inet-wnt.xcu \ @@ -210,11 +210,11 @@ $(eval $(call gb_Configuration_add_spool_modules,officecfg,officecfg/registry/da )) # perhaps this file should be moved 2 levels up? -$(eval $(call gb_Configuration_add_spool_langpack,officecfg,officecfg/registry/data/org/openoffice,\ +$(eval $(call gb_Configuration_add_spool_langpack,registry,officecfg/registry/data/org/openoffice,\ Langpack.xcu \ )) -$(eval $(call gb_Configuration_add_localized_datas,officecfg,officecfg/registry/data,\ +$(eval $(call gb_Configuration_add_localized_datas,registry,officecfg/registry/data,\ org/openoffice/Setup.xcu \ org/openoffice/Office/Accelerators.xcu \ org/openoffice/Office/Common.xcu \ diff --git a/writerfilter/CppunitTest_writerfilter_rtftok.mk b/writerfilter/CppunitTest_writerfilter_rtftok.mk index 79d13e7..9b660d3 100644 --- a/writerfilter/CppunitTest_writerfilter_rtftok.mk +++ b/writerfilter/CppunitTest_writerfilter_rtftok.mk @@ -64,4 +64,8 @@ $(eval $(call gb_CppunitTest_use_components,writerfilter_rtftok,\ $(eval $(call gb_CppunitTest_use_configuration,writerfilter_rtftok)) +# we need to explicitly depend on library writerfilter because it is not implied +# by a link relation +$(call gb_CppunitTest_get_target,writerfilter_rtftok) : $(call gb_Library_get_target,writerfilter) + # vim: set noet sw=4 ts=4: commit 215ecab21a4c0e1f55294ba0971f55b0e0e30e07 Author: David Tardon <[email protected]> Date: Tue Aug 7 06:39:57 2012 +0200 remove obsolete .map files Change-Id: I629d17ff4baeffbb1af327424f50e7dae3e0d376 diff --git a/cli_ure/source/native/msvc.map b/cli_ure/source/native/msvc.map deleted file mode 100644 index fd44446..0000000 --- a/cli_ure/source/native/msvc.map +++ /dev/null @@ -1,24 +0,0 @@ -# -# 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/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -UDK_3_0_0 { - global: - - local: - *; -}; diff --git a/cli_ure/source/uno_bridge/bridge_exports.map b/cli_ure/source/uno_bridge/bridge_exports.map deleted file mode 100644 index becb6d4..0000000 --- a/cli_ure/source/uno_bridge/bridge_exports.map +++ /dev/null @@ -1,26 +0,0 @@ -# -# 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/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -UDK_3_0_0 { - global: - component_canUnload; - uno_initEnvironment; - uno_ext_getMapping; - local: - *; -}; commit c6f8f5f26c9a0fcfd9500c38e40bd5a6e3afbed3 Author: David Tardon <[email protected]> Date: Tue Aug 7 06:37:25 2012 +0200 export uno_initEnvironment and uno_ext_getMapping Change-Id: Ic907b7dbf4cee22ac899e413bc5122e3a09e6b1a diff --git a/cli_ure/source/uno_bridge/cli_bridge.cxx b/cli_ure/source/uno_bridge/cli_bridge.cxx index 298b381..aed48df 100644 --- a/cli_ure/source/uno_bridge/cli_bridge.cxx +++ b/cli_ure/source/uno_bridge/cli_bridge.cxx @@ -265,7 +265,7 @@ void SAL_CALL cli_env_disposing( uno_Environment * uno_cli_env ) } //################################################################################################## -void SAL_CALL uno_initEnvironment( uno_Environment * uno_cli_env ) +SAL_DLLPUBLIC_EXPORT void SAL_CALL uno_initEnvironment( uno_Environment * uno_cli_env ) SAL_THROW_EXTERN_C() { //ToDo: remove when compiled with .NET 2 @@ -291,7 +291,7 @@ void SAL_CALL uno_initEnvironment( uno_Environment * uno_cli_env ) CliEnvHolder::g_cli_env = new Cli_environment(); } //################################################################################################## -void SAL_CALL uno_ext_getMapping( +SAL_DLLPUBLIC_EXPORT void SAL_CALL uno_ext_getMapping( uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo ) SAL_THROW_EXTERN_C() { _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
