[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - 3 commits - cli_ure/CliLibrary_cli_uno_bridge.mk cli_ure/CustomTarget_cli_uretypes.mk cli_ure/Module_cli_ure.mk cli_ure/Package_cli_uretypes.mk cli_ure/source cli_ure/version solenv/gbuild
Petr Mladek
pmladek at suse.cz
Mon May 6 08:10:40 PDT 2013
cli_ure/CliLibrary_cli_uno_bridge.mk | 7 +---
cli_ure/CustomTarget_cli_uretypes.mk | 34 +++++++++++++++++++++++
cli_ure/Module_cli_ure.mk | 8 ++++-
cli_ure/Package_cli_uretypes.mk | 18 ++++++++++++
cli_ure/source/mono_bridge/cli_uno_bridge_config | 11 +++++++
cli_ure/version/version.txt | 4 ++
solenv/gbuild/CliAssembly.mk | 4 +-
7 files changed, 78 insertions(+), 8 deletions(-)
New commits:
commit 221f54aa0179f5633e85529d1cb1d0b582e0f73f
Author: Petr Mladek <pmladek at suse.cz>
Date: Mon May 6 17:07:35 2013 +0200
[mono] add config file for cli_uno_bridge
It is not needed at runtime. I tried to reuse the cli_basetypes config file
but it caused a race condition and random build failures.
Change-Id: I83c963a70701006b48510d26f0301607f128fafa
diff --git a/cli_ure/CliLibrary_cli_uno_bridge.mk b/cli_ure/CliLibrary_cli_uno_bridge.mk
index cd4cddd..b3f3c79 100644
--- a/cli_ure/CliLibrary_cli_uno_bridge.mk
+++ b/cli_ure/CliLibrary_cli_uno_bridge.mk
@@ -11,14 +11,11 @@ include $(SRCDIR)/cli_ure/version/version.txt
$(eval $(call gb_CliLibrary_CliLibrary,cli_uno_bridge))
-# FIXME: The original code did not use config file at all; How to do this in gbuild
-$(eval $(call gb_CliLibrary_set_configfile,cli_uno_bridge,cli_ure/source/basetypes/cli_basetypes_config))
+$(eval $(call gb_CliLibrary_set_configfile,cli_uno_bridge,cli_ure/source/mono_bridge/cli_uno_bridge_config))
$(eval $(call gb_CliLibrary_set_keyfile,cli_uno_bridge,$(SRCDIR)/cli_ure/source/cliuno.snk))
-# FIXME: the original code did not use the policy assembly; there is someting similar in cli_ure/source/mono_bridge/assemblyinfo
-# How to do this in gbuild?
-$(eval $(call gb_CliLibrary_set_policy,cli_uno_bridge,$(CLI_BASETYPES_POLICY_ASSEMBLY),$(CLI_BASETYPES_POLICY_VERSION)))
+$(eval $(call gb_CliLibrary_set_policy,cli_uno_bridge,$(CLI_UNO_BRIDGE_POLICY_ASSEMBLY),$(CLI_UNO_BRIDGE_POLICY_VERSION)))
$(eval $(call gb_CliLibrary_add_csfiles,cli_uno_bridge,\
cli_ure/source/mono_bridge/assemblyinfo \
diff --git a/cli_ure/source/mono_bridge/cli_uno_bridge_config b/cli_ure/source/mono_bridge/cli_uno_bridge_config
new file mode 100644
index 0000000..df2b489
--- /dev/null
+++ b/cli_ure/source/mono_bridge/cli_uno_bridge_config
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<configuration>
+ <runtime>
+ <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+ <dependentAssembly>
+ <assemblyIdentity name="cli_uno_bridge" publicKeyToken="ce2cb7e279207b9e"/>
+ <bindingRedirect oldVersion="CLI_UNO_BRIDGE_OLD_VERSION" newVersion="CLI_UNO_BRIDGE_NEW_VERSION" />
+ </dependentAssembly>
+ </assemblyBinding>
+ </runtime>
+</configuration>
\ No newline at end of file
diff --git a/cli_ure/version/version.txt b/cli_ure/version/version.txt
index e24ddc5..b4172c3 100644
--- a/cli_ure/version/version.txt
+++ b/cli_ure/version/version.txt
@@ -36,3 +36,7 @@ CLI_CPPUHELPER_OLD_VERSION=1.0.0.0-1.0.21.0
CLI_CPPUHELPER_POLICY_VERSION=22.0.0.0
CLI_CPPUHELPER_POLICY_ASSEMBLY=policy.1.0.cli_cppuhelper
+CLI_UNO_BRIDGE_NEW_VERSION=1.0.0.0
+CLI_UNO_BRIDGE_OLD_VERSION=0.0.1.0-0.0.9.0
+CLI_UNO_BRIDGE_POLICY_VERSION=1.0.0.0
+CLI_UNO_BRIDGE_POLICY_ASSEMBLY=policy.1.0.cli_uno_bridge
commit e52886becf5f42132727688ceae636ad95d9876d
Author: Petr Mladek <pmladek at suse.cz>
Date: Mon May 6 17:06:29 2013 +0200
[mono] allow to use the prebuilt ure types
Change-Id: If931617e648310aef4ecb41030ec5d17ebcbf3ce
diff --git a/cli_ure/CustomTarget_cli_uretypes.mk b/cli_ure/CustomTarget_cli_uretypes.mk
new file mode 100644
index 0000000..d97327f
--- /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 7d4418f..2f433af 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 0000000..05e6ca9
--- /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:
commit 975bb6acc43de664dc8d9e9197c7e636c6331436
Author: Petr Mladek <pmladek at suse.cz>
Date: Mon May 6 17:04:20 2013 +0200
[mono] build hack with copying assembly config files is needed only with mono
Change-Id: Ie76a802bc890b00f0fa9358aeff65f86e35fd7a0
diff --git a/solenv/gbuild/CliAssembly.mk b/solenv/gbuild/CliAssembly.mk
index 260d70f..bda48db 100644
--- a/solenv/gbuild/CliAssembly.mk
+++ b/solenv/gbuild/CliAssembly.mk
@@ -60,13 +60,13 @@ gb_CliAssemblyTarget_KEYFILE_DEFAULT := $(SRCDIR)/cli_ure/source/cliuno.snk
define gb_CliAssemblyTarget__command
$(call gb_Output_announce,$(2),$(true),AL ,2)
$(call gb_Helper_abbreviate_dirs,\
- $(if $(filter YES,$(ENABLE_MONO_CLIMAKER)),cp $(CLI_ASSEMBLY_CONFIGFILE) $(dir $(CLI_ASSEMBLY_OUTFILE)) && ) \
+ $(if $(filter YES,$(ENABLE_MONO)),cp $(CLI_ASSEMBLY_CONFIGFILE) $(dir $(CLI_ASSEMBLY_OUTFILE)) && ) \
al \
-nologo \
-out:$(CLI_ASSEMBLY_OUTFILE) \
-version:$(CLI_ASSEMBLY_VERSION) \
-keyfile:$(call gb_Helper_windows_path,$(CLI_ASSEMBLY_KEYFILE)) \
- $(if $(filter YES,$(ENABLE_MONO_CLIMAKER)),-link:$(notdir $(CLI_ASSEMBLY_CONFIGFILE)),-link:$(CLI_ASSEMBLY_CONFIGFILE) ) \
+ $(if $(filter YES,$(ENABLE_MONO)),-link:$(notdir $(CLI_ASSEMBLY_CONFIGFILE)),-link:$(CLI_ASSEMBLY_CONFIGFILE) ) \
$(if $(CLI_ASSEMBLY_PLATFORM),-platform:$(CLI_ASSEMBLY_PLATFORM)) && \
touch $(1) \
)
More information about the Libreoffice-commits
mailing list