[mono/mono] [2 commits] 9550e4ce: Fixed an issue in corlib Makefile that would make a resource test case fail which relies on satellite assemblies.
"Marek Safar (
[email protected])" <
[email protected]>
Sat, 2 Nov 2013 08:22:06 +0000
| Newsgroups |
gmane.comp.gnome.mono.patches |
| Message-ID |
<0000014217e7a4eb-9cf8731c-2f65-4f52-ac1b-4bf602b983e8-000000@email.amazonses.com> |
Branch: refs/heads/master
Home: https://github.com/mono/mono
Compare: https://github.com/mono/mono/compare/40d5064d0497...54ecc9c6a18c
Commit: 9550e4ce08a471252a245813cc61f751195281dc
Author: Alexander Köplinger <[email protected]> (akoeplinger)
Date: 2013-11-01 19:08:06 GMT
URL: https://github.com/mono/mono/commit/9550e4ce08a471252a245813cc61f751195281dc
Fixed an issue in corlib Makefile that would make a resource test case fail which relies on satellite assemblies.
The satellite assembly generated by the Makefile was suffixed with '.Resources.dll', but the assembly loader looks for '.resources.dll', thus the satellite assembly wasn't found.
Changed paths:
M mcs/class/corlib/Makefile
Modified: mcs/class/corlib/Makefile
===================================================================
@@ -106,8 +106,8 @@ $(TEST_RESX_RESOURCES) $(TEST_RESX_RESOURCES_SATELITE): %.resources: %.resx
TEST_RESOURCES = $(TEST_RESX_RESOURCES) $(TEST_RESX_RESOURCES_SATELITE)
-satellite_assembly1 = es-ES/$(patsubst %.dll,%.Resources.dll,$(test_lib))
-satellite_assembly2 = nn-NO/$(patsubst %.dll,%.Resources.dll,$(test_lib))
+satellite_assembly1 = es-ES/$(patsubst %.dll,%.resources.dll,$(test_lib))
+satellite_assembly2 = nn-NO/$(patsubst %.dll,%.resources.dll,$(test_lib))
$(test_lib): $(TEST_RESOURCES) $(satellite_assembly1) $(satellite_assembly2)
Commit: 54ecc9c6a18ca300ffdac495b5d3a611c80103fc
Author: Marek Safar <[email protected]> (marek-safar)
Date: 2013-11-02 08:20:02 GMT
URL: https://github.com/mono/mono/commit/54ecc9c6a18ca300ffdac495b5d3a611c80103fc
Merge pull request #798 from akoeplinger/fix-test
Fixed an issue in corlib Makefile
Changed paths:
M mcs/class/corlib/Makefile
Modified: mcs/class/corlib/Makefile
===================================================================
@@ -106,8 +106,8 @@ $(TEST_RESX_RESOURCES) $(TEST_RESX_RESOURCES_SATELITE): %.resources: %.resx
TEST_RESOURCES = $(TEST_RESX_RESOURCES) $(TEST_RESX_RESOURCES_SATELITE)
-satellite_assembly1 = es-ES/$(patsubst %.dll,%.Resources.dll,$(test_lib))
-satellite_assembly2 = nn-NO/$(patsubst %.dll,%.Resources.dll,$(test_lib))
+satellite_assembly1 = es-ES/$(patsubst %.dll,%.resources.dll,$(test_lib))
+satellite_assembly2 = nn-NO/$(patsubst %.dll,%.resources.dll,$(test_lib))
$(test_lib): $(TEST_RESOURCES) $(satellite_assembly1) $(satellite_assembly2)
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches