From e52886becf5f42132727688ceae636ad95d9876d Mon Sep 17 00:00:00 2001 From: Petr Mladek Date: Mon, 6 May 2013 17:06:29 +0200 Subject: [mono] allow to use the prebuilt ure types Change-Id: If931617e648310aef4ecb41030ec5d17ebcbf3ce --- cli_ure/CustomTarget_cli_uretypes.mk | 34 ++++++++++++++++++++++++++++++++++ cli_ure/Module_cli_ure.mk | 8 +++++++- cli_ure/Package_cli_uretypes.mk | 18 ++++++++++++++++++ 3 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 cli_ure/CustomTarget_cli_uretypes.mk create mode 100644 cli_ure/Package_cli_uretypes.mk (limited to 'cli_ure') diff --git a/cli_ure/CustomTarget_cli_uretypes.mk b/cli_ure/CustomTarget_cli_uretypes.mk new file mode 100644 index 000000000000..d97327f526d1 --- /dev/null +++ b/cli_ure/CustomTarget_cli_uretypes.mk @@ -0,0 +1,34 @@ +# -*- 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/. +# + +include $(SRCDIR)/cli_ure/version/version.txt + +$(eval $(call gb_CustomTarget_CustomTarget,cli_ure/unotypes)) + +cli_uretypes_CLIDIR := $(call gb_CustomTarget_get_workdir,cli_ure/unotypes) + +$(call gb_CustomTarget_get_target,cli_ure/unotypes) : \ + $(cli_uretypes_CLIDIR)/cli_uretypes.dll \ + $(cli_uretypes_CLIDIR)/cli_uretypes.config \ + $(cli_uretypes_CLIDIR)/$(CLI_URETYPES_POLICY_ASSEMBLY).dll + + +$(cli_uretypes_CLIDIR)/cli_uretypes.dll : $(OUTDIR)/inc/external/cli/cli_uretypes.dll + mkdir -p $(@D) + $(GNUCOPY) $? $@ + +$(cli_uretypes_CLIDIR)/cli_uretypes.config : $(OUTDIR)/inc/external/cli/cli_uretypes.config + mkdir -p $(@D) + $(GNUCOPY) $? $@ + +$(cli_uretypes_CLIDIR)/$(CLI_URETYPES_POLICY_ASSEMBLY).dll : $(OUTDIR)/inc/external/cli/$(CLI_URETYPES_POLICY_ASSEMBLY).dll + mkdir -p $(@D) + $(GNUCOPY) $< $@ + +# vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/cli_ure/Module_cli_ure.mk b/cli_ure/Module_cli_ure.mk index 7d4418f26f66..2f433af7738b 100644 --- a/cli_ure/Module_cli_ure.mk +++ b/cli_ure/Module_cli_ure.mk @@ -18,7 +18,6 @@ ifeq ($(BUILD_CLI),YES) $(eval $(call gb_Module_add_targets,cli_ure,\ CliLibrary_cli_basetypes \ CliLibrary_cli_ure \ - CliUnoApi_cli_uretypes \ CustomTarget_cli_ure_assemblies \ Package_config \ )) @@ -28,6 +27,7 @@ ifeq ($(COM),MSC) # Original implementation for Windows $(eval $(call gb_Module_add_targets,cli_ure,\ CliNativeLibrary_cli_cppuhelper \ + CliUnoApi_cli_uretypes \ Executable_climaker \ Library_cli_cppuhelper_native \ Library_cli_uno \ @@ -47,9 +47,15 @@ $(eval $(call gb_Module_add_targets,cli_ure,\ ifeq ($(ENABLE_MONO_CLIMAKER),YES) $(eval $(call gb_Module_add_targets,cli_ure,\ + CliUnoApi_cli_uretypes \ Executable_climaker_mono \ Library_climaker \ )) +else +$(eval $(call gb_Module_add_targets,cli_ure,\ + CustomTarget_cli_uretypes \ + Package_cli_uretypes \ +)) endif endif diff --git a/cli_ure/Package_cli_uretypes.mk b/cli_ure/Package_cli_uretypes.mk new file mode 100644 index 000000000000..05e6ca92819a --- /dev/null +++ b/cli_ure/Package_cli_uretypes.mk @@ -0,0 +1,18 @@ +# -*- 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/. +# + +include $(SRCDIR)/cli_ure/version/version.txt + +$(eval $(call gb_Package_Package,cli_ure_unotypes,$(WORKDIR)/CustomTarget/cli_ure/unotypes)) + +$(eval $(call gb_Package_add_file,cli_ure_unotypes,bin/cli_uretypes.config,cli_uretypes.config)) +$(eval $(call gb_Package_add_file,cli_ure_unotypes,bin/cli_uretypes.dll,cli_uretypes.dll)) +$(eval $(call gb_Package_add_file,cli_ure_unotypes,bin/$(CLI_URETYPES_POLICY_ASSEMBLY).dll,$(CLI_URETYPES_POLICY_ASSEMBLY).dll)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: -- cgit