Skip to content

Commit 5398f24

Browse files
radekdoulikradekdoulik
committed
Bump to cecil/172c907c (#101)
Use cecil repo instead of nuget package. The reason to use the Cecil repo is to be quicker when fixing Cecil bugs (usually hit from the XA linker). Added "proxy" projects for `Xamarin.Android.Cecil` and `Xamarin.Android.Cecil.Mdb` libraries. We use these names because they match the currently used "Vendorized" Cecil which is distributed with commercial Xamarin.Android. Updated all the projects to use the `Xamarin.Android.Cecil` library instead of `Mono.Cecil` nuget package.
1 parent 71cd5ae commit 5398f24

25 files changed

+210
-106
lines changed

‎.gitmodules‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,6 @@
22
path = lib/mono.linq.expressions
33
url = https://github.com/jonpryor/mono.linq.expressions.git
44
branch = master
5+
[submodule "external/cecil"]
6+
path = external/cecil
7+
url = https://github.com/mono/cecil.git

‎Java.Interop.sln‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,11 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Java.Interop.Tools.TypeName
9191
EndProject
9292
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "jcw-gen", "tools\jcw-gen\jcw-gen.csproj", "{52C7D9B6-E8C8-47D0-9471-652D278D7D77}"
9393
EndProject
94-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Java.Interop.Tools.JavaCallableWrappers-Tests.csproj", "src\Java.Interop.Tools.JavaCallableWrappers\Test\Java.Interop.Tools.JavaCallableWrappers-Tests.csproj", "{58B564A1-570D-4DA2-B02D-25BDDB1A9F4F}"
94+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Java.Interop.Tools.JavaCallableWrappers-Tests", "src\Java.Interop.Tools.JavaCallableWrappers\Test\Java.Interop.Tools.JavaCallableWrappers-Tests.csproj", "{58B564A1-570D-4DA2-B02D-25BDDB1A9F4F}"
95+
EndProject
96+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Android.Cecil", "src\Xamarin.Android.Cecil\Xamarin.Android.Cecil.csproj", "{15945D4B-FF56-4BCC-B598-2718D199DD08}"
97+
EndProject
98+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Android.Cecil.Mdb", "src\Xamarin.Android.Cecil\Xamarin.Android.Cecil.Mdb.csproj", "{C0487169-8F81-497F-919E-EB42B1D0243F}"
9599
EndProject
96100
Global
97101
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -315,6 +319,22 @@ Global
315319
{58B564A1-570D-4DA2-B02D-25BDDB1A9F4F}.XAIntegrationDebug|Any CPU.Build.0 = Debug|Any CPU
316320
{58B564A1-570D-4DA2-B02D-25BDDB1A9F4F}.XAIntegrationRelease|Any CPU.ActiveCfg = Release|Any CPU
317321
{58B564A1-570D-4DA2-B02D-25BDDB1A9F4F}.XAIntegrationRelease|Any CPU.Build.0 = Release|Any CPU
322+
{15945D4B-FF56-4BCC-B598-2718D199DD08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
323+
{15945D4B-FF56-4BCC-B598-2718D199DD08}.Debug|Any CPU.Build.0 = Debug|Any CPU
324+
{15945D4B-FF56-4BCC-B598-2718D199DD08}.Release|Any CPU.ActiveCfg = Release|Any CPU
325+
{15945D4B-FF56-4BCC-B598-2718D199DD08}.Release|Any CPU.Build.0 = Release|Any CPU
326+
{15945D4B-FF56-4BCC-B598-2718D199DD08}.XAIntegrationDebug|Any CPU.ActiveCfg = Debug|Any CPU
327+
{15945D4B-FF56-4BCC-B598-2718D199DD08}.XAIntegrationDebug|Any CPU.Build.0 = Debug|Any CPU
328+
{15945D4B-FF56-4BCC-B598-2718D199DD08}.XAIntegrationRelease|Any CPU.ActiveCfg = Release|Any CPU
329+
{15945D4B-FF56-4BCC-B598-2718D199DD08}.XAIntegrationRelease|Any CPU.Build.0 = Release|Any CPU
330+
{C0487169-8F81-497F-919E-EB42B1D0243F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
331+
{C0487169-8F81-497F-919E-EB42B1D0243F}.Debug|Any CPU.Build.0 = Debug|Any CPU
332+
{C0487169-8F81-497F-919E-EB42B1D0243F}.Release|Any CPU.ActiveCfg = Release|Any CPU
333+
{C0487169-8F81-497F-919E-EB42B1D0243F}.Release|Any CPU.Build.0 = Release|Any CPU
334+
{C0487169-8F81-497F-919E-EB42B1D0243F}.XAIntegrationDebug|Any CPU.ActiveCfg = Debug|Any CPU
335+
{C0487169-8F81-497F-919E-EB42B1D0243F}.XAIntegrationDebug|Any CPU.Build.0 = Debug|Any CPU
336+
{C0487169-8F81-497F-919E-EB42B1D0243F}.XAIntegrationRelease|Any CPU.ActiveCfg = Release|Any CPU
337+
{C0487169-8F81-497F-919E-EB42B1D0243F}.XAIntegrationRelease|Any CPU.Build.0 = Release|Any CPU
318338
EndGlobalSection
319339
GlobalSection(NestedProjects) = preSolution
320340
{0C001D50-4176-45AE-BDC8-BA626508B0CC} = {C8F58966-94BF-407F-914A-8654F8B8AE3B}
@@ -355,5 +375,7 @@ Global
355375
{E706B6F2-5562-4765-8F07-8CF84A797B30} = {0998E45F-8BCE-4791-A944-962CD54E2D80}
356376
{52C7D9B6-E8C8-47D0-9471-652D278D7D77} = {C8F58966-94BF-407F-914A-8654F8B8AE3B}
357377
{58B564A1-570D-4DA2-B02D-25BDDB1A9F4F} = {271C9F30-F679-4793-942B-0D9527CB3E2F}
378+
{15945D4B-FF56-4BCC-B598-2718D199DD08} = {C8F58966-94BF-407F-914A-8654F8B8AE3B}
379+
{C0487169-8F81-497F-919E-EB42B1D0243F} = {C8F58966-94BF-407F-914A-8654F8B8AE3B}
358380
EndGlobalSection
359381
EndGlobal

‎Makefile‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,11 @@ xa-all: $(PACKAGES) $(XA_INTEGRATION_OUTPUTS)
5151

5252
run-all-tests: run-tests run-test-jnimarshal run-test-generator-core run-ptests
5353

54+
prepare:: prepare-external
55+
56+
prepare-external: $(PACKAGES) $(NUNIT_CONSOLE)
57+
git submodule update --init --recursive
58+
5459
clean:
5560
-$(XBUILD) /t:Clean
5661
-rm -Rf bin/$(CONFIGURATION) bin/Build$(CONFIGURATION) bin/Test$(CONFIGURATION) bin/XAIntegration$(CONFIGURATION)

‎external/cecil‎

Submodule cecil added at 172c907

‎src/Java.Interop.Tools.Cecil/Java.Interop.Tools.Cecil.csproj‎

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,6 @@
3030
</PropertyGroup>
3131
<ItemGroup>
3232
<Reference Include="System" />
33-
<Reference Include="Mono.Cecil">
34-
<HintPath>$(MSBuildThisFileDirectory)\..\..\packages\Mono.Cecil.0.10.0-beta1-v2\lib\net40\Mono.Cecil.dll</HintPath>
35-
</Reference>
36-
<Reference Include="Mono.Cecil.Mdb">
37-
<HintPath>$(MSBuildThisFileDirectory)\..\..\packages\Mono.Cecil.0.10.0-beta1-v2\lib\net40\Mono.Cecil.Mdb.dll</HintPath>
38-
</Reference>
39-
<Reference Include="Mono.Cecil.Pdb">
40-
<HintPath>$(MSBuildThisFileDirectory)\..\..\packages\Mono.Cecil.0.10.0-beta1-v2\lib\net40\Mono.Cecil.Pdb.dll</HintPath>
41-
</Reference>
42-
<Reference Include="Mono.Cecil.Rocks">
43-
<HintPath>$(MSBuildThisFileDirectory)\..\..\packages\Mono.Cecil.0.10.0-beta1-v2\lib\net40\Mono.Cecil.Rocks.dll</HintPath>
44-
</Reference>
4533
</ItemGroup>
4634
<ItemGroup>
4735
<Compile Include="Properties\AssemblyInfo.cs" />
@@ -55,9 +43,10 @@
5543
<Project>{64CC4E44-CE3A-4319-BF3F-6CF8BD513870}</Project>
5644
<Name>Java.Interop.Tools.Diagnostics</Name>
5745
</ProjectReference>
58-
</ItemGroup>
59-
<ItemGroup>
60-
<None Include="packages.config" />
46+
<ProjectReference Include="..\Xamarin.Android.Cecil\Xamarin.Android.Cecil.csproj">
47+
<Project>{15945D4B-FF56-4BCC-B598-2718D199DD08}</Project>
48+
<Name>Xamarin.Android.Cecil</Name>
49+
</ProjectReference>
6150
</ItemGroup>
6251
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
6352
</Project>

‎src/Java.Interop.Tools.Cecil/packages.config‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎src/Java.Interop.Tools.Diagnostics/Java.Interop.Tools.Diagnostics.csproj‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,26 +30,17 @@
3030
</PropertyGroup>
3131
<ItemGroup>
3232
<Reference Include="System" />
33-
<Reference Include="Mono.Cecil">
34-
<HintPath>..\..\packages\Mono.Cecil.0.10.0-beta1-v2\lib\net40\Mono.Cecil.dll</HintPath>
35-
</Reference>
36-
<Reference Include="Mono.Cecil.Mdb">
37-
<HintPath>..\..\packages\Mono.Cecil.0.10.0-beta1-v2\lib\net40\Mono.Cecil.Mdb.dll</HintPath>
38-
</Reference>
39-
<Reference Include="Mono.Cecil.Pdb">
40-
<HintPath>..\..\packages\Mono.Cecil.0.10.0-beta1-v2\lib\net40\Mono.Cecil.Pdb.dll</HintPath>
41-
</Reference>
42-
<Reference Include="Mono.Cecil.Rocks">
43-
<HintPath>..\..\packages\Mono.Cecil.0.10.0-beta1-v2\lib\net40\Mono.Cecil.Rocks.dll</HintPath>
44-
</Reference>
4533
</ItemGroup>
4634
<ItemGroup>
4735
<Compile Include="Properties\AssemblyInfo.cs" />
4836
<Compile Include="Java.Interop.Tools.Diagnostics\Diagnostic.cs" />
4937
<Compile Include="Java.Interop.Tools.Diagnostics\XamarinAndroidException.cs" />
5038
</ItemGroup>
5139
<ItemGroup>
52-
<None Include="packages.config" />
40+
<ProjectReference Include="..\Xamarin.Android.Cecil\Xamarin.Android.Cecil.csproj">
41+
<Project>{15945D4B-FF56-4BCC-B598-2718D199DD08}</Project>
42+
<Name>Xamarin.Android.Cecil</Name>
43+
</ProjectReference>
5344
</ItemGroup>
5445
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
5546
</Project>

‎src/Java.Interop.Tools.Diagnostics/packages.config‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers.csproj‎

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,6 @@
3131
</PropertyGroup>
3232
<ItemGroup>
3333
<Reference Include="System" />
34-
<Reference Include="Mono.Cecil">
35-
<HintPath>..\..\packages\Mono.Cecil.0.10.0-beta1-v2\lib\net40\Mono.Cecil.dll</HintPath>
36-
</Reference>
37-
<Reference Include="Mono.Cecil.Mdb">
38-
<HintPath>..\..\packages\Mono.Cecil.0.10.0-beta1-v2\lib\net40\Mono.Cecil.Mdb.dll</HintPath>
39-
</Reference>
40-
<Reference Include="Mono.Cecil.Pdb">
41-
<HintPath>..\..\packages\Mono.Cecil.0.10.0-beta1-v2\lib\net40\Mono.Cecil.Pdb.dll</HintPath>
42-
</Reference>
43-
<Reference Include="Mono.Cecil.Rocks">
44-
<HintPath>..\..\packages\Mono.Cecil.0.10.0-beta1-v2\lib\net40\Mono.Cecil.Rocks.dll</HintPath>
45-
</Reference>
4634
</ItemGroup>
4735
<ItemGroup>
4836
<Compile Include="Properties\AssemblyInfo.cs" />
@@ -61,6 +49,10 @@
6149
<Project>{D48EE8D0-0A0A-4493-AEF5-DAF5F8CF86AD}</Project>
6250
<Name>Java.Interop.Tools.Cecil</Name>
6351
</ProjectReference>
52+
<ProjectReference Include="..\Xamarin.Android.Cecil\Xamarin.Android.Cecil.csproj">
53+
<Project>{15945D4B-FF56-4BCC-B598-2718D199DD08}</Project>
54+
<Name>Xamarin.Android.Cecil</Name>
55+
</ProjectReference>
6456
</ItemGroup>
6557
<ItemGroup>
6658
<EmbeddedResource Include="Resources\MonoRuntimeProvider.Bundled.java">
@@ -70,8 +62,5 @@
7062
<LogicalName>MonoRuntimeProvider.Shared.java</LogicalName>
7163
</EmbeddedResource>
7264
</ItemGroup>
73-
<ItemGroup>
74-
<None Include="packages.config" />
75-
</ItemGroup>
7665
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
7766
</Project>

‎src/Java.Interop.Tools.JavaCallableWrappers/Test/Java.Interop.Tools.JavaCallableWrappers-Tests.csproj‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,6 @@
3434
<Reference Include="nunit.framework">
3535
<HintPath>..\..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
3636
</Reference>
37-
<Reference Include="Mono.Cecil">
38-
<HintPath>..\..\..\packages\Mono.Cecil.0.10.0-beta1-v2\lib\net40\Mono.Cecil.dll</HintPath>
39-
</Reference>
40-
<Reference Include="Mono.Cecil.Mdb">
41-
<HintPath>..\..\..\packages\Mono.Cecil.0.10.0-beta1-v2\lib\net40\Mono.Cecil.Mdb.dll</HintPath>
42-
</Reference>
43-
<Reference Include="Mono.Cecil.Pdb">
44-
<HintPath>..\..\..\packages\Mono.Cecil.0.10.0-beta1-v2\lib\net40\Mono.Cecil.Pdb.dll</HintPath>
45-
</Reference>
46-
<Reference Include="Mono.Cecil.Rocks">
47-
<HintPath>..\..\..\packages\Mono.Cecil.0.10.0-beta1-v2\lib\net40\Mono.Cecil.Rocks.dll</HintPath>
48-
</Reference>
4937
</ItemGroup>
5038
<ItemGroup>
5139
<Compile Include="Java.Interop.Tools.JavaCallableWrappers\JavaCallableWrapperGeneratorTests.cs" />
@@ -68,6 +56,10 @@
6856
<Project>{64CC4E44-CE3A-4319-BF3F-6CF8BD513870}</Project>
6957
<Name>Java.Interop.Tools.Diagnostics</Name>
7058
</ProjectReference>
59+
<ProjectReference Include="..\..\Xamarin.Android.Cecil\Xamarin.Android.Cecil.csproj">
60+
<Project>{15945D4B-FF56-4BCC-B598-2718D199DD08}</Project>
61+
<Name>Xamarin.Android.Cecil</Name>
62+
</ProjectReference>
7163
</ItemGroup>
7264
<ItemGroup>
7365
<Folder Include="Java.Interop.Tools.JavaCallableWrappers\" />

0 commit comments

Comments
 (0)