From b0bbdef25072e352501d0909fc25dd92290b29d9 Mon Sep 17 00:00:00 2001 From: Jonathan Pryor Date: Thu, 9 Jun 2016 06:33:46 -0400 Subject: [PATCH] [Xamarin.Android.Build.Tasks] Ensure `class-parse` is built first 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`. --- Configuration.Java.Interop.Override.props | 6 ++ Makefile | 1 + Xamarin.Android.sln | 60 ++++++++++++++----- external/Java.Interop | 2 +- .../Xamarin.Android.Build.Tasks.csproj | 5 ++ 5 files changed, 58 insertions(+), 16 deletions(-) create mode 100644 Configuration.Java.Interop.Override.props diff --git a/Configuration.Java.Interop.Override.props b/Configuration.Java.Interop.Override.props new file mode 100644 index 00000000000..392fb7a41a4 --- /dev/null +++ b/Configuration.Java.Interop.Override.props @@ -0,0 +1,6 @@ + + + + $(MSBuildThisFileDirectory)bin\$(Configuration)\lib\mandroid\ + + diff --git a/Makefile b/Makefile index 1c51739ce7d..80e7f32b629 100644 --- a/Makefile +++ b/Makefile @@ -24,6 +24,7 @@ prepare: git submodule update --init --recursive nuget restore (cd external/Java.Interop && nuget restore) + cp Configuration.Java.Interop.Override.props external/Java.Interop/Configuration.Override.props run-all-tests: run-nunit-tests run-apk-tests diff --git a/Xamarin.Android.sln b/Xamarin.Android.sln index da3eb0c4a93..fa072b84d19 100644 --- a/Xamarin.Android.sln +++ b/Xamarin.Android.sln @@ -63,12 +63,16 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Android.Build.Tests EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Android-Tests", "src\Mono.Android\Test\Mono.Android-Tests.csproj", "{40EAD437-216B-4DF4-8258-3F47E1672C3A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Posix", "src\Mono.Posix\Mono.Posix.csproj", "{83F00D30-0AC6-40D8-834B-DD39B6CAA8B3}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.EnterpriseServices", "src\System.EnterpriseServices\System.EnterpriseServices.csproj", "{2868FC32-A4E7-4008-87C8-2C7879CACB58}" EndProject Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "unix-distribution-setup", "build-tools\unix-distribution-setup\unix-distribution-setup.mdproj", "{2CF172E5-BDAE-4ABA-8BC8-08040ED3E77A}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Posix", "src\Mono.Posix\Mono.Posix.csproj", "{1A4B041A-842F-40B3-A50D-49E01D30BD18}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "class-parse", "external\Java.Interop\tools\class-parse\class-parse.csproj", "{38C762AB-8FD1-44DE-9855-26AAE7129DC3}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "logcat-parse", "external\Java.Interop\tools\logcat-parse\logcat-parse.csproj", "{7387E151-48E3-4885-B2CA-A74434A34045}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|AnyCPU = Debug|AnyCPU @@ -258,18 +262,6 @@ Global {40EAD437-216B-4DF4-8258-3F47E1672C3A}.XAIntegrationDebug|AnyCPU.Build.0 = Debug|Any CPU {40EAD437-216B-4DF4-8258-3F47E1672C3A}.XAIntegrationRelease|AnyCPU.ActiveCfg = Debug|Any CPU {40EAD437-216B-4DF4-8258-3F47E1672C3A}.XAIntegrationRelease|AnyCPU.Build.0 = Debug|Any CPU - {83F00D30-0AC6-40D8-834B-DD39B6CAA8B3}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU - {83F00D30-0AC6-40D8-834B-DD39B6CAA8B3}.Debug|AnyCPU.Build.0 = Debug|Any CPU - {83F00D30-0AC6-40D8-834B-DD39B6CAA8B3}.Release|AnyCPU.ActiveCfg = Release|Any CPU - {83F00D30-0AC6-40D8-834B-DD39B6CAA8B3}.Release|AnyCPU.Build.0 = Release|Any CPU - {83F00D30-0AC6-40D8-834B-DD39B6CAA8B3}.XAIntegrationDebug|Any CPU.ActiveCfg = Debug|Any CPU - {83F00D30-0AC6-40D8-834B-DD39B6CAA8B3}.XAIntegrationDebug|Any CPU.Build.0 = Debug|Any CPU - {83F00D30-0AC6-40D8-834B-DD39B6CAA8B3}.XAIntegrationRelease|Any CPU.ActiveCfg = Debug|Any CPU - {83F00D30-0AC6-40D8-834B-DD39B6CAA8B3}.XAIntegrationRelease|Any CPU.Build.0 = Debug|Any CPU - {83F00D30-0AC6-40D8-834B-DD39B6CAA8B3}.XAIntegrationDebug|AnyCPU.ActiveCfg = Debug|Any CPU - {83F00D30-0AC6-40D8-834B-DD39B6CAA8B3}.XAIntegrationDebug|AnyCPU.Build.0 = Debug|Any CPU - {83F00D30-0AC6-40D8-834B-DD39B6CAA8B3}.XAIntegrationRelease|AnyCPU.ActiveCfg = Debug|Any CPU - {83F00D30-0AC6-40D8-834B-DD39B6CAA8B3}.XAIntegrationRelease|AnyCPU.Build.0 = Debug|Any CPU {2868FC32-A4E7-4008-87C8-2C7879CACB58}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU {2868FC32-A4E7-4008-87C8-2C7879CACB58}.Debug|AnyCPU.Build.0 = Debug|Any CPU {2868FC32-A4E7-4008-87C8-2C7879CACB58}.Release|AnyCPU.ActiveCfg = Release|Any CPU @@ -294,6 +286,42 @@ Global {2CF172E5-BDAE-4ABA-8BC8-08040ED3E77A}.XAIntegrationDebug|AnyCPU.Build.0 = Debug|Any CPU {2CF172E5-BDAE-4ABA-8BC8-08040ED3E77A}.XAIntegrationRelease|AnyCPU.ActiveCfg = Debug|Any CPU {2CF172E5-BDAE-4ABA-8BC8-08040ED3E77A}.XAIntegrationRelease|AnyCPU.Build.0 = Debug|Any CPU + {1A4B041A-842F-40B3-A50D-49E01D30BD18}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU + {1A4B041A-842F-40B3-A50D-49E01D30BD18}.Debug|AnyCPU.Build.0 = Debug|Any CPU + {1A4B041A-842F-40B3-A50D-49E01D30BD18}.Release|AnyCPU.ActiveCfg = Release|Any CPU + {1A4B041A-842F-40B3-A50D-49E01D30BD18}.Release|AnyCPU.Build.0 = Release|Any CPU + {1A4B041A-842F-40B3-A50D-49E01D30BD18}.XAIntegrationDebug|Any CPU.ActiveCfg = Debug|Any CPU + {1A4B041A-842F-40B3-A50D-49E01D30BD18}.XAIntegrationDebug|Any CPU.Build.0 = Debug|Any CPU + {1A4B041A-842F-40B3-A50D-49E01D30BD18}.XAIntegrationRelease|Any CPU.ActiveCfg = Debug|Any CPU + {1A4B041A-842F-40B3-A50D-49E01D30BD18}.XAIntegrationRelease|Any CPU.Build.0 = Debug|Any CPU + {1A4B041A-842F-40B3-A50D-49E01D30BD18}.XAIntegrationDebug|AnyCPU.ActiveCfg = Debug|Any CPU + {1A4B041A-842F-40B3-A50D-49E01D30BD18}.XAIntegrationDebug|AnyCPU.Build.0 = Debug|Any CPU + {1A4B041A-842F-40B3-A50D-49E01D30BD18}.XAIntegrationRelease|AnyCPU.ActiveCfg = Debug|Any CPU + {1A4B041A-842F-40B3-A50D-49E01D30BD18}.XAIntegrationRelease|AnyCPU.Build.0 = Debug|Any CPU + {38C762AB-8FD1-44DE-9855-26AAE7129DC3}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU + {38C762AB-8FD1-44DE-9855-26AAE7129DC3}.Debug|AnyCPU.Build.0 = Debug|Any CPU + {38C762AB-8FD1-44DE-9855-26AAE7129DC3}.Release|AnyCPU.ActiveCfg = Release|Any CPU + {38C762AB-8FD1-44DE-9855-26AAE7129DC3}.Release|AnyCPU.Build.0 = Release|Any CPU + {38C762AB-8FD1-44DE-9855-26AAE7129DC3}.XAIntegrationDebug|Any CPU.ActiveCfg = Debug|Any CPU + {38C762AB-8FD1-44DE-9855-26AAE7129DC3}.XAIntegrationDebug|Any CPU.Build.0 = Debug|Any CPU + {38C762AB-8FD1-44DE-9855-26AAE7129DC3}.XAIntegrationRelease|Any CPU.ActiveCfg = Debug|Any CPU + {38C762AB-8FD1-44DE-9855-26AAE7129DC3}.XAIntegrationRelease|Any CPU.Build.0 = Debug|Any CPU + {38C762AB-8FD1-44DE-9855-26AAE7129DC3}.XAIntegrationDebug|AnyCPU.ActiveCfg = Debug|Any CPU + {38C762AB-8FD1-44DE-9855-26AAE7129DC3}.XAIntegrationDebug|AnyCPU.Build.0 = Debug|Any CPU + {38C762AB-8FD1-44DE-9855-26AAE7129DC3}.XAIntegrationRelease|AnyCPU.ActiveCfg = Debug|Any CPU + {38C762AB-8FD1-44DE-9855-26AAE7129DC3}.XAIntegrationRelease|AnyCPU.Build.0 = Debug|Any CPU + {7387E151-48E3-4885-B2CA-A74434A34045}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU + {7387E151-48E3-4885-B2CA-A74434A34045}.Debug|AnyCPU.Build.0 = Debug|Any CPU + {7387E151-48E3-4885-B2CA-A74434A34045}.Release|AnyCPU.ActiveCfg = Release|Any CPU + {7387E151-48E3-4885-B2CA-A74434A34045}.Release|AnyCPU.Build.0 = Release|Any CPU + {7387E151-48E3-4885-B2CA-A74434A34045}.XAIntegrationDebug|Any CPU.ActiveCfg = Debug|Any CPU + {7387E151-48E3-4885-B2CA-A74434A34045}.XAIntegrationDebug|Any CPU.Build.0 = Debug|Any CPU + {7387E151-48E3-4885-B2CA-A74434A34045}.XAIntegrationRelease|Any CPU.ActiveCfg = Debug|Any CPU + {7387E151-48E3-4885-B2CA-A74434A34045}.XAIntegrationRelease|Any CPU.Build.0 = Debug|Any CPU + {7387E151-48E3-4885-B2CA-A74434A34045}.XAIntegrationDebug|AnyCPU.ActiveCfg = Debug|Any CPU + {7387E151-48E3-4885-B2CA-A74434A34045}.XAIntegrationDebug|AnyCPU.Build.0 = Debug|Any CPU + {7387E151-48E3-4885-B2CA-A74434A34045}.XAIntegrationRelease|AnyCPU.ActiveCfg = Debug|Any CPU + {7387E151-48E3-4885-B2CA-A74434A34045}.XAIntegrationRelease|AnyCPU.Build.0 = Debug|Any CPU EndGlobalSection GlobalSection(NestedProjects) = preSolution {8FF78EB6-6FC8-46A7-8A15-EBBA9045C5FA} = {E351F97D-EA4F-4E7F-AAA0-8EBB1F2A4A62} @@ -323,9 +351,11 @@ Global {2DD1EE75-6D8D-4653-A800-0A24367F7F38} = {CAB438D8-B0F5-4AF0-BEBD-9E2ADBD7B483} {53E4ABF0-1085-45F9-B964-DCAE4B819998} = {CAB438D8-B0F5-4AF0-BEBD-9E2ADBD7B483} {40EAD437-216B-4DF4-8258-3F47E1672C3A} = {CAB438D8-B0F5-4AF0-BEBD-9E2ADBD7B483} - {83F00D30-0AC6-40D8-834B-DD39B6CAA8B3} = {04E3E11E-B47D-4599-8AFC-50515A95E715} {2868FC32-A4E7-4008-87C8-2C7879CACB58} = {04E3E11E-B47D-4599-8AFC-50515A95E715} {2CF172E5-BDAE-4ABA-8BC8-08040ED3E77A} = {E351F97D-EA4F-4E7F-AAA0-8EBB1F2A4A62} + {1A4B041A-842F-40B3-A50D-49E01D30BD18} = {04E3E11E-B47D-4599-8AFC-50515A95E715} + {38C762AB-8FD1-44DE-9855-26AAE7129DC3} = {864062D3-A415-4A6F-9324-5820237BA058} + {7387E151-48E3-4885-B2CA-A74434A34045} = {864062D3-A415-4A6F-9324-5820237BA058} EndGlobalSection GlobalSection(MonoDevelopProperties) = preSolution Policies = $0 diff --git a/external/Java.Interop b/external/Java.Interop index 4ace37fddb3..b6431ac8504 160000 --- a/external/Java.Interop +++ b/external/Java.Interop @@ -1 +1 @@ -Subproject commit 4ace37fddb3fd8a96363d8c01af2e93e04667fc7 +Subproject commit b6431ac85042960ba28dfb19f0be19573745d968 diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj index c4ea42d169f..773eeb3b2a9 100644 --- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj +++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj @@ -635,6 +635,11 @@ Xamarin.Android.Tools.BootstrapTasks False + + {38C762AB-8FD1-44DE-9855-26AAE7129DC3} + class-parse + False +