Skip to content

Commit daddcdf

Browse files
jonpryoratsushieno
jonpryor
authored and
atsushieno
committed
[Xamarin.Android.Build.Tasks] Ensure class-parse is built first (#66)
Proper execution of Xamarin.Android.Build.Tasks requires that `$prefix/lib/mandroid/class-parse.exe` exist. Unfortunately, nothing *created* that file, which means a default build didn't work. :-( Bump to Java.Interop/b6431ac8, which adds support for `Java.Interop/Configuration.Override.props`, update the `make prepare` target to create `external/Java.Interop/Configuration.Override.props`, and add Java.Interop's `class-parse` and `logcat-parse` to `Xamarin.Android.sln`. This causes `class-parse` to (1) be built, and (2) place its output into `bin/$(Configuration)/lib/mandroid`, as required by `Xamarin.Android.Build.Tasks.dll`.
1 parent 9a50c66 commit daddcdf

File tree

5 files changed

+58
-16
lines changed

5 files changed

+58
-16
lines changed

‎Configuration.Java.Interop.Override.props‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<UtilityOutputFullPath>$(MSBuildThisFileDirectory)bin\$(Configuration)\lib\mandroid\</UtilityOutputFullPath>
5+
</PropertyGroup>
6+
</Project>

‎Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ prepare:
2424
git submodule update --init --recursive
2525
nuget restore
2626
(cd external/Java.Interop && nuget restore)
27+
cp Configuration.Java.Interop.Override.props external/Java.Interop/Configuration.Override.props
2728

2829

2930
run-all-tests: run-nunit-tests run-apk-tests

‎Xamarin.Android.sln‎

Lines changed: 45 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,16 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Android.Build.Tests
6363
EndProject
6464
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Android-Tests", "src\Mono.Android\Test\Mono.Android-Tests.csproj", "{40EAD437-216B-4DF4-8258-3F47E1672C3A}"
6565
EndProject
66-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Posix", "src\Mono.Posix\Mono.Posix.csproj", "{83F00D30-0AC6-40D8-834B-DD39B6CAA8B3}"
67-
EndProject
6866
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.EnterpriseServices", "src\System.EnterpriseServices\System.EnterpriseServices.csproj", "{2868FC32-A4E7-4008-87C8-2C7879CACB58}"
6967
EndProject
7068
Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "unix-distribution-setup", "build-tools\unix-distribution-setup\unix-distribution-setup.mdproj", "{2CF172E5-BDAE-4ABA-8BC8-08040ED3E77A}"
7169
EndProject
70+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Posix", "src\Mono.Posix\Mono.Posix.csproj", "{1A4B041A-842F-40B3-A50D-49E01D30BD18}"
71+
EndProject
72+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "class-parse", "external\Java.Interop\tools\class-parse\class-parse.csproj", "{38C762AB-8FD1-44DE-9855-26AAE7129DC3}"
73+
EndProject
74+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "logcat-parse", "external\Java.Interop\tools\logcat-parse\logcat-parse.csproj", "{7387E151-48E3-4885-B2CA-A74434A34045}"
75+
EndProject
7276
Global
7377
GlobalSection(SolutionConfigurationPlatforms) = preSolution
7478
Debug|AnyCPU = Debug|AnyCPU
@@ -258,18 +262,6 @@ Global
258262
{40EAD437-216B-4DF4-8258-3F47E1672C3A}.XAIntegrationDebug|AnyCPU.Build.0 = Debug|Any CPU
259263
{40EAD437-216B-4DF4-8258-3F47E1672C3A}.XAIntegrationRelease|AnyCPU.ActiveCfg = Debug|Any CPU
260264
{40EAD437-216B-4DF4-8258-3F47E1672C3A}.XAIntegrationRelease|AnyCPU.Build.0 = Debug|Any CPU
261-
{83F00D30-0AC6-40D8-834B-DD39B6CAA8B3}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU
262-
{83F00D30-0AC6-40D8-834B-DD39B6CAA8B3}.Debug|AnyCPU.Build.0 = Debug|Any CPU
263-
{83F00D30-0AC6-40D8-834B-DD39B6CAA8B3}.Release|AnyCPU.ActiveCfg = Release|Any CPU
264-
{83F00D30-0AC6-40D8-834B-DD39B6CAA8B3}.Release|AnyCPU.Build.0 = Release|Any CPU
265-
{83F00D30-0AC6-40D8-834B-DD39B6CAA8B3}.XAIntegrationDebug|Any CPU.ActiveCfg = Debug|Any CPU
266-
{83F00D30-0AC6-40D8-834B-DD39B6CAA8B3}.XAIntegrationDebug|Any CPU.Build.0 = Debug|Any CPU
267-
{83F00D30-0AC6-40D8-834B-DD39B6CAA8B3}.XAIntegrationRelease|Any CPU.ActiveCfg = Debug|Any CPU
268-
{83F00D30-0AC6-40D8-834B-DD39B6CAA8B3}.XAIntegrationRelease|Any CPU.Build.0 = Debug|Any CPU
269-
{83F00D30-0AC6-40D8-834B-DD39B6CAA8B3}.XAIntegrationDebug|AnyCPU.ActiveCfg = Debug|Any CPU
270-
{83F00D30-0AC6-40D8-834B-DD39B6CAA8B3}.XAIntegrationDebug|AnyCPU.Build.0 = Debug|Any CPU
271-
{83F00D30-0AC6-40D8-834B-DD39B6CAA8B3}.XAIntegrationRelease|AnyCPU.ActiveCfg = Debug|Any CPU
272-
{83F00D30-0AC6-40D8-834B-DD39B6CAA8B3}.XAIntegrationRelease|AnyCPU.Build.0 = Debug|Any CPU
273265
{2868FC32-A4E7-4008-87C8-2C7879CACB58}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU
274266
{2868FC32-A4E7-4008-87C8-2C7879CACB58}.Debug|AnyCPU.Build.0 = Debug|Any CPU
275267
{2868FC32-A4E7-4008-87C8-2C7879CACB58}.Release|AnyCPU.ActiveCfg = Release|Any CPU
@@ -294,6 +286,42 @@ Global
294286
{2CF172E5-BDAE-4ABA-8BC8-08040ED3E77A}.XAIntegrationDebug|AnyCPU.Build.0 = Debug|Any CPU
295287
{2CF172E5-BDAE-4ABA-8BC8-08040ED3E77A}.XAIntegrationRelease|AnyCPU.ActiveCfg = Debug|Any CPU
296288
{2CF172E5-BDAE-4ABA-8BC8-08040ED3E77A}.XAIntegrationRelease|AnyCPU.Build.0 = Debug|Any CPU
289+
{1A4B041A-842F-40B3-A50D-49E01D30BD18}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU
290+
{1A4B041A-842F-40B3-A50D-49E01D30BD18}.Debug|AnyCPU.Build.0 = Debug|Any CPU
291+
{1A4B041A-842F-40B3-A50D-49E01D30BD18}.Release|AnyCPU.ActiveCfg = Release|Any CPU
292+
{1A4B041A-842F-40B3-A50D-49E01D30BD18}.Release|AnyCPU.Build.0 = Release|Any CPU
293+
{1A4B041A-842F-40B3-A50D-49E01D30BD18}.XAIntegrationDebug|Any CPU.ActiveCfg = Debug|Any CPU
294+
{1A4B041A-842F-40B3-A50D-49E01D30BD18}.XAIntegrationDebug|Any CPU.Build.0 = Debug|Any CPU
295+
{1A4B041A-842F-40B3-A50D-49E01D30BD18}.XAIntegrationRelease|Any CPU.ActiveCfg = Debug|Any CPU
296+
{1A4B041A-842F-40B3-A50D-49E01D30BD18}.XAIntegrationRelease|Any CPU.Build.0 = Debug|Any CPU
297+
{1A4B041A-842F-40B3-A50D-49E01D30BD18}.XAIntegrationDebug|AnyCPU.ActiveCfg = Debug|Any CPU
298+
{1A4B041A-842F-40B3-A50D-49E01D30BD18}.XAIntegrationDebug|AnyCPU.Build.0 = Debug|Any CPU
299+
{1A4B041A-842F-40B3-A50D-49E01D30BD18}.XAIntegrationRelease|AnyCPU.ActiveCfg = Debug|Any CPU
300+
{1A4B041A-842F-40B3-A50D-49E01D30BD18}.XAIntegrationRelease|AnyCPU.Build.0 = Debug|Any CPU
301+
{38C762AB-8FD1-44DE-9855-26AAE7129DC3}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU
302+
{38C762AB-8FD1-44DE-9855-26AAE7129DC3}.Debug|AnyCPU.Build.0 = Debug|Any CPU
303+
{38C762AB-8FD1-44DE-9855-26AAE7129DC3}.Release|AnyCPU.ActiveCfg = Release|Any CPU
304+
{38C762AB-8FD1-44DE-9855-26AAE7129DC3}.Release|AnyCPU.Build.0 = Release|Any CPU
305+
{38C762AB-8FD1-44DE-9855-26AAE7129DC3}.XAIntegrationDebug|Any CPU.ActiveCfg = Debug|Any CPU
306+
{38C762AB-8FD1-44DE-9855-26AAE7129DC3}.XAIntegrationDebug|Any CPU.Build.0 = Debug|Any CPU
307+
{38C762AB-8FD1-44DE-9855-26AAE7129DC3}.XAIntegrationRelease|Any CPU.ActiveCfg = Debug|Any CPU
308+
{38C762AB-8FD1-44DE-9855-26AAE7129DC3}.XAIntegrationRelease|Any CPU.Build.0 = Debug|Any CPU
309+
{38C762AB-8FD1-44DE-9855-26AAE7129DC3}.XAIntegrationDebug|AnyCPU.ActiveCfg = Debug|Any CPU
310+
{38C762AB-8FD1-44DE-9855-26AAE7129DC3}.XAIntegrationDebug|AnyCPU.Build.0 = Debug|Any CPU
311+
{38C762AB-8FD1-44DE-9855-26AAE7129DC3}.XAIntegrationRelease|AnyCPU.ActiveCfg = Debug|Any CPU
312+
{38C762AB-8FD1-44DE-9855-26AAE7129DC3}.XAIntegrationRelease|AnyCPU.Build.0 = Debug|Any CPU
313+
{7387E151-48E3-4885-B2CA-A74434A34045}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU
314+
{7387E151-48E3-4885-B2CA-A74434A34045}.Debug|AnyCPU.Build.0 = Debug|Any CPU
315+
{7387E151-48E3-4885-B2CA-A74434A34045}.Release|AnyCPU.ActiveCfg = Release|Any CPU
316+
{7387E151-48E3-4885-B2CA-A74434A34045}.Release|AnyCPU.Build.0 = Release|Any CPU
317+
{7387E151-48E3-4885-B2CA-A74434A34045}.XAIntegrationDebug|Any CPU.ActiveCfg = Debug|Any CPU
318+
{7387E151-48E3-4885-B2CA-A74434A34045}.XAIntegrationDebug|Any CPU.Build.0 = Debug|Any CPU
319+
{7387E151-48E3-4885-B2CA-A74434A34045}.XAIntegrationRelease|Any CPU.ActiveCfg = Debug|Any CPU
320+
{7387E151-48E3-4885-B2CA-A74434A34045}.XAIntegrationRelease|Any CPU.Build.0 = Debug|Any CPU
321+
{7387E151-48E3-4885-B2CA-A74434A34045}.XAIntegrationDebug|AnyCPU.ActiveCfg = Debug|Any CPU
322+
{7387E151-48E3-4885-B2CA-A74434A34045}.XAIntegrationDebug|AnyCPU.Build.0 = Debug|Any CPU
323+
{7387E151-48E3-4885-B2CA-A74434A34045}.XAIntegrationRelease|AnyCPU.ActiveCfg = Debug|Any CPU
324+
{7387E151-48E3-4885-B2CA-A74434A34045}.XAIntegrationRelease|AnyCPU.Build.0 = Debug|Any CPU
297325
EndGlobalSection
298326
GlobalSection(NestedProjects) = preSolution
299327
{8FF78EB6-6FC8-46A7-8A15-EBBA9045C5FA} = {E351F97D-EA4F-4E7F-AAA0-8EBB1F2A4A62}
@@ -323,9 +351,11 @@ Global
323351
{2DD1EE75-6D8D-4653-A800-0A24367F7F38} = {CAB438D8-B0F5-4AF0-BEBD-9E2ADBD7B483}
324352
{53E4ABF0-1085-45F9-B964-DCAE4B819998} = {CAB438D8-B0F5-4AF0-BEBD-9E2ADBD7B483}
325353
{40EAD437-216B-4DF4-8258-3F47E1672C3A} = {CAB438D8-B0F5-4AF0-BEBD-9E2ADBD7B483}
326-
{83F00D30-0AC6-40D8-834B-DD39B6CAA8B3} = {04E3E11E-B47D-4599-8AFC-50515A95E715}
327354
{2868FC32-A4E7-4008-87C8-2C7879CACB58} = {04E3E11E-B47D-4599-8AFC-50515A95E715}
328355
{2CF172E5-BDAE-4ABA-8BC8-08040ED3E77A} = {E351F97D-EA4F-4E7F-AAA0-8EBB1F2A4A62}
356+
{1A4B041A-842F-40B3-A50D-49E01D30BD18} = {04E3E11E-B47D-4599-8AFC-50515A95E715}
357+
{38C762AB-8FD1-44DE-9855-26AAE7129DC3} = {864062D3-A415-4A6F-9324-5820237BA058}
358+
{7387E151-48E3-4885-B2CA-A74434A34045} = {864062D3-A415-4A6F-9324-5820237BA058}
329359
EndGlobalSection
330360
GlobalSection(MonoDevelopProperties) = preSolution
331361
Policies = $0

‎external/Java.Interop‎

‎src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -635,6 +635,11 @@
635635
<Name>Xamarin.Android.Tools.BootstrapTasks</Name>
636636
<ReferenceOutputAssembly>False</ReferenceOutputAssembly>
637637
</ProjectReference>
638+
<ProjectReference Include="..\..\external\Java.Interop\tools\class-parse\class-parse.csproj">
639+
<Project>{38C762AB-8FD1-44DE-9855-26AAE7129DC3}</Project>
640+
<Name>class-parse</Name>
641+
<ReferenceOutputAssembly>False</ReferenceOutputAssembly>
642+
</ProjectReference>
638643
</ItemGroup>
639644
<ItemGroup>
640645
<Folder Include="pdb2mdb\" />

0 commit comments

Comments
 (0)