Kaydet (Commit) 221f54aa authored tarafından Petr Mladek's avatar Petr Mladek

[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
üst e52886be
...@@ -11,14 +11,11 @@ include $(SRCDIR)/cli_ure/version/version.txt ...@@ -11,14 +11,11 @@ include $(SRCDIR)/cli_ure/version/version.txt
$(eval $(call gb_CliLibrary_CliLibrary,cli_uno_bridge)) $(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/mono_bridge/cli_uno_bridge_config))
$(eval $(call gb_CliLibrary_set_configfile,cli_uno_bridge,cli_ure/source/basetypes/cli_basetypes_config))
$(eval $(call gb_CliLibrary_set_keyfile,cli_uno_bridge,$(SRCDIR)/cli_ure/source/cliuno.snk)) $(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 $(eval $(call gb_CliLibrary_set_policy,cli_uno_bridge,$(CLI_UNO_BRIDGE_POLICY_ASSEMBLY),$(CLI_UNO_BRIDGE_POLICY_VERSION)))
# 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_add_csfiles,cli_uno_bridge,\ $(eval $(call gb_CliLibrary_add_csfiles,cli_uno_bridge,\
cli_ure/source/mono_bridge/assemblyinfo \ cli_ure/source/mono_bridge/assemblyinfo \
......
<?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
...@@ -36,3 +36,7 @@ CLI_CPPUHELPER_OLD_VERSION=1.0.0.0-1.0.21.0 ...@@ -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_VERSION=22.0.0.0
CLI_CPPUHELPER_POLICY_ASSEMBLY=policy.1.0.cli_cppuhelper 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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment