diff options
| author | Petr Mladek <pmladek@suse.cz> | 2013-05-06 17:07:35 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2013-05-06 17:09:50 +0200 |
| commit | 221f54aa0179f5633e85529d1cb1d0b582e0f73f (patch) | |
| tree | 054f84f281bd92fbf4522620b66a199d63cf02f8 /cli_ure | |
| parent | e52886becf5f42132727688ceae636ad95d9876d (diff) | |
[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
Diffstat (limited to 'cli_ure')
| -rw-r--r-- | cli_ure/CliLibrary_cli_uno_bridge.mk | 7 | ||||
| -rw-r--r-- | cli_ure/source/mono_bridge/cli_uno_bridge_config | 11 | ||||
| -rw-r--r-- | cli_ure/version/version.txt | 4 |
3 files changed, 17 insertions, 5 deletions
diff --git a/cli_ure/CliLibrary_cli_uno_bridge.mk b/cli_ure/CliLibrary_cli_uno_bridge.mk index cd4cddd2039c..b3f3c790ab0c 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 000000000000..df2b48971e82 --- /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 e24ddc511fe9..b4172c327c05 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 |